Changeset 4909

Timestamp:

Apr 18, 2024, 1:35:42 PM (2 weeks ago)

Author:

abarral

Message:

add test_compils.sh
modify orch 2.2 to correct fortran mistakes
fix orch2.0 rev
remove useless makeorchidee -clean call
remove orchidee bench for 2.2 since it's not yet compatible

Location:

BOL/script_install_amaury

Files:

• install_lmdz.sh (modified) (7 diffs)
• test_compils.sh (added)

BOL/script_install_amaury/install_lmdz.sh

@@ -271 +271 @@
     tar xf "modipsl.$version.tar" >> get.log 2>&1
     \rm "modipsl.$version.tar"
-
-    if [[ $svn != "" ]]; then
-        mysvn=$svn
-    else
-        mysvn="$(grep 'Revision: [0-9]' "$MODEL"/Read*.md | awk ' { print $2 } ' 2>/dev/null)"
-    fi
-    echo "SVN revision used: $mysvn"
-}
-
-function download_model_AMAURY {  # TODO TEMP while waiting for tar: we copy the base from a local path = IPSLCM7 + ORCH2.2 8504
+}
+
+function create_model_tar {  # TODO TEMP while waiting for tar: we copy the base from a local path = IPSLCM7 + ORCH2.2 8504
     if [[ ! -d ../MODEL_REF ]]; then
         cd ..
         mkdir MODEL_REF
         cd MODEL_REF
+        # Base is IPSLCM7
         svn co --username icmc_users https://forge.ipsl.fr/igcmg/svn/modipsl/trunk modipsl
         cd modipsl/util
         ./model IPSLCM7_work
+        # Remove unused components
         rm -rf ../oasis3-mct
         cd ../modeles
         rm -rf ICOSA_LMDZ ORCHIDEE_4 ORCHIDEE_2_2 NEMO DYNAMICO XIOS INCA
+        # Retrieve orch version
         svn co svn://forge.ipsl.fr/orchidee/branches/ORCHIDEE_2_2/ORCHIDEE -r 8504
+        # Correct orchidee bug in 8504
+        sed -i"" -e "s/ts.second=dt_routing/ts%second=dt_routing/" -e "380,390 s/USE grid/USE grid, temp_disabled => contfrac/" ORCHIDEE/src_sechiba/routing_native_flow.f90
+
         cd ../../../script_install
     fi
@@ -300 +299 @@
     fi
     MODEL=$(readlink -f "$MODEL"); echo "$MODEL"  # absolute path
-
-    if [[ $svn != "" ]]; then
-        mysvn=$svn
-    else
-        mysvn="$(grep 'Revision: [0-9]' "$MODEL"/Read*.md | awk ' { print $2 } ' 2>/dev/null)"
-    fi
-    echo "SVN revision used: $mysvn"
 }
 
@@ -358 +350 @@
 
         # Convert non-basic compiler
-        case $compiler in  # TODO check if it works with other base compilers
-            mpif90) ncdf_compiler=$($compiler --help | head -n 1 | cut -f 2 -d " ")
+        case $compiler in  # TODO test with pgf90
+            mpif90) ncdf_compiler=$($compiler 2> <(head -n 1 | cut -f 1 -d ":"))
         esac
 
@@ -506 +498 @@
     case $veget in
         "none") fcm_veget_version="false";;
-        "orch2.0" | "CMIP6") fcm_veget_version=orchidee2.0; fetch_rev=6592;;
+        "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.2") fcm_veget_version=orchidee2.1; orcbranch="ORCHIDEE_2_2" ;; # the bundled version
         *) fetch_rev=$veget
@@ -556 +548 @@
             fi
             {
-                echo "$varenv ./makeorchidee_fcm -j $make_j -clean $xios_orchid $opt_orc -parallel $parallel -arch $arch"
                 echo "$varenv ./makeorchidee_fcm -j $make_j $xios_orchid $opt_orc -parallel $parallel -arch $arch"
             } > compile.sh
@@ -776 +767 @@
         fi
         # Getting orchidee stuff
-        if [[ $veget = 'CMIP6' ]]; then
+        if [[ $veget = 'CMIP6' || $veget = "orch2.0" ]]; then  # TODO once we have a 2.2 bench, add it here (or in planned separate bench script)
             echo 'myget 3DBenchs/BENCHCMIP6.tar.gz'
             myget 3DBenchs/BENCHCMIP6.tar.gz
@@ -847 +838 @@
 read_cmdline_args "$@"
 #download_model
-download_model_AMAURY
+create_model_tar
 init_arch
 check_available_software