From 9133b128bc5d25a3a46256e28a0681cb6f90f95e Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Fri, 11 Apr 2014 17:52:17 +0200
Subject: [PATCH] only use dfwin module if not compiling for dynare
---
amh.for | 3 ++-
amh2.for | 3 ++-
checkdesign.for | 3 ++-
forecast.for | 3 ++-
gck.for | 3 ++-
gck2.for | 3 ++-
innov.for | 3 ++-
innov2.for | 3 ++-
main.for | 2 ++
missing.for | 3 ++-
opg.for | 3 ++-
opgh.for | 3 ++-
opgkim.for | 3 ++-
ptheta.for | 3 ++-
ptheta2.for | 3 ++-
simdata.for | 3 ++-
simstate.for | 3 ++-
simstate2.for | 3 ++-
18 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/amh.for b/amh.for
index 28583ec..da73110 100644
--- a/amh.for
+++ b/amh.for
@@ -59,8 +59,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C -------------------------------------------------------------
SUBROUTINE AMH(HFIX,nobs,d,ny,nz,nx,nu,nv,ns,nstot,nt,np,
1 yk,IYK,theta,psi,PTR,PM,INFOS,pdll,Z,S,ACCRATE)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/amh2.for b/amh2.for
index 1779a0c..a6a1111 100644
--- a/amh2.for
+++ b/amh2.for
@@ -59,8 +59,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C -------------------------------------------------------------
SUBROUTINE AMH2(HFIX,nobs,d,ny,nz,nx,nu,nv,ns,nstot,nt,np,yk,
1 theta,psi,PTR,PM,INFOS,pdll,Z,S,ACCRATE)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/checkdesign.for b/checkdesign.for
index 68474ff..9d58865 100644
--- a/checkdesign.for
+++ b/checkdesign.for
@@ -35,8 +35,9 @@ C You should have received a copy of the GNU General Public License
C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C -------------------------------------------------------------
SUBROUTINE CHECKDESIGN(ny,nz,nx,nu,ns,nt,d,theta,pdll,PATH,NMLNAME)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/forecast.for b/forecast.for
index dd85e29..cc9510c 100644
--- a/forecast.for
+++ b/forecast.for
@@ -37,8 +37,9 @@ C GNU General Public License for more details.
C ----------------------------------------------------------------------------
SUBROUTINE FORECAST(zk,nf,ny,nz,nx,nu,nv,ns,nstot,nt,np,
1 theta,psi,INFOS,Z,STATE,pdll,FORE)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/gck.for b/gck.for
index a5a6613..f239e56 100644
--- a/gck.for
+++ b/gck.for
@@ -60,8 +60,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C ----------------------------------------------------------------------
SUBROUTINE GCK(nobs,d,ny,nz,nx,nu,nv,ns,nstot,nt,np,yk,IYK,
1 theta,psi,INFOS,pdll,Z,S)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/gck2.for b/gck2.for
index c6c1370..782b17e 100644
--- a/gck2.for
+++ b/gck2.for
@@ -60,8 +60,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C ----------------------------------------------------------------------
SUBROUTINE GCK2(nobs,d,ny,nz,nx,nu,nv,ns,nstot,nt,np,yk,
1 theta,psi,INFOS,pdll,Z,S)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/innov.for b/innov.for
index a8879cc..be43ce4 100644
--- a/innov.for
+++ b/innov.for
@@ -39,8 +39,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C --------------------------------------------------------------------
SUBROUTINE INNOV(nobs,d,ny,nz,nx,nu,ns,nt,S,yk,IYK,
1 theta,pdll,INN)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/innov2.for b/innov2.for
index dc5582e..5d18c1d 100644
--- a/innov2.for
+++ b/innov2.for
@@ -39,8 +39,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C --------------------------------------------------------------------
SUBROUTINE INNOV2(nobs,d,ny,nz,nx,nu,ns,nt,S,yk,
1 theta,pdll,INN)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/main.for b/main.for
index 4ea6121..9e2714a 100644
--- a/main.for
+++ b/main.for
@@ -35,7 +35,9 @@ C You should have received a copy of the GNU General Public License
C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C --------------------------------------------------------------------------------------
PROGRAM DMM
+#if !defined(DYNARE)
USE dfwin
+#endif
C DECLARE an "interface block" to the .DLL that contains DESIGN
INTERFACE
diff --git a/missing.for b/missing.for
index e7dfacd..04aa35e 100644
--- a/missing.for
+++ b/missing.for
@@ -21,8 +21,9 @@ C You should have received a copy of the GNU General Public License
C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C --------------------------------------------------------------------
SUBROUTINE MISSING(yk,ny,nz,nx,nu,ns,nt,nmis,theta,S,STATE,pdll,ykmis)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/opg.for b/opg.for
index 19b1da2..dc85d45 100644
--- a/opg.for
+++ b/opg.for
@@ -29,8 +29,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C ------------------------------------------------------------
SUBROUTINE OPG(nobs,d,ny,nz,nx,nu,nt,ns,pdll,yk,IYK,S,
1 theta,thetaprior,HESS,SE,XS,AKMSE,INN,IFAIL)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/opgh.for b/opgh.for
index 279a5d3..9e828bd 100644
--- a/opgh.for
+++ b/opgh.for
@@ -31,8 +31,9 @@ C ------------------------------------------------------------
SUBROUTINE OPGH(nobs,ny,nz,nx,nu,nt,nv,ns,nstot,np,pdll,yk,IYK,
1 INFOS,theta,psi,thetaprior,HESS,thetase,psise,
1 SSMOOTH,INN,IFAIL)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/opgkim.for b/opgkim.for
index 0022269..6e7539d 100644
--- a/opgkim.for
+++ b/opgkim.for
@@ -31,8 +31,9 @@ C ------------------------------------------------------------
1 IYK,INFOS,theta,psi,thetaprior,HESS,thetase,
1 psise,XS,XSSE,SSMOOTH,INN,IFAIL)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/ptheta.for b/ptheta.for
index 7b084a2..5f786a7 100644
--- a/ptheta.for
+++ b/ptheta.for
@@ -22,8 +22,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C ----------------------------------------------------------------
DOUBLE PRECISION FUNCTION PTHETA(it,nobs,d,ny,nz,nx,nu,ns,nt,
1 S,yk,IYK,theta,thetaprior,tipo,pdll)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/ptheta2.for b/ptheta2.for
index 6673de5..d22ce07 100644
--- a/ptheta2.for
+++ b/ptheta2.for
@@ -22,8 +22,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C ----------------------------------------------------------------
DOUBLE PRECISION FUNCTION PTHETA2(it,nobs,d,ny,nz,nx,nu,ns,nt,
1 S,yk,theta,thetaprior,tipo,pdll)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/simdata.for b/simdata.for
index 0ecef50..f501450 100644
--- a/simdata.for
+++ b/simdata.for
@@ -49,8 +49,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C --------------------------------------------------------------------
SUBROUTINE SIMDATA(nobs,d,ny,nz,nx,nu,ns,nstot,nt,nv,np,INFOS,
1 pdll,theta,psi,Z,STATE,yk)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/simstate.for b/simstate.for
index 2094b57..69c7565 100644
--- a/simstate.for
+++ b/simstate.for
@@ -43,8 +43,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C --------------------------------------------------------------------
SUBROUTINE SIMSTATE(nobs,d,ny,nz,nx,nu,ns,nt,yk,IYK,
1 theta,S,pdll,STATE)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
diff --git a/simstate2.for b/simstate2.for
index 5b1d3d1..d537d98 100644
--- a/simstate2.for
+++ b/simstate2.for
@@ -43,8 +43,9 @@ C along with DMM. If not, see <http://www.gnu.org/licenses/>.
C --------------------------------------------------------------------
SUBROUTINE SIMSTATE2(nobs,d,ny,nz,nx,nu,ns,nt,yk,
1 theta,S,pdll,STATE)
-
+#if !defined(DYNARE)
USE dfwin
+#endif
INTERFACE
SUBROUTINE DESIGN(ny,nz,nx,nu,ns,nt,theta,c,H,G,a,F,R)
INTEGER ny,nz,nx,nu,ns(6),nt
--
GitLab