Changeset 3783

Timestamp:

Nov 5, 2020, 5:05:52 PM (4 years ago)

Author:

Laurent Fairhead

Message:

Back to sequential version by default
Switch/relocate LMDZ depository to ​https://....
Added some exe name (needs work #116)

File:

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

BOL/script_install/install_lmdz.sh

@@ -98 +98 @@
 ## parallel can take the values none/mpi/omp/mpi_omp
 parallel=mpi_omp
+parallel=none
 idris_acct=lmd
-parallel=none
 OPT_GPROF=""
 OPT_MAKELMDZ=""
@@ -601 +601 @@
 fi # of if [ $netcdf = 1 ]
 
-
-#=======================================================================================
+#======================================================================================
 echo OK2 ioipsl=$ioipsl
 echo '##########################################################'
@@ -906 +905 @@
 ##################################################################
 
-set +e ; svn upgrade ; set -e
+set +e ; svn upgrade
 if [ "$svn" = "last" ] ; then svnopt="" ; else svnopt="-r $svn" ; fi
-if [ "$svn" != "" ] ; then svn update $svnopt ; fi
+if [ "$svn" != "" ] ; then
+    svn info | grep -q 'http:'
+    if [ $? = 0 ] ; then
+        svn switch --relocate http://svn.lmd.jussieu.fr/LMDZ https://svn.lmd.jussieu.fr/LMDZ
+    fi
+    svn update $svnopt
+fi
+set -e
 
 echo '##################################################################'
@@ -1023 +1029 @@
 # Recherche de l'executable dont le nom a change au fil du temps ...
 gcm=""
-for exe in gcm.e bin/gcm_${grid_resolution}_phylmd_seq_orch.e bin/gcm_${grid_resolution}_phylmd_seq.e bin/gcm_${grid_resolution}_phylmd_para_mem.e bin/gcm_${grid_resolution}_phylmd_para_mem_orch.e ; do
+for exe in gcm.e bin/gcm_${grid_resolution}_phylmd_seq_orch.e bin/gcm_${grid_resolution}_phylmd_seq.e bin/gcm_${grid_resolution}_phylmd_para_mem_orch.e bin/gcm_${grid_resolution}_phylmd_para_mem.e  ; do
    if [ -f $exe ] ; then gcm=$exe ; fi
 done