Changeset 1593 for trunk/LMDZ.COMMON/libf

Timestamp:

Sep 9, 2016, 4:04:54 PM (8 years ago)

Author:

emillour

Message:

Common dynamics:

• some cleanup around unused or unecessary parameters in the dynamics (ecritphy, grireg and physic) to harmonize with LMDZ5 (Earth dyn core).
• associated changes in LMDZ.MARS and LMDZ.GENERIC

EM

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/conf_gcm.F90 (modified) (2 diffs)
• dyn3d/logic_mod.F90 (modified) (1 diff)
• dyn3d_common/control_mod.F90 (modified) (1 diff)
• dyn3dpar/gcm.F (modified) (1 diff)
• dyn3dpar/logic_mod.F90 (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F90

@@ -4 +4 @@
 SUBROUTINE conf_gcm( tapedef, etatinit )
 
-USE control_mod
 #ifdef CPP_IOIPSL
   use IOIPSL
@@ -11 +10 @@
   use ioipsl_getincom
 #endif
+  USE control_mod, ONLY: anneeref, config_inca, day_step, dayref, &
+                         dissip_period, fractday, iapp_tracvl, &
+                         iconser, iecri, ip_ebil_dyn, iperiod, &
+                         iphysiq, less1day, nday, ndynstep, nsplit_phys, &
+                         offline, ok_dyn_ave, ok_dyn_ins, ok_dynzon, &
+                         output_grads_dyn, periodav, planet_type, &
+                         raz_date, resetvarc, starttime, timestart
   USE infotrac, ONLY : type_trac
   use assert_m, only: assert

trunk/LMDZ.COMMON/libf/dyn3d/logic_mod.F90

@@ -6 +6 @@
      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
      &  ,read_start,ok_guide,ok_strato,tidal,ok_gradsfile               &
-     &  ,ok_limit,ok_etat0,physic,grireg
+     &  ,ok_limit,ok_etat0
       logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
                      ! (only used if disvert_type==2)

trunk/LMDZ.COMMON/libf/dyn3d_common/control_mod.F90

@@ -45 +45 @@
                            ! specify number of dynamical steps to run
 
-  integer,save :: ecritphy ! (Mars/generic) output (writediagfi) every
+!  integer,save :: ecritphy ! (Mars/generic) output (writediagfi) every
                            ! ecritphy dynamical steps
   integer,save :: ecritstart ! (Mars) output data in "start.nc" every

trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

@@ -578 +578 @@
 c$OMP1 COPYIN(purmats,forward,leapf,apphys,statcl,conser,apdiss,apdelq)
 c$OMP1 COPYIN(saison,ecripar,fxyhypb,ysinus,read_start,ok_guide)
-c$OMP1 COPYIN(ok_strato,tidal,ok_gradsfile,ok_limit,ok_etat0,physic)
-c$OMP1 COPYIN(grireg,iflag_phys,iflag_trac)
+c$OMP1 COPYIN(ok_strato,tidal,ok_gradsfile,ok_limit,ok_etat0)
+c$OMP1 COPYIN(iflag_phys,iflag_trac)
 
 

trunk/LMDZ.COMMON/libf/dyn3dpar/logic_mod.F90

@@ -6 +6 @@
      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
      &  ,read_start,ok_guide,ok_strato,tidal,ok_gradsfile               &
-     &  ,ok_limit,ok_etat0,physic,grireg
+     &  ,ok_limit,ok_etat0
       logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
                      ! (only used if disvert_type==2)
@@ -16 +16 @@
   !$OMP     apdiss,apdelq,saison,ecripar,fxyhypb,ysinus,              &
   !$OMP     read_start,ok_guide,ok_strato,tidal,ok_gradsfile,         &
-  !$OMP     ok_limit,ok_etat0,physic,grireg)
+  !$OMP     ok_limit,ok_etat0)
 !$OMP THREADPRIVATE(iflag_phys,iflag_trac)