Changeset 3491 for LMDZ6/trunk/makelmdz

Timestamp:

May 2, 2019, 3:03:32 PM (5 years ago)

Author:

idelkadi

Message:

Integration of version 2 of the COSP simulator in LMDZ
This line, and those below, will be ignored--

M makegcm
M makelmdz
M makelmdz_fcm
M libf/phylmd/physiq_mod.F90
A libf/phylmd/cospv2
A libf/phylmd/cospv2/mo_rng.F90
A libf/phylmd/cospv2/quickbeam_optics.F90
A libf/phylmd/cospv2/cosp_cloudsat_interface.F90
A libf/phylmd/cospv2/cosp_config.F90
A libf/phylmd/cospv2/lidar_simulator.F90
A libf/phylmd/cospv2/prec_scops.F90
A libf/phylmd/cospv2/mrgrnk.F90
A libf/phylmd/cospv2/lmdz_cosp_read_outputkeys.F90
A libf/phylmd/cospv2/cosp_atlid_interface.F90
A libf/phylmd/cospv2/lmdz_cosp_subsample_and_optics_mod.F90
A libf/phylmd/cospv2/cosp_math_constants.F90
A libf/phylmd/cospv2/MISR_simulator.F90
A libf/phylmd/cospv2/modis_simulator.F90
A libf/phylmd/cospv2/math_lib.F90
A libf/phylmd/cospv2/cosp_grLidar532_interface.F90
A libf/phylmd/cospv2/cosp_errorHandling.F90
A libf/phylmd/cospv2/cosp_stats.F90
A libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90
A libf/phylmd/cospv2/cosp_utils.F90
A libf/phylmd/cospv2/cosp_optics.F90
A libf/phylmd/cospv2/icarus.F90
A libf/phylmd/cospv2/scops.F90
A libf/phylmd/cospv2/optics_lib.F90
A libf/phylmd/cospv2/cosp_kinds.F90
A libf/phylmd/cospv2/cosp_calipso_interface.F90
A libf/phylmd/cospv2/quickbeam.F90
A libf/phylmd/cospv2/parasol.F90
A libf/phylmd/cospv2/cosp_phys_constants.F90
A libf/phylmd/cospv2/cosp.F90
A libf/phylmd/cospv2/array_lib.F90
A libf/phylmd/cospv2/cosp_isccp_interface.F90
A libf/phylmd/cospv2/cosp_parasol_interface.F90
A libf/phylmd/cospv2/lmdz_cosp_construct_destroy_mod.F90
A libf/phylmd/cospv2/lmdz_cosp_output_mod.F90
A libf/phylmd/cospv2/lmdz_cosp_interface.F90
A libf/phylmd/cospv2/cosp_misr_interface.F90
A libf/phylmd/cospv2/cosp_modis_interface.F90

File:

• LMDZ6/trunk/makelmdz (modified) (6 diffs)

LMDZ6/trunk/makelmdz

@@ -26 +26 @@
 cosp=false
 cosp2=false
+cospv2=false
 sisvat=false
 rrtm=false
@@ -119 +120 @@
 [-cosp true/false]    : compile with/without cosp package (default: false)
 [-cosp2 true/false]    : compile with/without cosp2 package (default: false)
+[-cospv2 true/false]    : compile with/without cospv2 package (default: false)
 [-sisvat true/false]  : compile with/without sisvat package (default: false)
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
@@ -184 +186 @@
       "-cosp2")
           cosp2="$2" ; shift ; shift ;;
+
+      "-cosp2")
+          cospv2="$2" ; shift ; shift ;;
       
       "-sisvat")
@@ -498 +503 @@
    src_dirs="$src_dirs phy${physique}/cosp2"
    INCLUDE="$INCLUDE"' -I$(LIBF)/'phy${physique}'/cosp2'
+fi
+
+if [[ "$cospv2" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_COSPV2"
+   src_dirs="$src_dirs phy${physique}/cospv2"
+   INCLUDE="$INCLUDE"' -I$(LIBF)/'phy${physique}'/cospv2'
 fi
 
@@ -776 +788 @@
 L_COSP="$lcosp" \
 L_COSP2="$lcosp2" \
+L_COSPV2="$lcospv2" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \
@@ -810 +823 @@
 L_COSP="$lcosp" \
 L_COSP2="$lcosp2" \
+L_COSPV2="$lcospv2" \
 L_CHIMIE="$libchimie" \
 LOCAL_DIR="$localdir"  \