Changeset 5275 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Oct 25, 2024, 4:16:13 PM (20 hours ago)

Author:

abarral

Message:

Turn cvflag.h into a module

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• cv30_routines.F90 (modified) (3 diffs)
• cv3_routines.F90 (modified) (13 diffs)
• cv3p_mixing.F90 (modified) (2 diffs)
• cv_driver.F90 (modified) (2 diffs)
• cvflag_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/cvflag.h) (1 diff)

LMDZ6/trunk/libf/phylmdiso/cv30_routines.F90

@@ -2668 +2668 @@
 #endif
 
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   IMPLICIT NONE
 
@@ -2673 +2675 @@
   include "cvthermo.h"
   include "cv30param.h"
-  include "cvflag.h"
 
   ! inputs:
@@ -3402 +3403 @@
 #endif
 
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   IMPLICIT NONE
 
   include "cvthermo.h"
   include "cv30param.h"
-  include "cvflag.h"
   include "conema3.h"
 

LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90

@@ -7 +7 @@
 SUBROUTINE cv3_param(nd, k_upper, delt)
 
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   USE ioipsl_getin_p_mod, ONLY : getin_p
   use mod_phys_lmdz_para
@@ -36 +38 @@
 
   include "cv3param.h"
-  include "cvflag.h"
   include "conema3.h"
 
@@ -184 +185 @@
 SUBROUTINE cv3_incrcount(len, nd, delt, sig)
 
-IMPLICIT NONE
+USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
+  IMPLICIT NONE
 
 ! =====================================================================
@@ -191 +194 @@
 
   include "cv3param.h"
-  include "cvflag.h"
 
 !inputs:
@@ -1482 +1484 @@
 #endif
 #endif
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   IMPLICIT NONE
 
@@ -1505 +1509 @@
   include "cv3param.h"
   include "conema3.h"
-  include "cvflag.h"
   include "YOMCST2.h"
 
@@ -2781 +2784 @@
 #endif
 #endif
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   IMPLICIT NONE
 
@@ -2790 +2795 @@
   include "cvthermo.h"
   include "cv3param.h"
-  include "cvflag.h"
 
 !inputs:
@@ -3608 +3612 @@
 #endif
 #endif
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   IMPLICIT NONE
 
@@ -3613 +3619 @@
   include "cvthermo.h"
   include "cv3param.h"
-  include "cvflag.h"
   include "nuage.h"
 
@@ -4720 +4725 @@
 #endif
 #endif
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   IMPLICIT NONE
 
   include "cvthermo.h"
   include "cv3param.h"
-  include "cvflag.h"
   include "conema3.h"
 
@@ -7609 +7615 @@
                  , pbase, p, ph, tv, buoy, sig, w0,iflag &
                  , epmax_diag)
-        implicit none
+        USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
+  implicit none
 
         ! On fait varier epmax en fn de la cape
@@ -7617 +7625 @@
 
   include "cvthermo.h"
-  include "cv3param.h"  
+  include "cv3param.h"
   include "conema3.h"
-  include "cvflag.h"
 
 ! inputs:

LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90

@@ -39 +39 @@
 #endif
 #endif
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   IMPLICIT NONE
 
@@ -44 +46 @@
   include "cv3param.h"
   include "YOMCST2.h"
-  include "cvflag.h"
 
 !inputs:

LMDZ6/trunk/libf/phylmdiso/cv_driver.F90

@@ -1229 +1229 @@
 SUBROUTINE cv_flag(iflag_ice_thermo)
 
+  USE cvflag_mod_h, ONLY: icvflag_Tpa, cvflag_grav, cvflag_ice, ok_optim_yield, ok_entrain, ok_homo_tend, &
+          ok_convstop, ok_intermittent, cvflag_prec_eject, qsat_depends_on_qt, adiab_ascent_mass_flux_depends_on_ejectliq, keepbug_ice_frac
   USE ioipsl_getin_p_mod, ONLY : getin_p
 
@@ -1249 +1251 @@
   INTEGER iflag_ice_thermo
 
-  include "cvflag.h"
 
   ! -- si .TRUE., on rend la gravite plus explicite et eventuellement

LMDZ6/trunk/libf/phylmdiso/cvflag_mod_h.f90

@@ -1 @@
-link ../phylmd/cvflag.h
+link ../phylmd/cvflag_mod_h.f90