Changeset 3983

Timestamp:

Sep 21, 2021, 11:14:29 AM (3 years ago)

Author:

idelkadi

Message:

Modification of the option to use the Cosp simulator in the install_lmdz.sh script:
Use of option "-cosp none / v1 / v2" instead of "-cosp true / -cospv2 true".
./install_lmdz.sh ... -cosp none/v1/v2 :

• "none": without Cosp
• "v1": with version Cospv1
• "v2": with the Cosp v2 version

Default option: none

File:

• BOL/script_install/install_lmdz.sh (modified) (12 diffs)

BOL/script_install/install_lmdz.sh

@@ -64 +64 @@
 svn=""
 #version=trunk
-version=20210615.trunk
+version=20210730.trunk
 getlmdzor=1
 netcdf=1   #  1 for automatic installation
@@ -111 +111 @@
 ## compile_with_fcm=1 : use makelmdz_fcm (1) or makelmdz (0)
 compile_with_fcm=1
-cosp=0 ; opt_cosp1=""
-cosp=0 ; opt_cosp2=""
-cosp=0 ; opt_cospv2=""
+
+#Compilation with Cosp (cosp=NONE/v1/v2 ; default=NONE)
+cosp=NONE
 opt_cosp=""
 
@@ -164 +164 @@
     -gprof     to compile with -pg to enable profiling with gprof
 
-    -cosp      to compile with cosp(v1)
+    -cosp      to run without our with cospv1 or cospv2 [none/v1/v2]
  
-    -cosp2      to compile with cosp(1v2)
-
-    -cospv2      to compile with cosp(v2)
-
-    -rad RADIATIF : can be old, rrtm or ecrad radiatif code
+    -rad RADIATIF can be old, rrtm or ecrad radiatif code
 
     -nofcm     to compile without fcm
@@ -197 +193 @@
      "-d") grid_resolution=$2 ; shift ; shift ;;
      "-gprof") OPT_GPROF="-pg" ; shift ;;
-     "-cosp") cosp=1 ; opt_cosp1="-cosp true" ; shift ;;
-     "-cosp2") cosp2=1 ; opt_cosp2="-cosp2 true" ; shift ;;
-     "-cospv2") cospv2=1 ; opt_cospv2="-cospv2 true" ; shift ;;
+     "-cosp") cosp=$2 
+              case $cosp in
+                  "none"|"v1"|"v2") cosp=$2 ; shift ; shift ;;
+                  *) echo Only none v1 v2 for cosp option ; exit
+              esac ;;
      "-nofcm") compile_with_fcm=0 ; shift ;;
      "-SCM") SCM=1 ; shift ;;
@@ -234 +232 @@
 fi
 
+if [ $cosp = v1 ] ; then
+    opt_cosp="-cosp true"
+elif [ $cosp = v2 ] ; then
+    opt_cosp="-cospv2 true"
+else
+    opt_cosp=""
+fi
+  
 # Check on veget version
 #if [ "$veget" != 'NONE'  -a "$veget" != "CMIP6" -a "$veget" != +([0-9]) ] ; then
@@ -391 +397 @@
 fi
 
-## We can't compile with -cosp and -cosp2 
-if [ "$cosp" = 1 -a "$cosp2" = 1 ] ; then
-   echo "Error, you can't run with cosp1 and cosp2"
-   exit
-fi
-if [ "$cosp" = 1 ] ; then
-   opt_cosp="$opt_cosp1"
-fi
-if [ "$cosp2" = 1 ] ; then
-   opt_cosp="$opt_cosp2"
-fi
-if [ "$cospv2" = 1 ] ; then
-   opt_cosp="$opt_cospv2"
-fi
-
-## if also compiling XIOS, cosp must be activate to define axis in *.xml
 if [ "$with_xios" = "y" ] ; then
-  if [ "$cosp" = 0 -a  "$cosp2" = 0 -a "$cospv2" = 0 ] ; then
-   echo "Error, you must use -cosp option when compiling with -xios"
-   echo "You need to call Cosp in physical first step to define axis variables"
-   exit
-  fi
   opt_makelmdz_xios="-io xios"
 fi
 
