Changeset 2601 for LMDZ5/trunk/libf/dyn3d

Timestamp:

Jul 24, 2016, 11:51:55 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: turn temps.h into module temps_mod.F90
EM

Location:

LMDZ5/trunk/libf/dyn3d

Files:

• advtrac.F90 (modified) (1 diff)
• bilan_dyn.F (modified) (2 diffs)
• conf_gcm.F90 (modified) (2 diffs)
• dynetat0.f90 (modified) (1 diff)
• dynredem.F90 (modified) (3 diffs)
• fluxstokenc.F (modified) (1 diff)
• gcm.F90 (modified) (2 diffs)
• iniacademic.F90 (modified) (2 diffs)
• integrd.F (modified) (2 diffs)
• leapfrog.F (modified) (2 diffs)
• temps_mod.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3d/temps.h) (1 diff)

LMDZ5/trunk/libf/dyn3d/advtrac.F90

@@ -20 +20 @@
   include "comgeom2.h"
   include "logic.h"
-  include "temps.h"
   include "ener.h"
   include "description.h"

LMDZ5/trunk/libf/dyn3d/bilan_dyn.F

@@ -15 +15 @@
       USE comconst_mod, ONLY: pi, cpp
       USE comvert_mod, ONLY: presnivs
+      USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn
 
       IMPLICIT NONE
@@ -21 +22 @@
       include "paramet.h"
       include "comgeom2.h"
-      include "temps.h"
       include "iniprint.h"
 

LMDZ5/trunk/libf/dyn3d/conf_gcm.F90

@@ -18 +18 @@
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
                        alphax,alphay,taux,tauy
+  USE temps_mod, ONLY: calend
 
   IMPLICIT NONE
@@ -38 +39 @@
   include "logic.h"
   include "comdissnew.h"
-  include "temps.h"
   include "iniprint.h"
 

LMDZ5/trunk/libf/dyn3d/dynetat0.f90

@@ -14 +14 @@
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
   USE serre_mod, ONLY: clon, clat, grossismx, grossismy
+  USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
 
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
-  include "temps.h"
   include "comgeom2.h"
   include "ener.h"

LMDZ5/trunk/libf/dyn3d/dynredem.F90

@@ -16 +16 @@
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
                               taux,tauy
+  USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itaufin, start_time
+  
   IMPLICIT NONE
   include "dimensions.h"
   include "paramet.h"
   include "comgeom2.h"
-  include "temps.h"
   include "ener.h"
   include "logic.h"
@@ -170 +171 @@
   USE dynredem_mod, ONLY: dynredem_write_u, dynredem_write_v, dynredem_read_u, &
                           err, modname, fil, msg
+  USE temps_mod, ONLY: itau_dyn, itaufin
+  
   IMPLICIT NONE
   include "dimensions.h"
@@ -175 +178 @@
   include "description.h"
   include "comgeom.h"
-  include "temps.h"
   include "iniprint.h"
 !===============================================================================

LMDZ5/trunk/libf/dyn3d/fluxstokenc.F

@@ -20 +20 @@
       include "comgeom.h"
       include "tracstoke.h"
-      include "temps.h"
       include "iniprint.h"
 

LMDZ5/trunk/libf/dyn3d/gcm.F90

@@ -23 +23 @@
   USE control_mod
   USE mod_const_mpi, ONLY: COMM_LMDZ
+  USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, &
+                     itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
 
@@ -71 +73 @@
   include "comgeom.h"
   include "logic.h"
-  include "temps.h"
   include "ener.h"
   include "description.h"

LMDZ5/trunk/libf/dyn3d/iniacademic.F90

@@ -18 +18 @@
   USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
   USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
+  USE temps_mod, ONLY: annee_ref, day_ini, day_ref
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -33 +34 @@
   include "academic.h"
   include "ener.h"
-  include "temps.h"
   include "iniprint.h"
   include "logic.h"

LMDZ5/trunk/libf/dyn3d/integrd.F

@@ -10 +10 @@
       use comconst_mod, only: pi
       use comvert_mod, only: ap, bp
+      USE temps_mod, ONLY: dt
 
       IMPLICIT NONE
@@ -33 +34 @@
       include "comgeom.h"
       include "logic.h"
-      include "temps.h"
       include "iniprint.h"
 

LMDZ5/trunk/libf/dyn3d/leapfrog.F

@@ -22 +22 @@
       USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs
       USE comconst_mod, ONLY: cpp, dtphys, dtvr, pi, ihf
+      USE temps_mod, ONLY: jD_ref,jH_ref,itaufin,day_ini,day_ref,
+     &                        start_time,dt
 
       IMPLICIT NONE
@@ -61 +63 @@
       include "comgeom.h"
       include "logic.h"
-      include "temps.h"
       include "ener.h"
       include "description.h"

LMDZ5/trunk/libf/dyn3d/temps_mod.F90

@@ -2 +2 @@
 ! $Id$
 !
-!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
-!                 veillez  n'utiliser que des ! pour les commentaires
-!                 et  bien positionner les & des lignes de continuation
-!                 (les placer en colonne 6 et en colonne 73)
-!
-!
-! jD_ref = jour julien de la date de reference (lancement de l'experience)
-! hD_ref = "heure" julienne de la date de reference
-!-----------------------------------------------------------------------
-! INCLUDE 'temps.h'
+MODULE temps_mod
 
-      COMMON/temps/ dt, jD_ref, jH_ref, start_time,                     &
-     &             day_ini, day_end, annee_ref, day_ref,                &
-     &             itau_dyn, itau_phy, itaufin, calend
+IMPLICIT NONE  
 
+  INTEGER   itaufin ! total number of dynamical steps for the run
+  INTEGER   itau_dyn
+  INTEGER   itau_phy
+  INTEGER   day_ini ! initial day # of simulation sequence
+  INTEGER   day_end ! final day # ; i.e. day # when this simulation ends
+  INTEGER   annee_ref
+  INTEGER   day_ref
+  REAL      dt ! (dynamics) time step (changes if doing Matsuno or LF step)
+  REAL      jD_ref ! reference julian day date (beginning of experiment)
+  REAL      jH_ref ! reference julian "hour" of reference julian date
+  REAL      start_time
+  CHARACTER (len=10) :: calend ! calendar type
 
-      INTEGER   itaufin
-      INTEGER itau_dyn, itau_phy 
-      INTEGER day_ini, day_end, annee_ref, day_ref
-      REAL      dt, jD_ref, jH_ref, start_time
-      CHARACTER (len=10) :: calend
+  ! Additionnal Mars stuff:
+  REAL hour_ini ! initial fraction of day of simulation sequence (0=<hour_ini<1)
 
-!-----------------------------------------------------------------------
+END MODULE temps_mod