Changeset 3579 for LMDZ6/trunk/libf/dyn3dmem

Timestamp:

Oct 9, 2019, 3:11:07 PM (5 years ago)

Author:

Laurent Fairhead

Message:

Make aquaplanets run again (on jean-zay)
EM & MP

Location:

LMDZ6/trunk/libf/dyn3dmem

Files:

• conf_gcm.F90 (modified) (2 diffs)
• gcm.F90 (modified) (1 diff)
• temps_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90

@@ -25 +25 @@
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
                        alphax,alphay,taux,tauy
-  USE temps_mod, ONLY: calend
+  USE temps_mod, ONLY: calend, year_len
 
   IMPLICIT NONE
@@ -144 +144 @@
   !Config         
   calend = 'earth_360d'
+! initialize year_len for aquaplanets and 1D
   CALL getin('calend', calend)
+     if (calend == 'earth_360d') then
+        year_len=360
+      else if (calend == 'earth_365d') then
+        year_len=365
+      else if (calend == 'earth_366d') then
+        year_len=366
+      else 
+        year_len=1
+      endif
+  
 
   !Config  Key  = dayref

LMDZ6/trunk/libf/dyn3dmem/gcm.F90

@@ -233 +233 @@
        'GCM: AVANT iniacademic AVANT AVANT AVANT AVANT'
   if (.not.read_start) then
+     start_time=0.
      annee_ref=anneeref
      CALL iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)

LMDZ6/trunk/libf/dyn3dmem/temps_mod.F90

@@ -13 +13 @@
   INTEGER   annee_ref
   INTEGER   day_ref
+  INTEGER   year_len
   REAL      dt ! (dynamics) time step (changes if doing Matsuno or LF step)
   REAL      jD_ref ! reference julian day date (beginning of experiment)