Changeset 5140 for LMDZ6/branches/Amaury_dev/libf/phylmdiso

Timestamp:

Jul 29, 2024, 10:57:23 AM (5 months ago)

Author:

abarral

Message:

Put comsoil.h, conema3.h, cvflag.h into modules

Location:

LMDZ6/branches/Amaury_dev/libf/phylmdiso

Files:

• concvl.F90 (modified) (2 diffs)
• conema3.F90 (deleted)
• cv30_routines.F90 (modified) (11 diffs)
• cv3_routines.F90 (modified) (15 diffs)
• cv3p_mixing.F90 (modified) (2 diffs)
• cv_driver.F90 (modified) (2 diffs)
• lmdz_comsoil.f90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/phylmdiso/comsoil.h) (1 diff)
• lmdz_conema3.f90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/phylmdiso/conema3.h) (1 diff)
• lmdz_cvflag.f90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/phylmdiso/cvflag.h) (1 diff)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmdiso/concvl.F90

@@ -64 +64 @@
   USE lmdz_print_control, ONLY: prt_level, lunout
   USE lmdz_clesphys
+  USE lmdz_conema3
 
   IMPLICIT NONE
@@ -298 +299 @@
   include "YOETHF.h"
   include "FCTTRE.h"
-!jyg<
-  include "conema3.h"
-!>jyg
 
   IF (first) THEN

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv30_routines.F90

@@ -5 +5 @@
 
 SUBROUTINE cv30_param(nd, delt)
+  USE lmdz_conema3
+
   IMPLICIT NONE
 
@@ -31 +33 @@
 
   include "cv30param.h"
-  include "conema3.h"
 
   INTEGER nd
@@ -1134 +1135 @@
     ! epmax_cape: ajout arguments
 USE lmdz_abort_physic, ONLY: abort_physic
+USE lmdz_conema3
 #ifdef ISO
 USE infotrac_phy, ONLY: ntraciso=>ntiso
@@ -1174 +1176 @@
   include "cvthermo.h"
   include "cv30param.h"
-  include "conema3.h"
 
   ! inputs:
@@ -2668 +2669 @@
 #endif
 #endif
+USE lmdz_cvflag
 
   IMPLICIT NONE
@@ -2674 +2676 @@
   include "cvthermo.h"
   include "cv30param.h"
-  include "cvflag.h"
 
   ! inputs:
@@ -3377 +3378 @@
 #endif
                           )
+        USE lmdz_conema3
 #ifdef ISO
     USE infotrac_phy, ONLY: ntraciso=>ntiso, niso, nzone, itZonIso
@@ -3399 +3401 @@
 #endif
 #endif
+USE lmdz_cvflag
 
   IMPLICIT NONE
@@ -3404 +3407 @@
   include "cvthermo.h"
   include "cv30param.h"
-  include "cvflag.h"
-  include "conema3.h"
 
   ! inputs:
@@ -6336 +6337 @@
                 ,epmax_diag)
         USE lmdz_abort_physic, ONLY: abort_physic
+                USE lmdz_conema3
+
         IMPLICIT NONE
 
@@ -6345 +6348 @@
  include "cvthermo.h"
  include "cv30param.h"
- include "conema3.h"
 
 ! inputs:

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_routines.F90

@@ -9 +9 @@
   USE lmdz_ioipsl_getin_p, ONLY: getin_p
   USE lmdz_phys_para
+  USE lmdz_conema3
+  USE lmdz_cvflag
 
   IMPLICIT NONE
@@ -36 +38 @@
 
   include "cv3param.h"
-  include "cvflag.h"
-  include "conema3.h"
 
   INTEGER, INTENT(IN)              :: nd
@@ -183 +183 @@
 
 SUBROUTINE cv3_incrcount(len, nd, delt, sig)
+  USE lmdz_cvflag
 
 IMPLICIT NONE
@@ -191 +192 @@
 
   include "cv3param.h"
-  include "cvflag.h"
 
 !inputs:
@@ -1467 +1467 @@
   USE lmdz_print_control, ONLY: prt_level
   USE lmdz_abort_physic, ONLY: abort_physic
+USE lmdz_conema3
 #ifdef ISO
 USE infotrac_phy, ONLY: ntraciso=>ntiso
@@ -1485 +1486 @@
 #endif
 #endif
+USE lmdz_cvflag
   IMPLICIT NONE
 
@@ -1507 +1509 @@
   include "cvthermo.h"
   include "cv3param.h"
-  include "conema3.h"
-  include "cvflag.h"
   include "YOMCST2.h"
 
@@ -2783 +2783 @@
 #endif
 #endif
+USE lmdz_cvflag
   IMPLICIT NONE
 
@@ -2792 +2793 @@
   include "cvthermo.h"
   include "cv3param.h"
-  include "cvflag.h"
 
 !inputs:
@@ -3611 +3611 @@
 #endif
 #endif
+USE lmdz_cvflag
   IMPLICIT NONE
 
@@ -3616 +3617 @@
   include "cvthermo.h"
   include "cv3param.h"
-  include "cvflag.h"
 
 !inputs:
@@ -4695 +4695 @@
     USE lmdz_print_control, ONLY: lunout, prt_level
     USE add_phys_tend_mod, ONLY: fl_cor_ebil
+USE lmdz_conema3
 
 #ifdef ISO
@@ -4716 +4717 @@
 #endif
 #endif
+USE lmdz_cvflag
   IMPLICIT NONE
 
   include "cvthermo.h"
   include "cv3param.h"
-  include "cvflag.h"
-  include "conema3.h"
 
 !inputs:
@@ -7594 +7594 @@
                  , pbase, p, ph, tv, buoy, sig, w0,iflag &
                  , epmax_diag)
+
+                  USE lmdz_conema3
+                  USE lmdz_cvflag
+
         IMPLICIT NONE
+
 
         ! On fait varier epmax en fn de la cape
@@ -7603 +7608 @@
   include "cvthermo.h"
   include "cv3param.h"  
-  include "conema3.h"
-  include "cvflag.h"
 
 ! inputs:

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3p_mixing.F90

@@ -39 +39 @@
 #endif
 #endif
+USE lmdz_cvflag
   IMPLICIT NONE
 
@@ -44 +45 @@
   include "cv3param.h"
   include "YOMCST2.h"
-  include "cvflag.h"
 
 !inputs:

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv_driver.F90

@@ -1230 +1230 @@
 
   USE lmdz_ioipsl_getin_p, ONLY: getin_p
+  USE lmdz_cvflag
 
   IMPLICIT NONE
@@ -1236 +1237 @@
   ! iflag_ice_thermo >=1
   INTEGER iflag_ice_thermo
-
-  include "cvflag.h"
 
   ! -- si .TRUE., on rend la gravite plus explicite et eventuellement

LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_comsoil.f90

@@ -1 @@
-link ../phylmd/comsoil.h
+link ../phylmd/lmdz_comsoil.f90

LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_conema3.f90

@@ -1 @@
-link ../phylmd/conema3.h
+link ../phylmd/lmdz_conema3.f90

LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_cvflag.f90

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

LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -422 +422 @@
        USE lmdz_nuage_params
     USE lmdz_compbl, ONLY: iflag_pbl, iflag_pbl_split, iflag_order2_sollw, ifl_pbltree
+    USE lmdz_conema3
 
     IMPLICIT NONE
@@ -912 +913 @@
     EXTERNAL ajsec     ! ajustement sec
     EXTERNAL conlmd    ! convection (schema LMD)
-    EXTERNAL conema3  ! convect4.3
     EXTERNAL hgardfou  ! verifier les temperatures
     EXTERNAL nuage     ! calculer les proprietes radiatives
@@ -1270 +1270 @@
     include "YOETHF.h"
     include "FCTTRE.h"
-    !IM 100106 BEG : pouvoir sortir les ctes de la physique
-    include "conema3.h"
-    !IM 100106 END : pouvoir sortir les ctes de la physique
 
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!