Changeset 4197

Timestamp:

Jul 8, 2022, 6:21:28 PM (2 years ago)

Author:

Laurent Fairhead

Message:

Resolving issue when using oldrad with the default bench suite

Location:

BOL/script_install

Files:

• check_version.sh (modified) (5 diffs)
• creation_modipsl.sh (modified) (2 diffs)
• install_lmdz.sh (modified) (3 diffs)

BOL/script_install/check_version.sh

@@ -23 +23 @@
 
 install=1
+rad=rrtm
 check_1D=1
 check_SP=1
@@ -59 +60 @@
 options:
   -c compiler : sets the compiler to use
-  -j 0/1 : just check results, do not overwrite anything 0/1
+  -justcheck  : just check results, do not overwrite anything
   -r svn : revision 
   -latest latest : latest is the date of the last version tested
@@ -67 +68 @@
 
       "-c") compilo="$2" ; shift ; shift ;;
-      "-j") justcheck="$2" ; shift ; shift ;;
+      "-justcheck") justcheck=1 ; shift ;;
       "-r") rel_svn="$2" ; shift ; shift ;;
       "-latest") version_ref="$2" ; shift ; shift ;;
@@ -285 +286 @@
       cd BENCHiso48x36x39
       ./compile.sh
-      exec=../bin/gcm_48x36x39_phylmdiso_seq_iso_isoverif.e
+      exec=../bin/gcm_48x36x39_phylmdiso_${rad}_seq_iso_isoverif.e
       if [ -f $exec ] ; then
              $exec > listing 2>&1
@@ -414 +415 @@
    ssh lmdz@django "mail -s 'Nouvelle version pour install_lmdz.sh' $mail_address < "$local_d"/tmp.message"
 fi
+
+#
+# clean up of /tmp/lmdz if everything went smoothly
+#
+grep -q 'OK     OK      OK2     OK' tmp.resu
+RET=$?
+if [ ${RET} -eq 0 ] ; then
+  echo "Quality control checks out for version $version"
+  echo "We cleanup /tmp/lmdz/LMDZ$version"
+  echo "\rm -rf /tmp/lmdz/LMDZ$version"
+  \rm -rf /tmp/lmdz/LMDZ$version
+fi
+

BOL/script_install/creation_modipsl.sh

@@ -1 +1 @@
 #!/bin/bash
 
-set -vx
+#set -vx
 
 #####################################################################
@@ -186 +186 @@
    cat tmp.resu >> LISMOI.$branche
    \cp -f LISMOI.trunk ../pub/src/Readme
+###
+### clean up of /tmp/lmdz if everything went smoothly
+###
+##  grep -q 'OK OK      OK2     OK' tmp.resu
+##  RET=$?
+##  if [ ${RET} -eq 0 ] ; then
+##    echo "Quality control checks out for version $version"
+##    echo "We could cleanup /tmp/lmdz/LMDZ$version" 
+##    echo "\rm -rf /tmp/lmdz/LMDZ$version" 
+##  fi
 fi

BOL/script_install/install_lmdz.sh

@@ -53 +53 @@
     \cp -f -p ~/LMDZ/pub/$1 .
   else
-    wget --no-check-certificate -nv http://www.lmd.jussieu.fr/~lmdz/pub/$1
+    wget --no-check-certificate -nv http://lmdz.lmd.jussieu.fr/pub/$1
     save_pub_locally=0
     if [ $save_pub_locally = 1 ] ; then # saving wget files on ~/LMDZ/pub
@@ -935 +935 @@
 # 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" ;;
+    oldrad) iflag_rrtm=0 ; NSW=2 ; opt_rad="" ;;
+    rrtm)   iflag_rrtm=1 ; NSW=6 ; if [ $mysvn -le 4185 ] ; then opt_rad="-rrtm true" ; else opt_rad="-rad rrtm" ; fi ;;
+    ecrad)  iflag_rrtm=2 ; NSW=6 ; opt_rad="-rad ecrad" ;;
+    *) echo Only oldrad rrtm ecrad for rad option ; exit
 esac
 
@@ -1179 +1182 @@
      cp  ../DefLists/namelist_ecrad .
      cp -r ../libf/phylmd/ecrad/data .
-   # Attention au cas ou ne 1
-     sed -e 's@iflag_rrtm=1@iflag_rrtm=2@' physiq.def > tmp
-      \mv -f tmp physiq.def
      cd ..
    fi
+
+   # Adjusting bench physiq.def to radiative code chosen
+   cd BENCH${grid_resolution}
+   sed -e 's/iflag_rrtm=.*.$/iflag_rrtm='$iflag_rrtm'/' -e 's/NSW=.*.$/NSW='$NSW'/' physiq.def > tmpdef
+   \mv tmpdef physiq.def
+   cd ..
    
    cp $gcm BENCH${grid_resolution}/gcm.e