Changeset 4196 for BOL

Timestamp:

Jul 8, 2022, 4:33:06 PM (2 years ago)

Author:

Laurent Fairhead

Message:

Modifications needed as the radiation option used is now part of the suffix
used in naming the object libraries and the executable
AS/FH/LF

File:

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

BOL/script_install/install_lmdz.sh

@@ -114 +114 @@
 opt_makelmdz_xios=""
 
-## compile with old/rrtm/ecrad radiatif code (Default=rrtm)
+## compile with oldrad/rrtm/ecrad radiatif code (Default=rrtm)
 rad=rrtm
 
@@ -174 +174 @@
     -cosp      to run without our with cospv1 or cospv2 [none/v1/v2]
  
-    -rad RADIATIF can be old, rrtm or ecrad radiatif code
+    -rad RADIATIF can be oldrad, rrtm or ecrad radiatif code
 
     -nofcm     to compile without fcm
@@ -209 +209 @@
      "-SCM") SCM=1 ; shift ;;
      "-opt_makelmdz") OPT_MAKELMDZ="$2" ; shift ; shift ;;
+     "-rrtm") rrtm="$2" ; if [ "$2" = "false" ] ; then rad="oldrad" ; else rad="rrtm" ; fi ; shift ; shift ;;
      "-rad") rad=$2
              case $rad in
-                "old"|"rrtm"|"ecrad") rad=$2 ; shift ; shift ;;
-                *) echo Only old rrtm ecrad for rad option ; exit
+                "oldrad"|"rrtm"|"ecrad") rad=$2 ; shift ; shift ;;
+                *) echo Only oldrad rrtm ecrad for rad option ; exit
              esac ;;
      "-parallel") parallel=$2
@@ -231 +232 @@
 done
 
-# Option de compilation du rayonnement
-opt_rad=""
-case $rad in
-   rrtm) opt_rad="-rad rrtm" ;;
-   ecrad) opt_rad="-rad ecrad" ;;
-esac
+# Option de compilation du rayonnement : depend de $mysvn ><= r4185, sera donc definie plus bas
+#opt_rad=""
+#case $rad in
+#   rrtm) opt_rad="-rad rrtm" ;;
+#   ecrad) opt_rad="-rad ecrad" ;;
+#esac
 
 
@@ -928 +929 @@
 set -e
 
+##################################################################
+# Retrieve the final svn release number, and adjust compilation options accordingly
+mysvn=`svnversion . | egrep -o "[0-9]+"`
+
+# Option de compilation du rayonnement : depend de $mysvn ><= r4185
+opt_rad=""
+case $rad in
+   rrtm) if [ $mysvn -le 4185 ] ; then opt_rad="-rrtm true" ; else opt_rad="-rad rrtm" ; fi ;;
+   ecrad) opt_rad="-rad ecrad" ;;
+esac
+
+if [ $mysvn -le 4185 -a $rad -eq "ecrad" ] ; then echo "ecrad only available for LMDZ rev >4185 " ; exit ; fi
+
+##################################################################
+
 echo '##################################################################'
 echo "Preparing script compile.sh for LMDZ compilation" 
@@ -1040 +1056 @@
 
 # Recherche de l'executable dont le nom a change au fil du temps ...
+# suffix contains radiative option starting with revision 4186
+if [ $mysvn -ge 4186 ] ; then suff_exe=_${rad}${suff_exe} ; fi
 gcm=""
 #for exe in gcm.e bin/gcm_${grid_resolution}_phylmd_seq_orch.e bin/gcm_${grid_resolution}_phylmd_seq.e bin/gcm_${grid_resolution}_phylmd_para_mem_orch.e bin/gcm_${grid_resolution}_phylmd_para_mem.e  ; do