Changeset 1593 for trunk/LMDZ.GENERIC

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.GENERIC

Files:

• README (modified) (1 diff)
• libf/dyn3d/control_mod.F90 (modified) (1 diff)
• libf/dyn3d/defrun_new.F (modified) (3 diffs)
• libf/dyn3d/gcm.F (modified) (5 diffs)
• libf/dyn3d/logic_mod.F90 (modified) (1 diff)
• libf/dynphy_lonlat/phystd/start2archive.F (modified) (2 diffs)

trunk/LMDZ.GENERIC/README

@@ -1247 +1247 @@
 - fix newstart which was broken due to recent updates of the physics/dynamics
   interface.
+
+== 09/09/2016 == EM
+- Some code cleanup (and harmonization with LMDZ.COMMON): remove "ecritphy"
+  from the dynamics (since it is read/used in the physics) and remove
+  "grireg" (unused) and "physic" (use iflag_phys instead) parameters from
+  the dynamics.

trunk/LMDZ.GENERIC/libf/dyn3d/control_mod.F90

@@ -12 +12 @@
   integer,save :: anneeref ! reference year # ! not used
   real,save :: periodav
-  integer,save :: ecritphy ! output data in "diagfi.nc" every ecritphy dynamical steps 
+!  integer,save :: ecritphy ! output data in "diagfi.nc" every ecritphy dynamical steps 
   character(len=10),save :: planet_type ! planet type ('earth','mars',...)
   character(len=4),save :: config_inca

trunk/LMDZ.GENERIC/libf/dyn3d/defrun_new.F

@@ -40 +40 @@
       use sponge_mod,only: callsponge,nsponge,mode_sponge,tetasponge
       use control_mod,only: nday, day_step, iperiod, anneeref,
-     &                      iconser, idissip, iphysiq, ecritphy
-      USE logic_mod, ONLY: hybrid,purmats,physic,grireg,fxyhypb,ysinus
+     &                      iconser, idissip, iphysiq
+      USE logic_mod, ONLY: hybrid,purmats,fxyhypb,ysinus,iflag_phys
       USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,
      .                  alphax,alphay,taux,tauy
@@ -210 +210 @@
         WRITE(lunout,*) ""
         WRITE(lunout,*) "avec ou sans physique"
-        physic=.true. ! default value
-        call getin("physic",physic)
-        WRITE(lunout,*)" physic = ",physic
+!        physic=.true. ! default value
+!        call getin("physic",physic)
+!        WRITE(lunout,*)" physic = ",physic
+        iflag_phys=1 ! default value
+        call getin("iflag_phys",iflag_phys)
+        WRITE(lunout,*)" iflag_phys = ",iflag_phys
 
         WRITE(lunout,*) ""
@@ -220 +223 @@
         WRITE(lunout,*)" iphysiq = ",iphysiq
 
-        WRITE(lunout,*) ""
-        WRITE(lunout,*) "choix d'une grille reguliere"
-        grireg=.true.
-        call getin("grireg",grireg)
-        WRITE(lunout,*)" grireg = ",grireg
+!        WRITE(lunout,*) ""
+!        WRITE(lunout,*) "choix d'une grille reguliere"
+!        grireg=.true.
+!        call getin("grireg",grireg)
+!        WRITE(lunout,*)" grireg = ",grireg
 
 ccc   .... P.Le Van, ajout le 03/01/96 pour l'ecriture phys ...
 c
-        WRITE(lunout,*) ""
-        WRITE(lunout,*) "frequence (en pas) de l'ecriture ",
-     & "du fichier diagfi.nc"
-        ecritphy=240
-        call getin("ecritphy",ecritphy)
-        WRITE(lunout,*)" ecritphy = ",ecritphy
+!        WRITE(lunout,*) ""
+!        WRITE(lunout,*) "frequence (en pas) de l'ecriture ",
+!     & "du fichier diagfi.nc"
+!        ecritphy=240
+!        call getin("ecritphy",ecritphy)
+!        WRITE(lunout,*)" ecritphy = ",ecritphy
 
 ccc  ....   P. Le Van , ajout  le 7/03/95 .pour le zoom ...

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

@@ -5 +5 @@
       use sponge_mod,only: callsponge,mode_sponge,sponge
       use control_mod, only: nday, day_step, iperiod, iphysiq,
-     &                       iconser, ecritphy, idissip
+     &                       iconser, idissip
 !      use comgeomphy, only: initcomgeomphy
       USE mod_const_mpi, ONLY: COMM_LMDZ
@@ -12 +12 @@
       USE comconst_mod, ONLY: daysec,dtvr,dtphys,dtdiss,rad,g,r,cpp
       USE logic_mod, ONLY: ecripar,forward,leapf,apphys,statcl,conser,
-     .          apdiss,purmats,physic,apphys
+     .          apdiss,purmats,iflag_phys,apphys
       USE temps_mod, ONLY: day_ini,day_end,itaufin,dt
       USE iniphysiq_mod, ONLY: iniphysiq
@@ -260 +260 @@
      &                  rlatu,rlatv,rlonu,rlonv,
      &                  aire,cu,cv,rad,g,r,cpp,
-     &                  1)
-!     &                iflag_phys)
+     &                iflag_phys)
 !#endif
 !         call_iniphys=.false.
@@ -369 +368 @@
          IF( MOD(itau,idissip ).EQ.0.AND..NOT.forward ) apdiss = .TRUE.
          IF( MOD(itau,iphysiq ).EQ.0.AND..NOT.forward 
-     $                              .AND.   physic    ) apphys = .TRUE.
+     $                        .AND. (iflag_phys.eq.1) ) apphys = .TRUE.
       ELSE
          IF( MOD(itau   ,iconser) .EQ. 0              ) conser = .TRUE.
          IF( MOD(itau+1,idissip)  .EQ. 0              ) apdiss = .TRUE.
-         IF( MOD(itau+1,iphysiq).EQ.0. AND. physic    ) apphys = .TRUE.
+         IF( MOD(itau+1,iphysiq).EQ.0
+     &                     .AND. (iflag_phys.eq.1)    ) apphys = .TRUE.
       END IF
 
@@ -473 +473 @@
            rdayvrai   = rdaym_ini  + day_ini
 
-           IF ( ecritphy.LT.1. )  THEN
-             rday_ecri = rdaym_ini
-           ELSE
+! Ehouarn: what was this for ??
+!           IF ( ecritphy.LT.1. )  THEN
+!             rday_ecri = rdaym_ini
+!           ELSE
              rday_ecri = INT(rdaym_ini)+INT(day_ini)
-           ENDIF
+!           ENDIF
 c
 

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

@@ -3 +3 @@
 IMPLICIT NONE  
 
-LOGICAL purmats,physic,forward,leapf,apphys,grireg,statcl,conser, &
+LOGICAL purmats,forward,leapf,apphys,statcl,conser, &
      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus,hybrid,autozlevs
 
+INTEGER iflag_phys ! ==1 if calling a physics package
 
 END MODULE logic_mod

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/start2archive.F

@@ -35 +35 @@
       USE comvert_mod, ONLY: ap,bp
       USE comconst_mod, ONLY: daysec,dtphys,rad,g,r,cpp
-      USE logic_mod, ONLY: grireg
       USE temps_mod, ONLY: day_ini
       USE iniphysiq_mod, ONLY: iniphysiq
@@ -145 +144 @@
 
       CALL defrun_new(99, .TRUE. )
-      grireg   = .TRUE.
 
       planet_type="generic"