Changeset 5299 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Oct 30, 2024, 2:31:56 PM (5 weeks ago)

Author:

abarral

Message:

Turn cv3param.h into module

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• cv3_routines.F90 (modified) (25 diffs)
• cv3a_compress.F90 (modified) (1 diff)
• cv3a_uncompress.F90 (modified) (1 diff)
• cv3p_mixing.F90 (modified) (1 diff)
• cv3param_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/cv3param.h) (1 diff)

LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90

@@ -11 +11 @@
   use mod_phys_lmdz_para
   USE conema3_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -35 +36 @@
 !***                 APPROACH TO QUASI-EQUILIBRIUM           ***
 !***                     IT MUST BE LESS THAN 0              ***
-
-  include "cv3param.h"
 
   INTEGER, INTENT(IN)              :: nd
@@ -185 +184 @@
 USE cvthermo_mod_h
   USE cvflag_mod_h
+USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -190 +190 @@
 !  Increment the counter sig(nd)
 ! =====================================================================
-
-  include "cv3param.h"
 
 !inputs:
@@ -225 +223 @@
                       lv, lf, cpn, tv, gz, h, hm, th)
   USE cvthermo_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -247 +246 @@
   REAL tvx, tvy ! convect3
   REAL cpx(len, nd)
-
-  include "cv3param.h"
-
 
 ! ori      do 110 k=1,nlp
@@ -325 +321 @@
   USE add_phys_tend_mod, ONLY: fl_cor_ebil
   USE print_control_mod, ONLY: prt_level
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -341 +338 @@
 ! - A,B explicitely defined (!...)
 ! ================================================================
-
-  include "cv3param.h"
 
 !inputs:
@@ -700 +695 @@
 #endif
   USE cvthermo_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -714 +710 @@
 !    - if icbs=icb, compute also tp(icb+1),tvp(icb+1) & clw(icb+1)
 ! ----------------------------------------------------------------
-
-  include "cv3param.h"
 
 ! inputs:
@@ -1146 +1140 @@
 SUBROUTINE cv3_trigger(len, nd, icb, plcl, p, th, tv, tvp, thnk, &
                        pbase, buoybase, iflag, sig, w0)
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -1162 +1157 @@
 ! -> the buoyancy below cloud base not (yet) set to the cloud base buoyancy
 ! -------------------------------------------------------------------
-
-  include "cv3param.h"
 
 ! input:
@@ -1276 +1269 @@
 #endif
 #endif
-  IMPLICIT NONE
-
-  include "cv3param.h"
+USE cv3param_mod_h
+    IMPLICIT NONE
+
 
 !inputs:
@@ -1485 +1478 @@
   USE cvflag_mod_h
   USE conema3_mod_h
+USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -1504 +1498 @@
 !   - no inb1, only inb in output
 ! ---------------------------------------------------------------------
-
-  include "cv3param.h"
-  include "YOMCST2.h"
+ include "YOMCST2.h"
 
 !inputs:
@@ -2510 +2502 @@
                        pbase, p, ph, tv, buoy, &
                        sig, w0, cape, m, iflag)
-  USE cvthermo_mod_h
+USE cv3param_mod_h
+    USE cvthermo_mod_h
   IMPLICIT NONE
 
@@ -2519 +2512 @@
 ! ===================================================================
 
-  include "cv3param.h"
 
 !input:
@@ -2783 +2775 @@
   USE cvthermo_mod_h
   USE cvflag_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -2789 +2782 @@
 ! - vectorisation de la partie normalisation des flux (do 789...)
 ! ---------------------------------------------------------------------
-
-  include "cv3param.h"
 
 !inputs:
@@ -3608 +3599 @@
 #endif
 #endif
-  USE cvthermo_mod_h
+USE cv3param_mod_h
+    USE cvthermo_mod_h
   USE cvflag_mod_h
   IMPLICIT NONE
 
 
-  include "cv3param.h"
   include "nuage.h"
 
@@ -4720 +4711 @@
 #endif
 #endif
-USE conema3_mod_h
+USE cv3param_mod_h
+  USE conema3_mod_h
     USE cvthermo_mod_h
   USE cvflag_mod_h
   IMPLICIT NONE
 
-  include "cv3param.h"
 
 !inputs:
@@ -7289 +7280 @@
                       ep, Vprecip, elij, clw, epmlmMm, eplaMm, &
                       icb, inb)
-  IMPLICIT NONE
-
-  include "cv3param.h"
+USE cv3param_mod_h
+    IMPLICIT NONE
+
 
 !inputs:
@@ -7424 +7415 @@
 #endif
 #endif
-  IMPLICIT NONE
-
-  include "cv3param.h"
+USE cv3param_mod_h
+    IMPLICIT NONE
+
 
 !inputs:
@@ -7609 +7600 @@
                  , pbase, p, ph, tv, buoy, sig, w0,iflag &
                  , epmax_diag)
-USE conema3_mod_h
+USE cv3param_mod_h
+  USE conema3_mod_h
           USE cvthermo_mod_h
   USE cvflag_mod_h
@@ -7619 +7611 @@
         ! Toutes les autres variables fn de ep sont calculees plus bas.
 
-  include "cv3param.h"
 
 ! inputs:

LMDZ6/trunk/libf/phylmdiso/cv3a_compress.F90

@@ -41 +41 @@
 #endif
 
-  IMPLICIT NONE
-
-  include "cv3param.h"
+USE cv3param_mod_h
+    IMPLICIT NONE
+
 
   ! inputs:

LMDZ6/trunk/libf/phylmdiso/cv3a_uncompress.F90

@@ -56 +56 @@
   USE infotrac_phy, ONLY : ntraciso=>ntiso
 #endif
-  IMPLICIT NONE
-
-  include "cv3param.h"
+USE cv3param_mod_h
+    IMPLICIT NONE
+
 
   ! inputs:

LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90

@@ -39 +39 @@
 #endif
 #endif
-  USE cvthermo_mod_h
+USE cv3param_mod_h
+    USE cvthermo_mod_h
   USE cvflag_mod_h
   IMPLICIT NONE
 
-  include "cv3param.h"
   include "YOMCST2.h"
 

LMDZ6/trunk/libf/phylmdiso/cv3param_mod_h.f90

@@ -1 @@
-link ../phylmd/cv3param.h
+link ../phylmd/cv3param_mod_h.f90