diff --git a/Configure b/Configure index 0d392fbd4a063021d6475392fea0c7b52ff9b3f3..e5ec76fac48c0bd62ebe8d1134b029ed87779059 100755 --- a/Configure +++ b/Configure @@ -1,4 +1,5 @@ # Script to correctly configure the tool +set -xuve WORKING_DIR=$(readlink -f "`dirname \"$0\"`") @@ -15,7 +16,8 @@ cd $WORKING_DIR if [ ! -f bin/mpp_domain_decomposition.exe ]; then for file in src/Makefiles/* ; do - cp $file Makefile && make &> /dev/null && break + cp $file Makefile + make && break done #[ 0 -eq $( bin/mpp_domain_decomposition.exe 2>&1 | grep -c "file.*namelist_mpp" ) ] && { echo "Not properly compiled, check libary paths and enviroment" 1>&2 && rm bin/mpp_domain_decomposition.exe && clean && exit 1 ;} @@ -40,3 +42,5 @@ clean # Check if bathymetries are linked (only will happen in MN3) ls bathymetries/* &> /dev/null && echo "Configured!" || echo "Tool compiled but bathymetries not found" + +set +xuve diff --git a/ELPiNv2.cmd b/ELPiNv2.cmd index 09ceb2199a4d63396592608319cea980013d5e0f..ba5d9ca4d6ab5e436f8b8fd0b0904132dae4d003 100755 --- a/ELPiNv2.cmd +++ b/ELPiNv2.cmd @@ -1,4 +1,5 @@ # This script modifies the namelist and finds the best +set -xuve # Avoid issues with handling floating point numbers export LC_NUMERIC="en_US.UTF-8" @@ -138,3 +139,5 @@ fi # Remove the tmp file containing the possible decompositions rm -f *decomposition.layout rm -f namelist_mpp + +set +xuve diff --git a/Launcher b/Launcher index a88f7f021e521a707540496f1add44f9379ceb7c..309b4dfc46b99f8233078dd572c8ce135bd6935e 100755 --- a/Launcher +++ b/Launcher @@ -1,6 +1,6 @@ # This Launcher is only a wrapper to preserve compatibility between ELPiN and # auto-nemo and auto-ecearth prpjects. - +set -xuve # Script to correctly configure the tool WORKING_DIR=$(readlink -f "`dirname \"$0\"`") @@ -52,3 +52,5 @@ done [[ $ECE == "TRUE" ]] && bathy=bathymetries/ece_bathy_meter_${RESOLUTION}.nc || bathy=bathymetries/nemo_bathy_meter_${RESOLUTION}.nc ./ELPiNv2.cmd $bathy $MAX_NUMPROC + +set +xuve diff --git a/src/link_bathymetries.sh b/src/link_bathymetries.sh index 53869c524e98119c70f07de7066af160576b914f..e0f735ef1b19e16cf8299c70c54e7260a2d07bde 100755 --- a/src/link_bathymetries.sh +++ b/src/link_bathymetries.sh @@ -1,5 +1,5 @@ # The script links the bathymetries from the Earth Science department repository to the bathymetries folder. - +set -xuve # WARNING! dirty workaround [ -d /gpfs/projects/bsc32/models/ ] && REPOSITORY_PATH=/gpfs/projects/bsc32/models/ @@ -19,7 +19,9 @@ done # Linking ECE resolutions -ECE_REPOSITORY_PATH=$REPOSITORY_PATH/ecearth/v3.2.0/inidata/nemo/initial/ +ECE_REPOSITORY_PATH=$REPOSITORY_PATH/ecearth/v3.2.2/inidata/nemo/initial/ for res in ORCA1 ORCA025; do [ -f ${ECE_REPOSITORY_PATH}/${res}L[0-9][0-9]/bathy_meter.nc ] && ln -sf ${ECE_REPOSITORY_PATH}/${res}L[0-9][0-9]/bathy_meter.nc bathymetries/ece_bathy_meter_$res.nc || echo "${ECE_REPOSITORY_PATH}/${res}L[0-9][0-9]/bathy_meter.nc not found" done + +set +xuve