From 20167f8d171618b5a71c0c5c7c7bd65ba54d8952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oriol=20Tint=C3=B3-Prims?= <oriol.tinto@bsc.es>
Date: Tue, 4 Jul 2017 15:49:55 +0200
Subject: [PATCH 1/3] Makefile for mn4 added

---
 src/Makefiles/Makefile.mn4 | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 src/Makefiles/Makefile.mn4

diff --git a/src/Makefiles/Makefile.mn4 b/src/Makefiles/Makefile.mn4
new file mode 100644
index 0000000..f534955
--- /dev/null
+++ b/src/Makefiles/Makefile.mn4
@@ -0,0 +1,10 @@
+FC=ifort
+FLAGS= -Ofast
+INC=-I/apps/NETCDF/4.4.0/INTEL/IMPI/include
+LIB=-L/apps/NETCDF/4.4.0/INTEL/IMPI/lib -lnetcdf -lnetcdff
+
+all:
+	mkdir -p bin
+	$(FC) src/mpp_domain_decomposition.f90 -o bin/mpp_domain_decomposition.exe $(FLAGS) $(INC) $(LIB)
+clean:
+	rm bin/mpp_domain_decomposition.exe
-- 
GitLab


From 53459d8338b6e3ebd9b0be40f14e37b232ad7104 Mon Sep 17 00:00:00 2001
From: Miguel Castrillo <miguel.castrillo@bsc.es>
Date: Tue, 22 Aug 2017 17:38:35 +0200
Subject: [PATCH 2/3] Update bathymetry path

---
 src/link_bathymetries.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/link_bathymetries.sh b/src/link_bathymetries.sh
index 53869c5..71fdfd4 100755
--- a/src/link_bathymetries.sh
+++ b/src/link_bathymetries.sh
@@ -19,7 +19,7 @@ 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
-- 
GitLab


From de6f10bd9fe4cfee7503147700b50ea422d4d8bf Mon Sep 17 00:00:00 2001
From: Pablo Echevarria <pablo.echevarria@bsc.es>
Date: Wed, 6 Sep 2017 12:17:20 +0200
Subject: [PATCH 3/3] hidden errors messages was removed

---
 Configure                | 6 +++++-
 ELPiNv2.cmd              | 3 +++
 Launcher                 | 4 +++-
 src/link_bathymetries.sh | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Configure b/Configure
index 0d392fb..e5ec76f 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 09ceb21..ba5d9ca 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 a88f7f0..309b4df 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 71fdfd4..e0f735e 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/
@@ -23,3 +23,5 @@ 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
-- 
GitLab