Changeset 3082 for trunk/LMDZ.COMMON/libf/evolution/glaciers_mod.F90

Timestamp:

Oct 11, 2023, 1:40:58 PM (14 months ago)

Author:

jbclement

Message:

PEM:

• Correction of a bug in the initialization of constants. The correct modules are now used: 'comcstfi_h' (and no longer 'comconst_mod'!) in the general case and 'comcstfi_mod' in the case of generic model;
• Addition of the variable 'ecritpem' in "run_PEM.def" to set the frequency of outputs in the "diagfi.nc". By default, 'ecritpem = 1' which means there is one output at each PEM year.

JBC

File:

• trunk/LMDZ.COMMON/libf/evolution/glaciers_mod.F90 (modified) (3 diffs)

trunk/LMDZ.COMMON/libf/evolution/glaciers_mod.F90

@@ -13 +13 @@
 
 contains
-
 
 subroutine co2glaciers_evol(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,vmr_co2_PEM,ps_GCM,global_ave_ps_GCM,global_ave_ps_PEM,co2ice,flag_co2flow,flag_co2flow_mesh)
@@ -101 +100 @@
 
 
-
 subroutine compute_hmaxglaciers(ngrid,nslope,iflat,def_slope_mean,Tice,name_ice,hmax)
 
-use comconst_mod,  only: pi,g
 use abort_pem_mod, only: abort_pem
+#ifndef CPP_STD
+    use comcstfi_h,   only: pi, g
+#else
+    use comcstfi_mod, only: pi, g
+#endif
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -181 +183 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-use comconst_mod,  only: pi
 use abort_pem_mod, only: abort_pem
-
+#ifndef CPP_STD
+    use comcstfi_h,   only: pi
+#else
+    use comcstfi_mod, only: pi
+#endif
 
 implicit none