Changeset 5299 for LMDZ6/trunk/libf/phylmd/cv3_routines.f90

Timestamp:

Oct 30, 2024, 2:31:56 PM (27 hours ago)

Author:

abarral

Message:

Turn cv3param.h into module

File:

• LMDZ6/trunk/libf/phylmd/cv3_routines.f90 (modified) (26 diffs)

LMDZ6/trunk/libf/phylmd/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
 ! abderr     do 110 k=1,nl ! convect3
@@ -314 +309 @@
   USE print_control_mod, ONLY: prt_level
   USE cvthermo_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -330 +326 @@
 ! - A,B explicitely defined (!...)
 ! ================================================================
-
-  include "cv3param.h"
 
 !inputs:
@@ -606 +600 @@
   USE cvthermo_mod_h
   USE cvflag_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -620 +615 @@
 !    - if icbs=icb, compute also tp(icb+1),tvp(icb+1) & clw(icb+1)
 ! ----------------------------------------------------------------
-
-  include "cv3param.h"
 
 ! inputs:
@@ -881 +874 @@
 SUBROUTINE cv3_trigger(len, nd, icb, plcl, p, th, tv, tvp, thnk, &
                        pbase, buoybase, iflag, sig, w0)
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -897 +891 @@
 ! -> the buoyancy below cloud base not (yet) set to the cloud base buoyancy
 ! -------------------------------------------------------------------
-
-  include "cv3param.h"
 
 ! input:
@@ -995 +987 @@
                         h, lv, cpn, p, ph, tv, tp, tvp, clw, &
                         sig, w0)
-  USE print_control_mod, ONLY: lunout
+USE cv3param_mod_h
+    USE print_control_mod, ONLY: lunout
   IMPLICIT NONE
 
-  include "cv3param.h"
 
 !inputs:
@@ -1140 +1132 @@
   USE cvthermo_mod_h
   USE conema3_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -1160 +1153 @@
 ! ---------------------------------------------------------------------
 
-  include "cv3param.h"
   include "YOMCST2.h"
 
@@ -2047 +2039 @@
                        pbase, p, ph, tv, buoy, &
                        sig, w0, cape, m, iflag)
-  USE cvthermo_mod_h
+USE cv3param_mod_h
+    USE cvthermo_mod_h
   USE cvflag_mod_h
   IMPLICIT NONE
@@ -2057 +2050 @@
 ! ===================================================================
 
-  include "cv3param.h"
 
 !input:
@@ -2292 +2284 @@
   USE cvflag_mod_h
   USE cvthermo_mod_h
+  USE cv3param_mod_h
   IMPLICIT NONE
 
@@ -2298 +2291 @@
 ! - vectorisation de la partie normalisation des flux (do 789...)
 ! ---------------------------------------------------------------------
-
-  include "cv3param.h"
 
 !inputs:
@@ -2712 +2703 @@
                      faci, b, sigd, &
                      wdtrainA, wdtrainS, wdtrainM)                                      ! RomP
-  USE cvthermo_mod_h
+USE cv3param_mod_h
+    USE cvthermo_mod_h
   USE cvflag_mod_h
   USE print_control_mod, ONLY: prt_level, lunout
   IMPLICIT NONE
 
-  include "cv3param.h"
   include "nuage.h"
 
@@ -3456 +3447 @@
                      ftd, fqd, qta, qtc, sigt, detrain, tau_cld_cv, coefw_cld_cv)
 
-USE conema3_mod_h
+USE cv3param_mod_h
+  USE conema3_mod_h
       USE print_control_mod, ONLY: lunout, prt_level
     USE add_phys_tend_mod, only : fl_cor_ebil
@@ -3463 +3455 @@
   IMPLICIT NONE
 
-  include "cv3param.h"
 
 !inputs:
@@ -4953 +4944 @@
                       ep, Vprecip, elij, clw, epmlmMm, eplaMm, &
                       icb, inb)
-  USE cvthermo_mod_h
+USE cv3param_mod_h
+    USE cvthermo_mod_h
   USE cvflag_mod_h
   IMPLICIT NONE
 
-  include "cv3param.h"
 
 !inputs:
@@ -5062 +5053 @@
                           Ma1, upwd1, dnwd1, dnwd01, qcondc1, wd1, cape1, &
                           epmax_diag1) ! epmax_cape
-  IMPLICIT NONE
-
-  include "cv3param.h"
+USE cv3param_mod_h
+    IMPLICIT NONE
+
 
 !inputs:
@@ -5141 +5132 @@
                  , pbase, p, ph, tv, buoy, sig, w0,iflag &
                  , epmax_diag)
-USE conema3_mod_h
+USE cv3param_mod_h
+  USE conema3_mod_h
             USE cvflag_mod_h
           USE cvthermo_mod_h
@@ -5151 +5143 @@
         ! Toutes les autres variables fn de ep sont calcul�es plus bas.
 
-  include "cv3param.h"
 
 ! inputs: