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

Timestamp:

Jul 31, 2024, 5:24:31 PM (4 months ago)

Author:

abarral

Message:

Move CPP_COSP* in lmdz_cppkeys_wrapper.F90
Change calcul_divers.h into lmdz_calcul_divers.f90

Location:

LMDZ6/branches/Amaury_dev/libf/phylmdiso

Files:

• ini_COSP.F90 (added)
• ini_COSP.h (added)
• lmdz_calcul_divers.f90 (added)
• physiq_mod.F90 (modified) (11 diffs)

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

@@ -110 +110 @@
     USE phytrac_mod, ONLY: phytrac_init, phytrac
     USE phys_output_write_mod
-
-    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DUST, CPPKEY_STRATAER
+    USE lmdz_calcul_divers, ONLY: calcul_divers
+
+    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_DUST, CPPKEY_STRATAER, CPPKEY_COSP, CPPKEY_COSP2, CPPKEY_COSPV2
 
 !!!!!!!!!!!!!!!!!! "USE" section for CPP keys !!!!!!!!!!!!!!!!!!!!!!!!
@@ -1274 +1275 @@
     !============================================================
     ! AI 10-22
-#ifdef CPP_COSP
-    include "ini_COSP.h"
-#endif
-#ifdef CPP_COSPV2
-    include "ini_COSP.h"
-#endif
+    INCLUDE "ini_COSP.h"
+
     REAL :: mr_ozone(klon,klev), phicosp(klon,klev)
 
@@ -1922 +1919 @@
 
       IF (ok_cosp) THEN
-#ifdef CPP_COSP
+IF (CPPKEY_COSP) THEN
         ! A.I : Initialisations pour le 1er passage a Cosp
         CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
@@ -1941 +1938 @@
                pmflxr_cosp0(:,1:klev),pmflxs_cosp0(:,1:klev), &
                mr_ozone_cosp0,cldtau_cosp0, cldemi_cosp0)
-#endif
-
-#ifdef CPP_COSP2
+END IF
+
+IF (CPPKEY_COSP2) THEN
         CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
                zxtsol_cosp0,zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0, &
@@ -1961 +1958 @@
                pmflxr(:,1:klev),pmflxs(:,1:klev), &
                mr_ozone,cldtau, cldemi)
-#endif
-
-#ifdef CPP_COSPV2
+END IF
+
+IF (CPPKEY_COSPV2) THEN
           CALL lmdz_cosp_interface(itap,phys_tstep,freq_cosp, &
                ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, &
@@ -1976 +1973 @@
                pmflxr(:,1:klev),pmflxs(:,1:klev), &
                mr_ozone,cldtau, cldemi)
-#endif
+END IF
       ENDIF
 
@@ -6645 +6642 @@
     IF (ok_cosp) THEN
        ! adeclarer 
-#ifdef CPP_COSP
-       IF (itap.EQ.1.OR.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
-
-          IF (prt_level .GE.10) THEN
+IF (CPPKEY_COSP) THEN
+       IF (itap==1.OR.MOD(itap,NINT(freq_cosp/phys_tstep))==0) THEN
+
+          IF (prt_level >=10) THEN
              PRINT*,'freq_cosp',freq_cosp
           ENDIF
@@ -6674 +6671 @@
 
        ENDIF
-#endif
-
-#ifdef CPP_COSP2
-       IF (itap.EQ.1.OR.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
-
-          IF (prt_level .GE.10) THEN
+END IF
+
+IF (CPPKEY_COSP2) THEN
+       IF (itap==1.OR.MOD(itap,NINT(freq_cosp/phys_tstep))==0) THEN
+
+          IF (prt_level >=10) THEN
              PRINT*,'freq_cosp',freq_cosp
           ENDIF
@@ -6698 +6695 @@
                mr_ozone,cldtau, cldemi)
        ENDIF
-#endif
-
-#ifdef CPP_COSPV2
-       IF (itap.EQ.1.OR.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
+END IF
+
+IF (CPPKEY_COSPV2) THEN
+       IF (itap==1.OR.MOD(itap,NINT(freq_cosp/phys_tstep))==0) THEN
 !        IF (MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN
 
-          IF (prt_level .GE.10) THEN
+          IF (prt_level >=10) THEN
              PRINT*,'freq_cosp',freq_cosp
           ENDIF
@@ -6728 +6725 @@
                mr_ozone,cldtau, cldemi)
        ENDIF
-#endif
+END IF
 
     ENDIF  !ok_cosp
@@ -7017 +7014 @@
 
     !IM initialisation + calculs divers diag AMIP2
-
-    include "calcul_divers.h"
+    CALL calcul_divers(itap, itapm1, un_jour)
 
     !IM Interpolation sur les niveaux de pression du NMC