Changeset 3386 for BOL

Timestamp:

Sep 4, 2018, 4:07:26 PM (6 years ago)

Author:

fhourdin

Message:

Add possibility to install with cosp(v2) and some "svn upgrade" commands to enforce being up-to-date with local svn version.
EM

File:

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

BOL/script_install/install_lmdz.sh

@@ -73 +73 @@
 ioipsl=1
 veget=1
-orchidee_rev=""  # ORCHIDEE revision (empty means use the provided version)
+orchidee_rev=""  # default revision of ORCHIDEE
 bench=1
 pclinux=1
@@ -99 +99 @@
 ## compile_with_fcm=1 : use makelmdz_fcm (1) or makelmdz (0)
 compile_with_fcm=1
-cosp=0 ; opt_cosp=""
+cosp=0 ; opt_cosp1=""
+cosp=0 ; opt_cosp2=""
+opt_cosp=""
 
 # Check if on a Mac
@@ -148 +150 @@
 
     -orchidee_rev "svn_release" : upgrade included ORCHIDEE model to
-               given svn release number (ORCHIDEE svn password required!)
+               given svn release number (default: $orchidee_rev)
                (only valid for orchidee2.0 and later)
 
-    -cosp      to compile with cosp
+    -cosp      to compile with cosp(v1)
+ 
+    -cosp2      to compile with cosp(v2)
 
     -nofcm     to compile without fcm
@@ -169 +173 @@
      "-d") grid_resolution=$2 ; shift ; shift ;;
      "-gprof") OPT_GPROF="-pg" ; shift ;;
-     "-cosp") cosp=1 ; opt_cosp="-cosp true" ; shift ;;
+     "-cosp") cosp=1 ; opt_cosp1="-cosp true" ; shift ;;
+     "-cosp2") cosp2=1 ; opt_cosp2="-cosp2 true" ; shift ;;
      "-orchidee_rev") orchidee_rev=$2 ; shift ; shift ;;
      "-nofcm") compile_with_fcm=0 ; shift ;;
@@ -313 +318 @@
   exit
 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 also compiling XIOS, cosp must be activate to define axis in *.xml
+if [ "$with_xios" = "y" -a "$cosp" != "1" ] ; 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
+if [ "$with_xios" = "y" -a "$cosp2" != "1" ] ; then
+   echo "Error, you must use -cosp2 option when compiling with -xios"
+   echo "You need to call Cosp in physical first step to define axis variables"
+   exit
+fi
+
 if [ "$with_xios" = "y" ] ; then
   opt_makelmdz_xios="-io xios"
@@ -687 +717 @@
   export ORCHPATH=`pwd`
   if [ -d tools ] ; then
-     if [ "$orchidee_rev" != "" ] ; then
-       set +e ; svn upgrade ; svn update -r $orchidee_rev ; set -e 
-     fi
+###################################################################
+# Pour les experts qui voudraient changer de version d'orchidee.
+# Attention : necessite d'avoir le password pour orchidee
+      set +e ; svn upgrade ; set -e
+      if [ "$orchidee_rev" != "" ] ; then
+         set +e ; svn update -r $orchidee_rev ; set -e 
+      fi
+###################################################################
      veget_version=orchidee2.0
       cd arch 
@@ -803 +838 @@
 ##################################################################
 
+set +e ; svn upgrade ; set -e
 if [ "$svn" = "last" ] ; then svnopt="" ; else svnopt="-r $svn" ; fi
-if [ "$svn" != "" ] ; then set +e ; svn upgrade ; set -e ; svn update $svnopt ; fi
+if [ "$svn" != "" ] ; then svn update $svnopt ; fi
 
 echo '##################################################################'
@@ -845 +881 @@
   #
   cd $ORCHPATH
-  if [ -d src_parallel ] ; then
+  if [ -d src_parallel -a $veget = 1 ] ; then
      cd arch
      sed  \
@@ -864 +900 @@
      echo ./makeorchidee_fcm -j 8 -clean -noxios -prod -parallel $parallel -arch $arch
      echo ./makeorchidee_fcm -j 8 -noxios -prod -parallel $parallel -arch $arch
-  else
+  elif [ $veget = 1 ] ; then
     echo '##########################################################'
     echo ' Orchidee version too old                                 '
@@ -946 +982 @@
 tar xvf $bench.tar.gz
 
+if [ "$cosp" = 1 -o "$cosp2" = 1 ] ; then
+  cd BENCH${grid_resolution}
+# copier les fichiers namelist input et output our COSP
+  cp ../DefLists/cosp_input_nl.txt .
+  cp ../DefLists/cosp_output_nl.txt .
+# Activer la cles ok_cosp pour tourner avec COSP
+  sed -e 's@ok_cosp=n@ok_cosp=y@' config.def > tmp
+   \mv -f tmp config.def
+  cd ..
+fi 
+
 if [ "$with_xios" = "y" ] ; then
   cd BENCH${grid_resolution}
@@ -955 +1002 @@
   sed -e 's@"using_server" type="bool">true@"using_server" type="bool">false@' iodef.xml > tmp
   \mv -f tmp iodef.xml
+
   # and convert all the enabled="_AUTO_" (for libIGCM) to enabled=.FALSE.
   # except for histday