Changeset 5523

Timestamp:

Feb 5, 2025, 12:20:51 PM (5 months ago)

Author:

fhourdin

Message:

Various details in install_lmdz.sh

File:

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

BOL/script_install/install_lmdz.sh ¶

@@ -532 +532 @@
                 sed -i'' -e "s/-I//" -e "s/-L//" "$MODEL/modipsl/modeles/ORCHIDEE/arch/arch-$arch.path"  # /!\ we only replace first occurence on purpose
             fi
+            if [[ $veget = "CMIP6" ]]; then  # bundled version has a different fcm convention
+                sed -i'' -e "s/-I//" -e "s/-L//" "$MODEL/modipsl/modeles/ORCHIDEE/arch/arch-$arch.path"  # /!\ we only replace first occurence on purpose
+            fi
         fi
     fi
@@ -661 +664 @@
     # in case ksh is not installed on the pc
     if [[ ! -x /bin/ksh ]]; then
-      sed -i''  -e 's/ksh/bash/' ins_m_prec
+      sed -i'' 's/ksh/bash/' ins_m_prec
+      sed -i'' 's/ksh/bash/' rebuild/rebuild
     fi
     do_compile_sh "IOIPSL" "$jobcmd ./makeioipsl_fcm -j $make_j -arch $arch $optim_flag"
@@ -703 +707 @@
     case $veget in
         "none") fcm_veget_version="false";;
-        "orch2.0" | "CMIP6") fcm_veget_version=orchidee2.0; fetch_rev=7906;;  # in previous tar we used 6592 but with some modifications to xios_orchidee.f90, which got integrated in 7906
+#        "orch2.0" | "CMIP6") fcm_veget_version=orchidee2.0; fetch_rev=7906;;  # in previous tar we used 6592 but with some modifications to xios_orchidee.f90, which got integrated in 7906
+        "orch2.0" | "CMIP6") fcm_veget_version=orchidee2.0;;  # in previous tar we used 6592 but with some modifications to xios_orchidee.f90, which got integrated in 7906
         "orch2.2") fcm_veget_version=orchidee2.1; orcbranch="/branches/ORCHIDEE_2_2/ORCHIDEE" ;; # the bundled version
         *) fetch_rev=$veget; fcm_veget_version=orchidee2.1;;  # /!\ arbitary rev only works for orch>=2.1
@@ -791 +796 @@
 function compile_lmdz {
 #-----------------------------------------------------------------------------
+  if [[ $bench =   "tuto" ]]; then
+      echo No need to compile if installing TUTORIAL
+  else
     install_arch "LMDZ"
     cd "$LMDZPATH"
@@ -827 +835 @@
         echo "Compilation successful, the executable is $exe_name $(date)"
     fi
+  fi
 }
 
@@ -894 +903 @@
 
     if [[ $bench = "tuto" ]]; then
-        myget "Training/tutorial.tar"; tar xf tutorial.tar; cd TUTORIAL
-        ./init.sh
+        myget "Training/tutorial.tar"; tar xf tutorial.tar
+        echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+        echo A directory $PWD/TUTORIAL
+        echo has been downloaded in which you can compile, intitialize
+        echo and then run a simulation with a zoomed grid by running ./init.sh
+        echo after modifying some input parameters in .def files in DEF/
+        echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
     elif [[ $bench = 1 ]]; then
       rm -rf "BENCH${grid_resolution}"
@@ -1118 +1132 @@
             sed -i'' -e 's/^rad=.*$/rad=oldrad/' bin/compile
         elif [[ $rad = ecrad ]] ; then
-                        sed -i'' -e 's/^rad=.*$/rad=ecrad/' run.sh
-                        sed -i'' -e 's/^rad=.*$/rad=ecrad/' bin/compile
-                    fi
+                         sed -i'' -e 's/^rad=.*$/rad=ecrad/' run.sh
+                         sed -i'' -e 's/^rad=.*$/rad=ecrad/' bin/compile
+                     fi
         sed -i -e "s:^fcm=0:fcm=1:" bin/compile
         echo "Running 1D/run.sh, log in $(pwd)/run1d.log"