From d5f055a378b23f051a7ebb093ea491fcf0e85feb Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Thu, 15 Jul 2021 13:47:50 +0200
Subject: [PATCH] Quentin 15/07/2021: separate module load python on Belenos
for KTEST examples, incompatibility with python environnement (module) and
the other modules needed for MNH (error :unalias condam not found)
---
MY_RUN/KTEST/001_2Drelief/Makefile | 3 +++
MY_RUN/KTEST/002_3Drelief/Makefile | 3 +++
MY_RUN/KTEST/003_KW78/Makefile | 3 +++
MY_RUN/KTEST/004_Reunion/Makefile | 3 +++
MY_RUN/KTEST/005_ARM/Makefile | 3 +++
MY_RUN/KTEST/007_16janvier/Makefile | 2 ++
MY_RUN/KTEST/009_ICARTT/Makefile | 2 ++
MY_RUN/KTEST/011_KW78CHEM/Makefile | 3 +++
MY_RUN/KTEST/012_dust/Makefile | 5 ++++-
MY_RUN/KTEST/014_LIMA/Makefile | 2 ++
src/configure | 1 -
src/job_make_examples_BullX_belenos | 23 ++++++++++++++++++++++-
12 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/MY_RUN/KTEST/001_2Drelief/Makefile b/MY_RUN/KTEST/001_2Drelief/Makefile
index be7225be4..13deef8a4 100644
--- a/MY_RUN/KTEST/001_2Drelief/Makefile
+++ b/MY_RUN/KTEST/001_2Drelief/Makefile
@@ -13,3 +13,6 @@ ifneq "$(MNH_PYTHON)" "NO"
cd 003_python && clean_python
endif
cd 004_ncl && clean_ncl
+
+python:
+ cd 003_python && run_python
diff --git a/MY_RUN/KTEST/002_3Drelief/Makefile b/MY_RUN/KTEST/002_3Drelief/Makefile
index fb8e06d4b..76fa1761e 100644
--- a/MY_RUN/KTEST/002_3Drelief/Makefile
+++ b/MY_RUN/KTEST/002_3Drelief/Makefile
@@ -13,3 +13,6 @@ clean:
cd 003_python && clean_python
endif
cd 004_ncl && clean_ncl
+
+python:
+ cd 003_python && run_python
diff --git a/MY_RUN/KTEST/003_KW78/Makefile b/MY_RUN/KTEST/003_KW78/Makefile
index da2db720f..3dc66698d 100644
--- a/MY_RUN/KTEST/003_KW78/Makefile
+++ b/MY_RUN/KTEST/003_KW78/Makefile
@@ -17,3 +17,6 @@ clean:
endif
cd 005_ncl && clean_ncl
cd 007_ncl_diag && clean_ncl
+
+python:
+ cd 004_python && run_python
diff --git a/MY_RUN/KTEST/004_Reunion/Makefile b/MY_RUN/KTEST/004_Reunion/Makefile
index abebbbabd..694409947 100644
--- a/MY_RUN/KTEST/004_Reunion/Makefile
+++ b/MY_RUN/KTEST/004_Reunion/Makefile
@@ -44,3 +44,6 @@ clean:
ifneq "$(MNH_PYTHON)" "NO"
cd 007_python && clean_python
endif
+
+python:
+ cd 007_python && run_python
diff --git a/MY_RUN/KTEST/005_ARM/Makefile b/MY_RUN/KTEST/005_ARM/Makefile
index 0f0a3399e..1bc0a343c 100644
--- a/MY_RUN/KTEST/005_ARM/Makefile
+++ b/MY_RUN/KTEST/005_ARM/Makefile
@@ -13,3 +13,6 @@ clean:
cd 003_python && clean_python
endif
cd 004_ncl && clean_ncl
+
+python:
+ cd 003_python && run_python
diff --git a/MY_RUN/KTEST/007_16janvier/Makefile b/MY_RUN/KTEST/007_16janvier/Makefile
index d5256aaa9..cc7eebb12 100644
--- a/MY_RUN/KTEST/007_16janvier/Makefile
+++ b/MY_RUN/KTEST/007_16janvier/Makefile
@@ -57,3 +57,5 @@ clean:
cd 011_ncl_nc4 && clean_ncl
cd 011_ncl && clean_ncl
cd 012_spectre && clean_spectre_xyz
+python:
+ cd 010_python && run_python
diff --git a/MY_RUN/KTEST/009_ICARTT/Makefile b/MY_RUN/KTEST/009_ICARTT/Makefile
index 9fb249ec3..195327163 100644
--- a/MY_RUN/KTEST/009_ICARTT/Makefile
+++ b/MY_RUN/KTEST/009_ICARTT/Makefile
@@ -29,3 +29,5 @@ clean:
endif
cd 006_ncl && clean_ncl
+python:
+ cd 005_python && run_python
diff --git a/MY_RUN/KTEST/011_KW78CHEM/Makefile b/MY_RUN/KTEST/011_KW78CHEM/Makefile
index 3d72ae884..5bc36bf83 100644
--- a/MY_RUN/KTEST/011_KW78CHEM/Makefile
+++ b/MY_RUN/KTEST/011_KW78CHEM/Makefile
@@ -15,3 +15,6 @@ clean:
cd 004_python && clean_python
endif
cd 005_ncl && clean_ncl
+
+python:
+ cd 004_python && run_python
diff --git a/MY_RUN/KTEST/012_dust/Makefile b/MY_RUN/KTEST/012_dust/Makefile
index d27b829b4..79b127fcf 100644
--- a/MY_RUN/KTEST/012_dust/Makefile
+++ b/MY_RUN/KTEST/012_dust/Makefile
@@ -24,4 +24,7 @@ clean:
ifneq "$(MNH_PYTHON)" "NO"
cd 005_python && clean_python
endif
- cd 006_ncl && clean_ncl
+ cd 006_ncl && clean_ncl
+
+python:
+ cd 005_python && run_python
diff --git a/MY_RUN/KTEST/014_LIMA/Makefile b/MY_RUN/KTEST/014_LIMA/Makefile
index d2df0e9b7..c9647fc05 100644
--- a/MY_RUN/KTEST/014_LIMA/Makefile
+++ b/MY_RUN/KTEST/014_LIMA/Makefile
@@ -13,3 +13,5 @@ clean:
ifneq "$(MNH_PYTHON)" "NO"
cd 004_python && clean_python
endif
+python:
+ cd 004_python && run_python
diff --git a/src/configure b/src/configure
index 9c6179011..c0845c0d5 100755
--- a/src/configure
+++ b/src/configure
@@ -178,7 +178,6 @@ export ARMCI_SHR_BUF_METHOD=COPY
export NEED_TOOLS=YES
export MNHENV=${MNHENV:-"
module purge
-module load python/3.7.6
module load intel/2019.5.281
module load openmpi/intel/4.0.2.2
module load cmake/3.15.4
diff --git a/src/job_make_examples_BullX_belenos b/src/job_make_examples_BullX_belenos
index 8bb139f87..4aa4f1129 100755
--- a/src/job_make_examples_BullX_belenos
+++ b/src/job_make_examples_BullX_belenos
@@ -21,7 +21,8 @@ hostname
. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-5-0-MPIAUTO-O3
export MONORUN="Mpirun -np 1 "
export MPIRUN="Mpirun -np 2 "
-export POSTRUN="time "
+export POSTRUN="echo "
+export MNH_PYTHON="NO"
cd $SRC_MESONH/MY_RUN/KTEST/003_KW78
make -k
@@ -57,4 +58,24 @@ make -k << EOF
EOF
#
+# Sur Belenos, le module python est incompatible avec les autres modules chargés Pour MésoNH.
+# Les tracés sont réalisés après tous les runs
+module purge
+module load python/3.7.6
+cd $SRC_MESONH/MY_RUN/KTEST/003_KW78
+make python
+
+cd $SRC_MESONH/MY_RUN/KTEST/001_2Drelief
+make python
+
+cd $SRC_MESONH/MY_RUN/KTEST/002_3Drelief
+make python
+
+cd $SRC_MESONH/MY_RUN/KTEST/004_Reunion
+make python
+
+cd $SRC_MESONH/MY_RUN/KTEST/007_16janvier
+make python
+
+module purge
--
GitLab