-if [ "$cospv2" = 1 -a "$with_xios" = "n" ] ; then
+if [ "$cosp" = "v2" -a "$with_xios" = "n" ] ; then
   echo "Error, Cospv2 cannot run without Xios"
   exit
@@ -1024 +1009 @@
   rm -f compile.sh
   echo resol=${grid_resolution} >> compile.sh
-  if [ ${hostname:0:5} = jean- -a "$cospv2" = 1 ] ; then
+  if [ ${hostname:0:5} = jean- -a "$cosp" = "v2" ] ; then
+  echo ATTENTION le probleme de cospv2 sur jean-zay en mode prod n est pas corrige
+# ATTENTION le probleme de cospv2 sur jean-zay en mode prod n est pas corrige
      echo ./$makelmdz -dev $optim $OPT_MAKELMDZ $opt_rad $opt_cosp $opt_makelmdz_xios -d \$resol -v $veget_version -mem -parallel $parallel gcm >> compile.sh
      echo ./$makelmdz -dev $optim $OPT_MAKELMDZ $opt_rad $opt_cosp $opt_makelmdz_xios -d \$resol -v $veget_version -mem -parallel $parallel gcm 
@@ -1081 +1068 @@
 tar xvf $bench.tar.gz
 
-if [ "$cosp" = 1 -o "$cosp2" = 1 -o "$cospv2" = 1 ] ; then
+if [ "$cosp" = "v1" -o "$cosp" = "v2" ] ; then
   cd BENCH${grid_resolution}
 # copier les fichiers namelist input et output our COSP
@@ -1110 +1097 @@
   cp ../DefLists/context_lmdz.xml .
   cp ../DefLists/field_def_lmdz.xml .
+# A raffiner par la suite
+  echo A FAIRE : Copier les *xml en fonction de l option cosp
   cp ../DefLists/field_def_cosp*.xml .
   cp ../DefLists/file_def_hist*xml .
@@ -1133 +1122 @@
 
   #activer les sorties pour Cosp
-  if [ "$cosp" = 1 -o "$cosp2" = 1 ] ; then 
+  if [ "$cosp" = "v1" ] ; then 
    histfile=file_def_histdayCOSP_lmdz.xml
    sed -e 's@enabled=".FALSE."@enabled=".TRUE."@' $histfile > tmp ; \mv -f tmp $histfile
@@ -1139 +1128 @@
    sed -e 's@compression_level="2"@compression_level="0"@' $histfile > tmp ; \mv -f tmp $histfile
   fi
-  if [ "$cospv2" = 1 ] ; then
+  if [ "$cosp" = "v2" ] ; then
    histfile=file_def_histdayCOSPv2_lmdz.xml
    sed -e 's@compression_level="2"@compression_level="0"@' $histfile > tmp ; \mv -f tmp $histfile
    contextfile=context_lmdz.xml
    sed -e 's@src="./file_def_histdayCOSP_lmdz.xml"@src="./file_def_histdayCOSPv2_lmdz.xml"@' $contextfile > tmp ; \mv -f tmp $contextfile
+   sed -e 's@src="./file_def_histmthCOSP_lmdz.xml"@src="./file_def_histmthCOSPv2_lmdz.xml"@' $contextfile > tmp ; \mv -f tmp $contextfile
+   sed -e 's@src="./file_def_histhfCOSP_lmdz.xml"@src="./file_def_histhfCOSPv2_lmdz.xml"@' $contextfile > tmp ; \mv -f tmp $contextfile
    fieldfile=field_def_lmdz.xml
    sed -e 's@field_def_cosp1.xml@field_def_cospv2.xml@' $fieldfile > tmp ; \mv -f tmp $fieldfile
@@ -1180 +1171 @@
      echo "export OMP_NUM_THREADS=2" >> bench.sh
    fi
-   if [ "$cospv2" = 1 -o "$cosp" = 1 -o "$cosp2" = 1 ] ; then 
+   if [ "$cosp" = "v1" -o "$cosp" = "v2" ] ; then 
       if [ ${hostname:0:5} = jean- ] ; then    
         chmod +x ../arch.env