Changeset 1403 for trunk/LMDZ.MARS/libf/dyn3d

Timestamp:

Mar 31, 2015, 3:49:07 PM (10 years ago)

Author:

emillour

Message:

All models: Reorganizing the physics/dynamics interface.

• makelmdz and makelmdz_fcm scripts adapted to handle the new directory settings

• misc: (replaces what was the "bibio" directory)
• Should only contain extremely generic (and non physics or dynamics-specific) routines
• Therefore moved initdynav.F90, initfluxsto.F, inithist.F, writedynav.F90, write_field.F90, writehist.F to "dyn3d_common"

• dynlonlat_phylonlat: (new interface directory)
• This directory contains routines relevent to physics/dynamics grid interactions, e.g. routines gr_dyn_fi or gr_fi_dyn and calfis
• Moreover the dynlonlat_phylonlat contains directories "phy*" corresponding to each physics package "phy*" to be used. These subdirectories should only contain specific interfaces (e.g. iniphysiq) or main programs (e.g. newstart)

• phy*/dyn1d: this subdirectory contains the 1D model using physics from phy*

EM

Location:

trunk/LMDZ.MARS/libf/dyn3d

Files:

• gcm.F (modified) (2 diffs)
• logic.h (modified) (1 diff)
• serre.h (modified) (1 diff)

trunk/LMDZ.MARS/libf/dyn3d/gcm.F

@@ -5 +5 @@
      &                       nday_r, idissip, iconser, ecritstart,
      &                       ecritphy
+      use filtreg_mod, only: inifilr
 !      use comgeomphy, only: initcomgeomphy
       IMPLICIT NONE
@@ -107 +108 @@
 
       EXTERNAL caldyn, traceur
-      EXTERNAL dissip,geopot,iniconst,inifilr
+      EXTERNAL dissip,geopot,iniconst
       EXTERNAL integrd,SCOPY
       EXTERNAL inigeom

trunk/LMDZ.MARS/libf/dyn3d/logic.h

@@ -1 @@
-c-----------------------------------------------------------------------
-c INCLUDE 'logic.h'
+!-----------------------------------------------------------------------
+! INCLUDE 'logic.h'
 
-      COMMON/logic/ purmats,physic,forward,leapf,apphys,grireg,
-     *  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus,hybrid
+      COMMON/logic/ purmats,physic,forward,leapf,apphys,grireg,         &
+     &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus,hybrid
 
-      LOGICAL purmats,physic,forward,leapf,apphys,grireg,statcl,conser,
-     * apdiss,apdelq,saison,ecripar,fxyhypb,ysinus,hybrid
+      LOGICAL purmats,physic,forward,leapf,apphys,grireg,statcl,conser, &
+     & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus,hybrid
 
-c-----------------------------------------------------------------------
+!-----------------------------------------------------------------------

trunk/LMDZ.MARS/libf/dyn3d/serre.h

@@ -1 @@
-c..include serre.h
-c
-       REAL clon,clat,transx,transy,alphax,alphay,pxo,pyo,
-     ,  grossismx, grossismy, dzoomx, dzoomy,taux,tauy
-       COMMON/serre/clon,clat,transx,transy,alphax,alphay,pxo,pyo , 
-     ,  grossismx, grossismy, dzoomx, dzoomy,taux,tauy
+!..include serre.h
+!
+       REAL clon,clat,transx,transy,alphax,alphay,pxo,pyo,              &
+     &  grossismx, grossismy, dzoomx, dzoomy,taux,tauy
+       COMMON/serre/clon,clat,transx,transy,alphax,alphay,pxo,pyo ,     &
+     &  grossismx, grossismy, dzoomx, dzoomy,taux,tauy