Changeset 3646 for BOL

Timestamp:

Mar 11, 2020, 4:15:59 PM (5 years ago)

Author:

Laurent Fairhead

Message:

Added option to use different physics def file in the bench
Added option to use the CMIP6 orchidee version
Safeguarded the use of the orchidee_rev option: until now if one was not on the proper branch of ORCHIDEE, one did not know which version one actually got
LF

File:

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

BOL/script_install/install_lmdz.sh

@@ -81 +81 @@
 # use the old orchidee interface without the calculation of z0h
 no_z0h_orc=1
+# orchidee_version: defined to use the CMIP6 version of ORCHIDEE 
+#                   (and eventually anyother)
+#                   values=CMIP6
+orchidee_version=""
 # choose the resolution for the bench runs
 # grid_resolution= 32x24x11 or 48x36x19 for tests (test without ORCHIDEE)
@@ -88 +92 @@
 grid_resolution=48x36x19
 grid_resolution=32x32x39
+# choose the physiq version you want to test
+#physiq=NPv6.0.14splith
+physiq=
 
 ## parallel can take the values none/mpi/omp/mpi_omp
@@ -171 +178 @@
     -opt_makelmdz     to call makelmdz or makelmdz_fcm with additional options
 
+    -physiq    to choose which physics package to use
+
     -env_file  specify an arch.env file to overwrite the existing one
+
+    -orc_version      to chose some tagged ORCHIDEE version (CMIP6 only for the present)
+
 ........fin
      exit ;;
@@ -198 +210 @@
      "-name") MODEL=$2 ; shift ; shift ;;
      "-netcdf") netcdf=$2 ; shift ; shift ;;
+     "-physiq") physiq=$2 ; shift ; shift ;;
      "-xios") with_xios="y" ; shift ;;
      "-env_file") env_file=$2 ; shift ; shift ;;
-
+     "-orc_version") orchidee_version=$2 ; shift ; shift ;;
      *) ./install_lmdz.sh -h ; exit
    esac
@@ -725 +738 @@
 if [ "$veget" = 1 ] ; then
   cd $MODEL/modipsl/modeles/ORCHIDEE
+  if [ "$orchidee_version" = "CMIP6" ] ; then
+    set +e
+    svn upgrade
+    svn switch -r 5661 --accept theirs-full svn://forge.ipsl.jussieu.fr/orchidee/tags/ORCHIDEE_2_0/ORCHIDEE
+    orchidee_rev=5661
+    veget_version=orchidee2.0
+    no_z0h_orc=0
+    set -e
+  fi
   # Correctif suite debug Jean-Zay
   sed -i -e 's/9010  FORMAT(A52,F17.14)/9010  FORMAT(A52,F20.14)/' src_stomate/stomate.f90
@@ -741 +763 @@
       set +e ; svn upgrade ; set -e
       if [ "$orchidee_rev" != "" ] ; then
-         set +e ; svn update -r $orchidee_rev ; set -e 
+          # test qu'on est sur la bonne branche pour faire le update
+          set +e
+          svn log -r $orchidee_rev | grep  $orchidee_rev
+          if [  $? -gt 0 ] ; then
+              echo 'Cannot update ORCHIDEE as not on the right branch for ORCHIDEE'
+              exit
+          fi
+          set -e
+          set +e ; svn update -r $orchidee_rev ; set -e 
       fi
       # Correctif suite debug Jean-Zay
       if [ -f src_global/time.f90 ] ; then sed -i -e 's/CALL tlen2itau/\!CALL tlen2itau/' src_global/time.f90 ; fi
 ###################################################################
-     veget_version=orchidee2.0
+     if [ "$veget_version" == "false" ] ; then veget_version=orchidee2.0 ; fi
       cd arch 
       sed -e s:"%COMPILER        .*.$":"%COMPILER            $compiler":1 \
@@ -772 +802 @@
      if [ -d src_parallel ] ; then
        liste_src="parallel parameters global stomate sechiba driver"
-       veget_version=orchidee2.0
+       if [ "$veget_version" == "false" ] ; then veget_version=orchidee2.0 ; fi
      else
        # Obsolete, for ORCHIDEE_beton only
@@ -778 +808 @@
        # A trick to compile ORCHIDEE depending on if we are using real*4 or real*8
        cd src_parameters ; \cp reqdprec.$real reqdprec.f90 ; cd ..
-       veget_version=orchidee1.9
+       if [ "$veget_version" == "false" ] ; then veget_version=orchidee1.9 ; fi
      fi
      for d in $liste_src ; do src_d=src_$d
@@ -1018 +1048 @@
 fi 
 
+if [ -n "$physiq" ]; then
+  cd BENCH${grid_resolution}
+  if [ -f physiq.def_${physiq} ]; then
+    cp physiq.def_${physiq} physiq.def
+    echo using physiq.def_${physiq}
+  else
+    echo using standard physiq.def
+  fi
+  cd ..
+else
+  echo using standard physiq.def
+fi
+
 if [ "$with_xios" = "y" ] ; then
   cd BENCH${grid_resolution}