Changeset 1403 for trunk/LMDZ.COMMON/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.COMMON/libf/dyn3d

Files:

• leapfrog.F (modified) (4 diffs)
• logic.h (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -170 +170 @@
       logical ok_sync
       parameter (ok_sync = .true.) 
-      logical physic
+      logical physics
 
       data callinigrads/.true./
@@ -251 +251 @@
 
       itau = 0
-      physic=.true.
-      if (iflag_phys==0.or.iflag_phys==2) physic=.false.
+      physics=.true.
+      if (iflag_phys==0.or.iflag_phys==2) physics=.false.
 
 c      iday = day_ini+itau/day_step
@@ -362 +362 @@
      s        apdiss = .TRUE.
          IF( MOD(itau,iphysiq ).EQ.0.AND..NOT.forward 
-     s          .and. physic                        ) apphys = .TRUE.
+     s          .and. physics                        ) apphys = .TRUE.
       ELSE
       ! Leapfrog/Matsuno time stepping 
@@ -368 +368 @@
          IF( MOD(itau+1,dissip_period).EQ.0 .AND. .NOT. forward )
      s        apdiss = .TRUE.
-         IF( MOD(itau+1,iphysiq).EQ.0.AND.physic       ) apphys=.TRUE.
+         IF( MOD(itau+1,iphysiq).EQ.0.AND.physics       ) apphys=.TRUE.
       END IF
 

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

@@ -12 +12 @@
      &  ,read_start,ok_guide,ok_strato,tidal,ok_gradsfile               &
      &  ,ok_limit,ok_etat0,hybrid                                       &
-     &  ,moyzon_mu,moyzon_ch
+     &  ,moyzon_mu,moyzon_ch,grireg,physic
 
       COMMON/logici/ iflag_phys,iflag_trac
@@ -26 +26 @@
 
       integer iflag_phys,iflag_trac
+
+! stuff for compatibility with Mars/Generic old dyn cores. To be cleaned!
+      logical grireg,physic
+
 !-----------------------------------------------------------------------