Changeset 1525 for trunk/LMDZ.TITAN/libf

Timestamp:

Mar 30, 2016, 8:24:43 AM (9 years ago)

Author:

emillour

Message:

All GCMs:
More on enforcing dynamics/physics separation: get rid of references to "control_mod" from physics packages.
EM

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• common_mod.F90 (modified) (1 diff)
• dyn1d/rcm1d.F (modified) (1 diff)
• dyn1d/temps_mod.F90 (added)
• phyetat0.F90 (modified) (1 diff)
• phyredem.F90 (modified) (1 diff)
• phys_state_var_mod.F90 (modified) (2 diffs)
• physiq.F (modified) (2 diffs)
• time_phylmdz_mod.F90 (modified) (5 diffs)

trunk/LMDZ.TITAN/libf/phytitan/common_mod.F90

@@ -89 +89 @@
 SUBROUTINE common_init
 use dimphy
-USE control_mod
 IMPLICIT NONE
 #include "dimensions.h"

trunk/LMDZ.TITAN/libf/phytitan/dyn1d/rcm1d.F

@@ -2 +2 @@
       
       USE infotrac
-      use control_mod
+      use control_mod, only: planet_type, day_step
       use comgeomphy
       USE phys_state_var_mod

trunk/LMDZ.TITAN/libf/phytitan/phyetat0.F90

@@ -14 +14 @@
       USE infotrac
       USE comgeomphy,  only: rlatd,rlond
-      USE control_mod, only: raz_date
-      USE time_phylmdz_mod, only: itau_phy
+      USE time_phylmdz_mod, only: itau_phy, raz_date
 
 implicit none

trunk/LMDZ.TITAN/libf/phytitan/phyredem.F90

@@ -13 +13 @@
       USE infotrac
       USE comgeomphy,  only: rlatd,rlond
-      USE control_mod, only: raz_date
-      USE time_phylmdz_mod, only: day_end, annee_ref, itau_phy
+      USE time_phylmdz_mod, only: day_end, annee_ref, itau_phy, raz_date
 
       implicit none

trunk/LMDZ.TITAN/libf/phytitan/phys_state_var_mod.F90

@@ -97 +97 @@
 !======================================================================
 SUBROUTINE phys_state_var_init
-use dimphy
-USE control_mod
+
 IMPLICIT NONE
 #include "dimsoil.h"
@@ -145 +144 @@
 !======================================================================
 SUBROUTINE phys_state_var_end
-use dimphy
-use control_mod
+
 IMPLICIT NONE
 

trunk/LMDZ.TITAN/libf/phytitan/physiq.F

@@ -57 +57 @@
 !      USE histcom ! not needed; histcom is included in ioipsl
       USE infotrac
-      USE control_mod
       use dimphy
       USE comgeomphy
@@ -72 +71 @@
       USE moyzon_mod
       USE write_field_phy
-      USE time_phylmdz_mod, only: itau_phy,day_ref,annee_ref
+      USE time_phylmdz_mod, only: itau_phy,day_ref,annee_ref,nday
       USE logic_mod, only: iflag_trac,moyzon_ch,moyzon_mu
       IMPLICIT none

trunk/LMDZ.TITAN/libf/phytitan/time_phylmdz_mod.F90

@@ -4 +4 @@
     REAL,SAVE    :: pdtphys     ! physics time step (s)
 !$OMP THREADPRIVATE(pdtphys)
+    INTEGER,SAVE :: nday        ! number of days to run
+!$OMP THREADPRIVATE(nday)
     INTEGER,SAVE :: annee_ref   ! reference year from the origin
 !$OMP THREADPRIVATE(annee_ref)
@@ -12 +14 @@
     INTEGER,SAVE :: day_end     ! final day of the run since first day of annee_ref
 !$OMP THREADPRIVATE(day_end)
+    INTEGER,SAVE :: raz_date    ! flag to reset date (0:no, 1:yes)
+!$OMP THREADPRIVATE(raz_date)
     INTEGER,SAVE :: itau_phy     ! number of physics iterations
 !$OMP THREADPRIVATE(itau_phy)
@@ -17 +21 @@
 CONTAINS
 
-  SUBROUTINE init_time(annee_ref_, day_ref_, day_ini_, day_end_, pdtphys_)
+  SUBROUTINE init_time(annee_ref_, day_ref_, day_ini_, day_end_, &
+                       nday_, pdtphys_)
+    USE ioipsl_getin_p_mod, ONLY : getin_p
     IMPLICIT NONE
     INTEGER,INTENT(IN) :: annee_ref_
@@ -23 +29 @@
     INTEGER,INTENT(IN) :: day_ini_
     INTEGER,INTENT(IN) :: day_end_
+    INTEGER,INTENT(IN) :: nday_
     REAL,INTENT(IN) :: pdtphys_
     
@@ -29 +36 @@
     day_ini=day_ini_
     day_end=day_end_
+    nday=nday_
     pdtphys=pdtphys_
 
+    ! Initialize module variable not inherited from dynamics
+    raz_date = 0 ! default value
+    CALL getin_p('raz_date', raz_date)
+    
   END SUBROUTINE init_time