Changeset 2603 for LMDZ5/trunk/libf/dyn3dmem

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/dyn3dmem

Files:

• advect_new_loc.F (modified) (2 diffs)
• advtrac_loc.F (modified) (1 diff)
• bernoui_loc.F (modified) (1 diff)
• call_calfis_mod.F90 (modified) (1 diff)
• conf_gcm.F90 (modified) (2 diffs)
• convmas1_loc.F90 (modified) (1 diff)
• convmas2_loc.F90 (modified) (1 diff)
• convmas_loc.F90 (modified) (1 diff)
• dteta1_loc.F (modified) (1 diff)
• dynetat0_loc.f90 (modified) (2 diffs)
• dynredem_loc.F90 (modified) (2 diffs)
• gcm.F90 (modified) (3 diffs)
• iniacademic_loc.F90 (modified) (2 diffs)
• initdynav_loc.F (modified) (1 diff)
• initfluxsto_p.F (modified) (1 diff)
• inithist_loc.F (modified) (1 diff)
• integrd_loc.F (modified) (2 diffs)
• leapfrog_loc.F (modified) (2 diffs)
• logic_mod.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3dmem/logic.h) (1 diff)
• tourpot_loc.F90 (modified) (1 diff)
• vlsplt_loc.F (modified) (3 diffs)
• vlspltgen_loc.F (modified) (1 diff)
• vlspltqs_loc.F (modified) (2 diffs)
• writedynav_loc.F (modified) (1 diff)
• writehist_loc.F (modified) (1 diff)

LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F

@@ -8 +8 @@
       USE advect_new_mod
       USE comconst_mod, ONLY: daysec
+      USE logic_mod, ONLY: conser
+      
       IMPLICIT NONE
 c=======================================================================
@@ -31 +33 @@
       include "paramet.h"
       include "comgeom.h"
-      include "logic.h"
       include "ener.h"
 

LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F

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

LMDZ5/trunk/libf/dyn3dmem/bernoui_loc.F

@@ -24 +24 @@
 c   -------------
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
+      include "dimensions.h"
+      include "paramet.h"
 c
 c   Arguments:

LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90

@@ -83 +83 @@
   USE write_field
   USE comconst_mod, ONLY: dtphys
+  USE logic_mod, ONLY: leapf, forward, ok_strato
   USE comvert_mod, ONLY: ap, bp, pressure_exner
   USE temps_mod, ONLY: day_ini, day_ref, jd_ref, jh_ref, start_time
   
   IMPLICIT NONE
-    INCLUDE "logic.h"
     INCLUDE "iniprint.h"
 

LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F90

@@ -20 +20 @@
                           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
@@ -41 +44 @@
   include "dimensions.h"
   include "paramet.h"
-  include "logic.h"
   include "comdissnew.h"
   include "iniprint.h"

LMDZ5/trunk/libf/dyn3dmem/convmas1_loc.F90

@@ -12 +12 @@
   include "paramet.h"
   include "comgeom.h"
-  include "logic.h"
 !===============================================================================
 ! Arguments:

LMDZ5/trunk/libf/dyn3dmem/convmas2_loc.F90

@@ -11 +11 @@
   include "paramet.h"
   include "comgeom.h"
-  include "logic.h"
 !===============================================================================
 ! Arguments:

LMDZ5/trunk/libf/dyn3dmem/convmas_loc.F90

@@ -11 +11 @@
   include "paramet.h"
   include "comgeom.h"
-  include "logic.h"
 !===============================================================================
 ! Arguments:

LMDZ5/trunk/libf/dyn3dmem/dteta1_loc.F

@@ -21 +21 @@
 
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "logic.h"
+      include "dimensions.h"
+      include "paramet.h"
 
       REAL teta( ijb_u:ije_u,llm )

LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90

@@ -15 +15 @@
   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_ref,itau_dyn, &
@@ -25 +26 @@
   include "ener.h"
   include "description.h"
-  include "logic.h"
   include "iniprint.h"
 !===============================================================================

LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90

@@ -16 +16 @@
                          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
@@ -25 +26 @@
   include "comgeom.h"
   include "ener.h"
-  include "logic.h"
   include "description.h"
   include "iniprint.h"

LMDZ5/trunk/libf/dyn3dmem/gcm.F90

