Changeset 4922

Timestamp:

Apr 25, 2024, 4:32:41 PM (7 months ago)

Author:

abarral

Message:

merge rev 4877 & 4919 from trunk

File:

• BOL/script_install_amaury/install_lmdz.sh (modified) (4 diffs)

BOL/script_install_amaury/install_lmdz.sh

@@ -469 +469 @@
         case $xios_branch in
             "trunk")
-            xios_http="http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk";;
+            xios_http="http://forge.ipsl.fr/ioserver/svn/XIOS/trunk";;
             "2.5")
-            xios_http="http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5";;
+            xios_http="http://forge.ipsl.fr/ioserver/svn/XIOS2/branches/xios-2.5";;
             "2.6")
-            xios_http="http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS2/branches/xios-2.6";;
+            xios_http="http://forge.ipsl.fr/ioserver/svn/XIOS2/branches/xios-2.6";;
             *) echo "XIOS: Error, bad argument for -branch ! Did not expect $xios_branch"; exit 1;;
         esac
@@ -508 +508 @@
     if [[ -n $fetch_rev ]]; then
         echo "Fetching orch $fetch_rev from the repository"
-        orcbranch=$(svn log -v -q svn://forge.ipsl.jussieu.fr/orchidee/ -r "$fetch_rev" | grep ORCHIDEE | head -1 | sed -e 's:ORCHIDEE/.*$:ORCHIDEE:' | awk '{print $2}')
+        orcbranch=$(svn log -v -q svn://forge.ipsl.fr/orchidee/ -r "$fetch_rev" | grep ORCHIDEE | head -1 | sed -e 's:ORCHIDEE/.*$:ORCHIDEE:' | awk '{print $2}')
         echo "branch is $orcbranch"
         if [[ $fetch_rev -lt 4465 ]]; then echo 'ORCHIDEE version must be >=4465, exiting'; exit 1; fi
@@ -515 +515 @@
         cd "$MODEL/modipsl/modeles"
         set +e
-        svn co -r "$fetch_rev" "svn://forge.ipsl.jussieu.fr/orchidee/$orcbranch"
+        svn co -r "$fetch_rev" "svn://forge.ipsl.fr/orchidee/$orcbranch"
         set -e
         cd -
@@ -833 +833 @@
             sed -i'' -e 's/^rad=.*$/rad=oldrad/' run.sh
             sed -i'' -e 's/^rad=.*$/rad=oldrad/' bin/compile
-        fi
+        elif [[ $rad = ecrad ]] ; then
+                        sed -i'' -e 's/^rad=.*$/rad=ecrad/' run.sh
+                        sed -i'' -e 's/^rad=.*$/rad=ecrad/' bin/compile
+                    fi
         echo "Running 1D/run.sh, log in $(pwd)/run1d.log"
         ./run.sh > "$(pwd)/run1d.log" 2>&1