Changeset 5259 for LMDZ6/trunk

Timestamp:

Oct 22, 2024, 5:32:42 PM (2 months ago)

Author:

abarral

Message:

Wrap uses of cpp key CPP_INLANDSIS
Symlink inlandsis in iso

Location:

LMDZ6/trunk

Files:

• libf/phylmd/inlandsis/sisvat_ts2.f90 (modified) (1 diff)
• libf/phylmd/inlandsis/surf_inlandsis_mod.F90 (modified) (2 diffs)
• libf/phylmd/surf_landice_mod.F90 (modified) (3 diffs)
• makelmdz (modified) (1 diff)
• makelmdz_fcm (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/inlandsis/sisvat_ts2.f90

@@ -262 +262 @@
   !      IRs__D(ig) = dIRsdT(ig)* Tsf_SV(ig) * 0.75 !TsisSV(ig,isl) * 0.75    !:
       dIRsdT(ig) = Eso_sv(ig)* StefBo   * 4.                        & ! - d(IR)/d(T)
-            * TsisSV(ig,isl)                     & !
-            * TsisSV(ig,isl)                     & !
-            * TsisSV(ig,isl)                     & !
+            * TsisSV(ig,isl)                     &
+            * TsisSV(ig,isl)                     &
+            * TsisSV(ig,isl)
       IRs__D(ig) = dIRsdT(ig)* TsisSV(ig,isl) * 0.75                  !:
      END DO

LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

@@ -1054 +1054 @@
         !    include "dimsoil.h"
         include "clesphys.h"
-        include "thermcell.h"
         include "compbl.h"
 
@@ -1288 +1287 @@
 
         include "netcdf.inc"
-        !    include "indicesol.h"
-        !    include "dimsoil.h"
         include "clesphys.h"
-        include "thermcell.h"
         include "compbl.h"
 

LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90

@@ -52 +52 @@
     USE lmdz_blowing_snow_ini, ONLY : c_esalt_bs, zeta_bs, pbst_bs, prt_bs, rhoice_bs, rhohard_bs
     USE lmdz_blowing_snow_ini, ONLY : rhofresh_bs, tau_eqsalt_bs, tau_dens0_bs, tau_densmin_bs
-#ifdef CPP_INLANDSIS
     USE surf_inlandsis_mod,  ONLY : surf_inlandsis
-#endif
 
     USE indice_sol_mod
+    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INLANDSIS
 
 !    INCLUDE "indicesol.h"
@@ -265 +264 @@
 ! CALL to INLANDSIS interface
 !****************************************************************************************
-#ifdef CPP_INLANDSIS
+IF (CPPKEY_INLANDSIS) THEN
 
 #ifdef ISO
@@ -342 +341 @@
 
 
-#else
+ELSE
        abort_message='Pb de coherence: landice_opt = 1  mais CPP_INLANDSIS = .false.'
        CALL abort_physic(modname,abort_message,1)
-#endif
+END IF
 
 

LMDZ6/trunk/makelmdz

@@ -482 +482 @@
 fi
 
-if [[ "$inlandsis" == "true" ]]
-then
+src_dirs="$src_dirs phy${physique}/inlandsis"
+if [[ "$inlandsis" == "true" ]]; then
    CPP_KEY="$CPP_KEY CPP_INLANDSIS"
-   src_dirs="$src_dirs phy${physique}/inlandsis"
 fi
 

LMDZ6/trunk/makelmdz_fcm

@@ -471 +471 @@
 fi
 
-if [[ "$inlandsis" == "true" ]]
-then
+INLANDSIS_PATH="$LIBFGCM/phy${physique}/inlandsis"
+if [[ "$inlandsis" == "true" ]]; then
    CPP_KEY="$CPP_KEY CPP_INLANDSIS"
-   INLANDSIS_PATH="$LIBFGCM/phy${physique}/inlandsis"
 fi