@@ -22 +22 @@
 #endif
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
+  USE logic_mod ! all of it, because of copyin clause when calling leapfrog
   USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, &
                        itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end, &
@@ -61 +62 @@
   include "comdissnew.h"
   include "comgeom.h"
-  include "logic.h"
   include "ener.h"
   include "description.h"
@@ -453 +453 @@
 
   !!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
-  !$OMP PARALLEL DEFAULT(SHARED) COPYIN(/logici/,/logicl/) &
+  !$OMP PARALLEL DEFAULT(SHARED) &
   !     Copy all threadprivate variables in temps_mod
   !$OMP COPYIN(dt,jD_ref,jH_ref,start_time,hour_ini,day_ini,day_end) &
-  !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend)
+  !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend) &
+  !     Copy all threadprivate variables from logic_mod
+  !$OMP COPYIN(purmats,forward,leapf,apphys,statcl,conser,apdiss,apdelq) &
+  !$OMP COPYIN(saison,ecripar,fxyhypb,ysinus,read_start,ok_guide) &
+  !$OMP COPYIN(ok_strato,ok_gradsfile,ok_limit,ok_etat0) &
+  !$OMP COPYIN(iflag_phys,iflag_trac)
   CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,time_0)
   !$OMP END PARALLEL

LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90

@@ -19 +19 @@
   USE Write_Field
   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
@@ -37 +38 @@
   include "ener.h"
   include "iniprint.h"
-  include "logic.h"
 
   !   Arguments:

LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F

@@ -49 +49 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"

LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F

@@ -50 +50 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"

LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F

@@ -48 +48 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"

LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F

@@ -13 +13 @@
       USE infotrac, ONLY: ok_iso_verif ! ajout CRisi
       USE comconst_mod, ONLY: pi
+      USE logic_mod, ONLY: leapf
       USE comvert_mod, ONLY: ap, bp
       USE temps_mod, ONLY: dt
@@ -37 +38 @@
       include "paramet.h"
       include "comgeom.h"
-      include "logic.h"
       include "iniprint.h"
 

LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F

@@ -34 +34 @@
        USE comconst_mod, ONLY: cpp, dtvr, ihf
        USE comvert_mod, ONLY: ap, bp, pressure_exner
+       USE logic_mod, ONLY: iflag_phys,ok_guide,forward,leapf,apphys,
+     &                      statcl,conser,apdiss,purmats,ok_strato
        USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini,
      &                        day_ref,start_time,dt
@@ -74 +76 @@
       include "comdissnew.h"
       include "comgeom.h"
-      include "logic.h"
       include "ener.h"
       include "description.h"

LMDZ5/trunk/libf/dyn3dmem/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
-!$OMP THREADPRIVATE(/logicl/)
-!$OMP THREADPRIVATE(/logici/)
-!-----------------------------------------------------------------------
+!$OMP THREADPRIVATE(purmats,forward,leapf,apphys,statcl,conser, &
+!$OMP     apdiss,apdelq,saison,ecripar,fxyhypb,ysinus, &
+!$OMP     read_start,ok_guide,ok_strato,ok_gradsfile, &
+!$OMP     ok_limit,ok_etat0,hybrid)
+!$OMP THREADPRIVATE(iflag_phys,iflag_trac)
+
+!WARNING: when adding a threadprivate variable in this module
+!        do not forget to add it to the copyin clause when opening an OpenMP
+!        parallel section. e.g. in gcm before call leapfrog_loc 
+
+END MODULE logic_mod

LMDZ5/trunk/libf/dyn3dmem/tourpot_loc.F90

@@ -11 +11 @@
   include "paramet.h"
   include "comgeom.h"
-  include "logic.h"
 !===============================================================================
 ! Arguments:

LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F

@@ -19 +19 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 c
 c
@@ -420 +419 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
 c
@@ -874 +872 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 c
 c

LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F

@@ -37 +37 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 
 c

LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F

@@ -14 +14 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
 c
 c
@@ -423 +422 @@
       include "dimensions.h"
       include "paramet.h"
-      include "logic.h"
       include "comgeom.h"
 c

LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F

@@ -48 +48 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"

LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F

@@ -48 +48 @@
       include "comgeom.h"
       include "ener.h"
-      include "logic.h"
       include "description.h"
       include "iniprint.h"