Changeset 2603 for LMDZ5/trunk/libf/dyn3d

Timestamp:

Jul 25, 2016, 11:31:56 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: turn logic.h into module logic_mod.F90
EM

Location:

LMDZ5/trunk/libf/dyn3d

Files:

• advect.F (modified) (2 diffs)
• advtrac.F90 (modified) (1 diff)
• conf_gcm.F90 (modified) (2 diffs)
• dteta1.F (modified) (1 diff)
• dynetat0.f90 (modified) (2 diffs)
• dynredem.F90 (modified) (2 diffs)
• gcm.F90 (modified) (2 diffs)
• iniacademic.F90 (modified) (2 diffs)
• integrd.F (modified) (2 diffs)
• leapfrog.F (modified) (2 diffs)
• logic_mod.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3d/logic.h) (1 diff)
• vlsplt.F (modified) (4 diffs)
• vlspltqs.F (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3d/advect.F

@@ -5 +5 @@
 
       USE comconst_mod, ONLY: daysec
+      USE logic_mod, ONLY: conser
       
       IMPLICIT NONE
@@ -29 +30 @@
       include "paramet.h"
       include "comgeom.h"
-      include "logic.h"
       include "ener.h"
 

LMDZ5/trunk/libf/dyn3d/advtrac.F90

@@ -19 +19 @@
   include "comdissip.h"
   include "comgeom2.h"
-  include "logic.h"
   include "ener.h"
   include "description.h"

LMDZ5/trunk/libf/dyn3d/conf_gcm.F90

@@ -16 +16 @@
                           iflag_top_bound, mode_top_bound, tau_top_bound, &
                           ngroup
+  USE logic_mod, ONLY: fxyhypb, iflag_phys, ok_etat0, ok_gradsfile, &
+                       ok_guide, ok_limit, ok_strato, purmats, read_start, &
+                       ysinus
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
                        alphax,alphay,taux,tauy
@@ -37 +40 @@
   include "dimensions.h"
   include "paramet.h"
-  include "logic.h"
   include "comdissnew.h"
   include "iniprint.h"

LMDZ5/trunk/libf/dyn3d/dteta1.F

@@ -21 +21 @@
 
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
+      include "dimensions.h"
+      include "paramet.h"
 
       REAL teta( ip1jmp1,llm ),pbaru( ip1jmp1,llm ),pbarv( ip1jm,llm)

LMDZ5/trunk/libf/dyn3d/dynetat0.f90

@@ -13 +13 @@
   USE comvert_mod, ONLY: pa,preff
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
+  USE logic_mod, ONLY: fxyhypb, ysinus
   USE serre_mod, ONLY: clon, clat, grossismx, grossismy
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
@@ -22 +23 @@
   include "ener.h"
   include "description.h"
-  include "logic.h"
   include "iniprint.h"
 !===============================================================================

LMDZ5/trunk/libf/dyn3d/dynredem.F90

@@ -14 +14 @@
                               nivsig,nivsigs
   USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
+  USE logic_mod, ONLY: fxyhypb, ysinus
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, &
                               taux,tauy
@@ -23 +24 @@
   include "comgeom2.h"
   include "ener.h"
-  include "logic.h"
   include "description.h"
   include "iniprint.h"

LMDZ5/trunk/libf/dyn3d/gcm.F90

@@ -26 +26 @@
                      itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
+  USE logic_mod, ONLY: ecripar, iflag_phys, read_start
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -72 +73 @@
   include "comdissnew.h"
   include "comgeom.h"
-  include "logic.h"
   include "ener.h"
   include "description.h"

LMDZ5/trunk/libf/dyn3d/iniacademic.F90

@@ -17 +17 @@
   use exner_milieu_m, only: exner_milieu
   USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm
+  USE logic_mod, ONLY: iflag_phys, read_start
   USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref
@@ -35 +36 @@
   include "ener.h"
   include "iniprint.h"
-  include "logic.h"
 
   !   Arguments:

LMDZ5/trunk/libf/dyn3d/integrd.F

@@ -9 +9 @@
       use control_mod, only : planet_type
       use comconst_mod, only: pi
+      USE logic_mod, ONLY: leapf
       use comvert_mod, only: ap, bp
       USE temps_mod, ONLY: dt
@@ -33 +34 @@
       include "paramet.h"
       include "comgeom.h"
-      include "logic.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 logic_mod, ONLY: iflag_phys,ok_guide,forward,leapf,apphys,
+     &                     statcl,conser,apdiss,purmats,ok_strato
       USE temps_mod, ONLY: jD_ref,jH_ref,itaufin,day_ini,day_ref,
      &                        start_time,dt
@@ -62 +64 @@
       include "comdissnew.h"
       include "comgeom.h"
-      include "logic.h"
       include "ener.h"
       include "description.h"

LMDZ5/trunk/libf/dyn3d/logic_mod.F90

@@ -2 +2 @@
 ! $Id$
 !
-!
-! NB: keep items of different kinds in seperate common blocs to avoid
-!     "misaligned commons" issues
-!-----------------------------------------------------------------------
-! INCLUDE 'logic.h'
+MODULE logic_mod
 
-      COMMON/logicl/ purmats,forward,leapf,apphys,                      &
-     &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
-     &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0,hybrid
+IMPLICIT NONE
 
-      COMMON/logici/ iflag_phys,iflag_trac
-      
-      LOGICAL purmats,forward,leapf,apphys,statcl,conser,               &
-     & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
-     &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0
-     
-      logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
-                     ! (only used if disvert_type==2)
+  LOGICAL purmats ! true if time stepping is purely Matsuno scheme
+                  ! false implies Matsuno-Leapfrog time stepping scheme
+  LOGICAL forward ! true if during forward phase of Matsuno step
+  LOGICAL leapf ! true if during a leapfrog time stepping step
+  LOGICAL apphys ! true if during a time step when physics will be called
+  LOGICAL statcl
+  LOGICAL conser
+  LOGICAL apdiss ! true if during a time step when dissipation will be called
+  LOGICAL apdelq
+  LOGICAL saison
+  LOGICAL ecripar
+  LOGICAL fxyhypb ! true if using hyperbolic function discretization
+                  ! for latitudinal grid 
+  LOGICAL ysinus ! true if using sine function discretiation
+                 ! for latitudinal grid
+  LOGICAL read_start ! true if reading a start.nc file to initialize fields
+  LOGICAL ok_guide ! true if nudging
+  LOGICAL ok_strato
+  LOGICAL ok_gradsfile
+  LOGICAL ok_limit
+  LOGICAL ok_etat0
+  LOGICAL hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
+                 ! (only used if disvert_type==2)
+  INTEGER iflag_phys ! type of physics to call: 0 none, 1: phy*** package,
+                     ! 2: Held & Suarez, 101-200: aquaplanets & terraplanets
+  INTEGER iflag_trac
 
-      integer iflag_phys,iflag_trac
-!-----------------------------------------------------------------------
+END MODULE logic_mod

LMDZ5/trunk/libf/dyn3d/vlsplt.F

@@ -23 +23 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 
 c
@@ -155 +154 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "iniprint.h"
 c
@@ -529 +527 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
 c
@@ -890 +887 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 c
 c

LMDZ5/trunk/libf/dyn3d/vlspltqs.F

@@ -30 +30 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 
 c
@@ -195 +194 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 c
 c
@@ -565 +563 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
 c