allow MEX to exist alongside ORIGDLL

amh.for

@@ -107,7 +107,7 @@ C LOCALS
 	id1   = max(1,d(1))
 	Z0    = Z
 	delta = 1.D-3
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

amh2.for

@@ -107,7 +107,7 @@ C LOCALS
 	id1   = max(d(1),1)
 	Z0    = Z
 	delta = 1.D-3
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

checkdesign.for

@@ -70,7 +70,7 @@ C EXTERNAL SUBROUTINES
 	ALLOCATE(c(ny,max(nz,1),ns(1)),H(ny,nx,ns(2)),
 	1 G(ny,nu,ns(3)),a(nx,ns(4)),F(nx,nx,ns(5)),R(nx,nu,ns(6))) !,HRG(ny,nu),HRGRH(ny,ny))
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

design.for

@@ -218,7 +218,7 @@ C
       IF (engEvalString(ep, 'clear success;'//
      &   '[C,H,G,A,F,R]='//TRIM(mfile)//'( ny,nz,nx,'//
      &   'nu,ns,theta);'//'success=1;') .ne. 0) then ! engEvalString failed
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 		 CALL GETERRSTR(matlaberror)
 #else
 #endif
@@ -244,7 +244,7 @@ C
 #endif
       IF (C_ptr .eq. 0) then ! engEvalString failed
           buffer=buffer1
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 		 CALL GETERRSTR(matlaberror)
 #else
 #endif

forecast.for

@@ -73,7 +73,7 @@ C EXTERNAL SUBROUTINES
 	ALLOCATE(R(nx,nu,ns(6)),c(ny,max(nz,1),ns(1)),H(ny,nx,ns(2)),
 	1 G(ny,nu,ns(3)),a(nx,ns(4)),F(nx,nx,ns(5)))
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

gck.for

@@ -110,7 +110,7 @@ C LOCALS
 	DATA EPS/1.D-14/,ONE/1.0D0/,ZERO/0.0D0/
 	DOUBLE PRECISION genunf,LEMMA4,MARKOVP
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

gck2.for

@@ -101,7 +101,7 @@ C LOCALS
 	DATA EPS/1.D-14/,ONE/1.0D0/,ZERO/0.0D0/
 	DOUBLE PRECISION genunf,LEMMA4,MARKOVP
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

innov.for

@@ -72,7 +72,7 @@ C LOCALS
      1 Xdd(max(d(1),1),nx),Pdd(max(d(1),1),nx,nx),LIKE(max(d(1),1)),
      1 XT(nx),PT(nx,nx),INN0(ny))
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
       CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

innov2.for

@@ -71,7 +71,7 @@ C LOCALS
      1 Xdd(max(d(1),1),nx),Pdd(max(d(1),1),nx,nx),LIKE(max(d(1),1)),
      1 XT(nx),PT(nx,nx))
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
       CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

main.for

@@ -96,12 +96,10 @@ C TIME
      1                   DATE_ITIME)
       IT1(1:3) = DATE_ITIME(1:3)
       IT1(4:7) = DATE_ITIME(5:8)
-
 #if !defined(MEX)
 C GET the namelist specified by FILEIN
       CALL GETARG(1,FILEIN)     ! load name of input file
 #endif
-
 C CHECK FILEIN
 	IF (TRIM(FILEIN).EQ.'') THEN
 #ifdef __GFORTRAN__
@@ -141,12 +139,12 @@ C Assign the name of the matlab file
        ALLOCATE( c(ny,max(nz,1),ns(1)),H(ny,nx,ns(2)),
 	1  G(ny,nu,ns(3)),a(nx,ns(4)),F(nx,nx,ns(5)),R(nx,nu,ns(6)),
      1  theta(nt))
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
        CALL SETFILEM(mfile,pathmfile) ! ONLY THE FIRST TIME
 #endif
 
        theta(:) = 1.D0
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
        CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #endif
        DEALLOCATE(c,H,G,a,F,R,theta)

missing.for

@@ -46,7 +46,7 @@ C LOCALS
 
 	ALLOCATE(R(nx,nu,ns(6)),c(ny,max(nz,1),ns(1)),H(ny,nx,ns(2)),
 	1 G(ny,nu,ns(3)),a(nx,ns(4)),F(nx,nx,ns(5)))
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

opg.for

@@ -85,7 +85,7 @@ C Using Hessian from E04UCF
      1 XT(0:nobs,nx),PT(0:nobs,nx,nx),Xdd(max(d(1),1),nx),
      1 Pdd(max(d(1),1),nx,nx))
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif
@@ -123,7 +123,7 @@ C Using Hessian from E04UCF
 	DO 1000 I=1,NFREE
 	 THETAV(I) = THETAV(I) + P(I)
        theta(IFREE(I)) = THETAV(I)
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	   CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

opgh.for

@@ -88,7 +88,7 @@ C ------------------------------------------------------------
       IFAIL = 0
       CALL SYMINV(LTR,NFREE,LTR,W,J,IFAIL,RMAX)
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
       CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif
@@ -135,7 +135,7 @@ C -----------
         ELSE
          psi(I-NFT) = PAR(I)
         ENDIF
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

opgkim.for

@@ -87,7 +87,7 @@ C ------------------------------------------------------------
       IFAIL = 0
       CALL SYMINV(LTR,NFREE,LTR,W,J,IFAIL,RMAX)
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
       CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif
@@ -135,7 +135,7 @@ C -----------
         ELSE
          psi(I-NFT) = PAR(I)
         ENDIF
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
         CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

ptheta.for

@@ -49,7 +49,7 @@ C LOCALS
      3 Pdd(max(d(1),1),nx,nx))
 
 C computes the log-posterior
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

ptheta2.for

@@ -49,7 +49,7 @@ C LOCALS
 
 
 C computes the log-posterior
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

simdata.for

@@ -92,7 +92,7 @@ C EXTERNAL SUBROUTINES
      3 Xdd(MAX(d(1),1),nx),Pdd(MAX(d(1),1),nx,nx),
      3 WORK((nx+2)*(nx+1)/2),FP(nx,nx),WORK1(64*nx),UP(nu) )
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

simstate.for

@@ -77,7 +77,7 @@ C EXTERNAL FUNCTIONS
      3 Xdd(MAX(d(1),1),nx),Pdd(MAX(d(1),1),nx,nx),
      3 WORK((nx+2)*(nx+1)/2),FP(nx,nx),WORK1(64*nx),UP(nu) )
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
       CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif

simstate2.for

@@ -76,7 +76,7 @@ C EXTERNAL FUNCTIONS
      3 Xdd(MAX(d(1),1),nx),Pdd(MAX(d(1),1),nx,nx),
      3 WORK((nx+2)*(nx+1)/2),FP(nx,nx),WORK1(64*nx),UP(nu) )
 
-#if defined(MEX)
+#if defined(ORIGDLL) || defined(MEX)
 	  CALL DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
 #else
 #endif