Changeset 5027

Timestamp:

Jul 8, 2024, 4:42:50 PM (2 months ago)

Author:

abarral

Message:

update default tar

Location:

BOL/script_install_amaury

Files:

• arch_local/arch_adastra.env (deleted)
• arch_local/arch_adastra.fcm (deleted)
• arch_local/arch_adastra.path (deleted)
• install_lmdz.sh (modified) (3 diffs)

BOL/script_install_amaury/install_lmdz.sh

@@ -52 +52 @@
     # Valeur par défaut des parametres
     svn_lmdz=""
-    version="20231022.trunk"
+    version="20240508.CM7"
 
     netcdf=1
@@ -329 +329 @@
         tar xf "modipsl.$version.tar" &>> get.log
         \rm "modipsl.$version.tar"
-    fi
-}
-
-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
-
-        echo "STOP: INITIALIZED, PLEASE RELAUNCH ONCE"; exit 1
-    fi
-
-    if [[ ! -d "$MODEL" ]]; then
-        \cp -r ../MODEL_REF .
-        mv MODEL_REF "$MODEL"
-    fi
-    MODEL=$(readlink -e -f "$MODEL"); echo "$MODEL"  # absolute path
+        cd - &> /dev/null
+    fi
 }
 
@@ -914 +887 @@
 read_cmdline_args "$@"
 ensure_correct_option_combinations
-#download_model
-create_model_tar
+download_model
 init_arch
 check_available_software