diff --git a/MY_RUN/KTEST/001_2Drelief/Makefile b/MY_RUN/KTEST/001_2Drelief/Makefile index be7225be45a1711f84abfa0cf06804dc78b7d5e1..13deef8a4562ab8cad879c74b3b6ce78024bd9c2 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 fb8e06d4be5003590017ea87a10014e3bcabf0ac..76fa1761ed35a74ba7d10078fd7ae9ea9397be2c 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 da2db720f94ac801bea9924a90e24fc36592bddb..3dc66698d1977cf61d89dc4752ccf699b742dee6 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 abebbbabd9626b73e38b0ff5db0db5e1561bf350..694409947ef64635be86920b347b3df7e27b81a0 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 0f0a3399e2e2798764354bf963107f0f1d468a50..1bc0a343ccea47bac3e46f0c9626312f51860176 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 d5256aaa9f8c5f95982537b5245058d26236ded7..cc7eebb12360a407fb6d67908c22c0c00930274d 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 9fb249ec3c2e804e7f866446b524409a1305ec76..19532716375c8f1a87a27e687aff3a610f5f69ab 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 3d72ae88418cecbac68e63d840b33bf10fb3816f..5bc36bf838c3b99458ec02e0b9dd4d912c5cd58e 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 d27b829b472bc3ed05336257fe328e888ee6e3d1..79b127fcf2a7d72df95f6b39d5ec13c27c07ba09 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 d2df0e9b7892909be537addfc14b71a2626254b3..c9647fc057655aedccfee8e4f9ab9f8858a79190 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 9c617901170e15571a6073f9ab6b228ff0c650c9..c0845c0d5f5e52acd0d7cca1d31c9316e03c1c79 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 8bb139f87e3fb31f580e1865df1e4921a19c45ed..4aa4f1129fdbcf671a4d475cc998234ddc22f0d1 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