Changeset 5420 for BOL/LMDZ_Setup

Timestamp:

Dec 18, 2024, 1:04:30 AM (22 hours ago)

Author:

fhourdin

Message:

Minor change in $SCRATCH directory management

Location:

BOL/LMDZ_Setup

Files:

• lmdz_env.sh (modified) (5 diffs)
• script_SIMU (modified) (1 diff)
• setup.sh (modified) (1 diff)

BOL/LMDZ_Setup/lmdz_env.sh

@@ -9 +9 @@
 
 # <root_dir> will be set by sed by setup.sh here
-root_dir=/home/abarral/PycharmProjects/installLMDZ/LMDZ_Setup
+root_dir=/home/hourdin/TMP/LMDZ_Setup
 
 function get_hostname {
@@ -43 +43 @@
       account="lmd"  # $(idrproj | grep active | awk '{ print $1}') doesn't work on compute nodes
       ARCH="X64_JEANZAY_PBIOIPSL"
-      SIMRUNBASEDIR="$SCRATCH/"
+      SIMRUNBASEDIR="$SCRATCH/$(basename $root_dir)"
       LMDZD="$root_dir/LMDZD"
       LMDZ_INIT="$root_dir/LMDZ_Init"
@@ -61 +61 @@
 
       ARCH="X64_MESOIPSL-GNU"
-      SIMRUNBASEDIR="$SCRATCH/"
+      SIMRUNBASEDIR="$SCRATCH/$(basename $root_dir)"
       LMDZD="$root_dir/LMDZD"
       LMDZ_INIT="$HOME/LMDZ_Init"
@@ -98 +98 @@
       account=$(/usr/sbin/my_project.py -l 2>&1 | head -1 | cut -d " " -f 3- | cut -c 5-)
       ARCH="X64_ADASTRA-GNU"
-      SIMRUNBASEDIR="$SCRATCHDIR/"
+      SIMRUNBASEDIR="$SCRATCHDIR/$(basename $root_dir)"
       LMDZD="$root_dir/LMDZD"
       LMDZ_INIT="$WORKDIR/LMDZ_Init"
@@ -112 +112 @@
     *) echo "WARNING: RUNNING THIS SCRIPT ON A LOCAL COMPUTER IS DISCOURAGED (lackluster cpus and memory)"
       ARCH="local-gfortran-parallel"  # The arch file to use
-      SIMRUNBASEDIR="/tmp/SCRATCH/"  # Where the simulations will be executed ($SIMRUNBASEDIR/LMDZ_Setup/...)
+      SIMRUNBASEDIR="$root_dir/SCRATCH/"  # Where the simulations will be executed ($SIMRUNBASEDIR/LMDZ_Setup/...)
       LMDZD="$root_dir/LMDZD"  # Where the sources will be downloaded and compiled
       LMDZ_INIT="$HOME/LMDZ_Init"  # Where to store shared files used for initialisation. Should be outside the LMDZ_Setup dir since it's shared between several LMDZ_Setup.

BOL/LMDZ_Setup/script_SIMU

@@ -77 +77 @@
 
 # Repertoires de travail
-WWORKD=$SCRATCHD/$SIMU_dir$$
+WWORKD=$SCRATCHD/$simul$$
 if [[ -d $WWORKD ]]; then  # useful when running on local computer, where jobs aren't submitted
   rm -rf "$WWORKD"

BOL/LMDZ_Setup/setup.sh

@@ -380 +380 @@
 
 function setup_simu() {
-  SIMRUNTOPDIR="$SIMRUNBASEDIR/$(basename "$local")"
+  #SIMRUNTOPDIR="$SIMRUNBASEDIR/$(basename "$local")"
+  SIMRUNTOPDIR="$SIMRUNBASEDIR"
   SIMRUNDIR=$SIMRUNTOPDIR
   mkdir -p "$SIMRUNDIR"