diff --git a/A-INSTALL b/A-INSTALL index 14ef158756ed91d741f6384f049c749be1b371b5..b24b68d83beadd3dad6fdce21619a189c8c84192 100644 --- a/A-INSTALL +++ b/A-INSTALL @@ -1,8 +1,8 @@ # # Version of PACKAGE MESONH "Open distribution" -# PACK-MNH-V5-6-1 -# DATE : 25/09/2023 -# VERSION : MESONH MASDEV5_6 + BUG-1 +# PACK-MNH-V5-6-2 +# DATE : 28/11/2023 +# VERSION : MESONH MASDEV5_6 + BUG-2 # # MAP # @@ -84,14 +84,14 @@ # # or directly # -# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-6-1.tar.gz +# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-6-2.tar.gz # -# Then untar the file "MNH-V5-6-1.tar.gz" where you want to. +# Then untar the file "MNH-V5-6-2.tar.gz" where you want to. # For example, in your home directory: # cd ~ -tar xvfz MNH-V5-6-1.tar.gz +tar xvfz MNH-V5-6-2.tar.gz # # Process now to the chapter to configure the MesoNH package. @@ -171,10 +171,10 @@ git config --global http.sslverify false # Finally you can clone the Meso-NH Git repository with the following command: # -git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MNH-56-branch MNH-V5-6-1 +git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MNH-56-branch MNH-V5-6-2 # -# that will create the MNH-V5-6-1 directory containing a clone (copy) of the +# that will create the MNH-V5-6-2 directory containing a clone (copy) of the # Meso-NH package on the remote developpement branch MNH-56-branch # # @@ -184,34 +184,34 @@ git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MN # Once the repository is cloned, it's better for you to checkout your own branch # (by default, you are on HEAD of the MNH-56-branch development branch ). # -# To create your local branch corresponding to the V5-6-1 version, type: +# To create your local branch corresponding to the V5-6-2 version, type: # -cd MNH-V5-6-1 -git checkout -b MYB-MNH-V5-6-1 PACK-MNH-V5-6-1 +cd MNH-V5-6-2 +git checkout -b MYB-MNH-V5-6-2 PACK-MNH-V5-6-2 # -# MYB-MNH-V5-6-1 is the name of the local branch you created +# MYB-MNH-V5-6-2 is the name of the local branch you created # and -# PACK-MNH-V5-6-1 is the remote/origin tag on which it is based. +# PACK-MNH-V5-6-2 is the remote/origin tag on which it is based. # # The advantage of this way of downloading the package is that in the future # you could check/update quickly differences with the new version of the # package without having to download entirely the full package. # -# Suppose that a new version, for example "PACK-MNH-V5-6-1", is announced. +# Suppose that a new version, for example "PACK-MNH-V5-6-3", is announced. # # To see the differences with your working copy, do: # git fetch -git diff HEAD PACK-MNH-V5-6-1 +git diff HEAD PACK-MNH-V5-6-3 # # To go to the new version, you can, for example, create a new local branch: # -git checkout -b MYB-MNH-V5-6-1 PACK-MNH-V5-6-1 +git checkout -b MYB-MNH-V5-6-3 PACK-MNH-V5-6-3 # # At any time, you can also check for "uptodate" changes in the Git branch @@ -257,7 +257,7 @@ git clone anongit@anongit_mesonh:/gitrepos/MNH-DOC.git # use the "./configure" script like this # -cd ~/MNH-V5-6-1/src +cd ~/MNH-V5-6-2/src ./configure . ../conf/profile_mesonh @@ -308,7 +308,7 @@ export OPTLEVEL=O2 # Compile in O2, 4 times faster then DEBUG, but less # and then source/load the new generate file -. ../conf/profile_mesonh.LXifort.MNH-V5-6-1.MPIAUTO.O2 +. ../conf/profile_mesonh.LXifort.MNH-V5-6-2.MPIAUTO.O2 # # REM: @@ -333,7 +333,7 @@ export OPTLEVEL=O2 # Compile in O2, 4 times faster then DEBUG, but less # go to the directory "src" # -cd ~/MNH-V5-6-1/src +cd ~/MNH-V5-6-2/src # # if you have not already configured your MESONH environment @@ -562,7 +562,7 @@ make examples # cd $WORKDIR -cd MNH-V5-6-1/src +cd MNH-V5-6-2/src ./configure @@ -576,8 +576,8 @@ cd MNH-V5-6-1/src # - On JEAN-ZAY ( HPE ) the compilation is in interactive : -cd MNH-V5-6-1/src -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +cd MNH-V5-6-2/src +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 make -j16 |& tee error$XYZ make installmaster @@ -612,12 +612,12 @@ sbatch job_make_examples_BullX_occigen # - ssh irene-fr : for Intel SkyLake processors # On Intel processors the MPI use is OPENMPI/4.1.4 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 # # - ssh irene-amd : for AMD , processors # On AMD processors the MPI use is OPENMPI/4.1.4 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-6-1-AMD-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-6-2-AMD-MPIAUTO-O2 # # # At TGCC they use 'one login' for multi-project allocation . @@ -647,9 +647,9 @@ echo $CCCHOME # - install the PACKAGE in your ${CCCHOME} ( default 20Go of quota ) # for example on Intel frontal cd ${CCCHOME} -cd MNH-V5-6-1/src +cd MNH-V5-6-2/src ./configure -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 make -j16 |& tee error$XYZ make installmaster @@ -689,14 +689,14 @@ sbatch job_make_examples_Atos_HPCF # - At Meteo-France DSI on belenos # # to install the whole package on your "$HOME" directory -# untar the file "MNH-V5-6-1.tar.gz" from its location : +# untar the file "MNH-V5-6-2.tar.gz" from its location : cd ~ -tar xvf $MESONH/MNH-V5-6-1.tar.gz +tar xvf $MESONH/MNH-V5-6-2.tar.gz # run the "./configure" command : -cd MNH-V5-6-1/src +cd MNH-V5-6-2/src ./configure # @@ -795,7 +795,7 @@ scandollar ## OUTPUT :: -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-1/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-2/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -817,7 +817,7 @@ scandollar 0* ## OUTPUT :: ># -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-1/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-6-2/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -891,22 +891,22 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use this "profile_mesonh" : -. /home/rech/mnh/rmnh007/DEV/MNH-V5-6-1/conf/profile_mesonh-SX8-MNH-V5-6-1-MPIAUTO-O4 +. /home/rech/mnh/rmnh007/DEV/MNH-V5-6-2/conf/profile_mesonh-SX8-MNH-V5-6-2-MPIAUTO-O4 # And the examples are here ( link to my $WORKDIR in actually ) -/home/rech/mnh/rmnh007/DEV/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/home/rech/mnh/rmnh007/DEV/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # # On vargas # --------- # use this "profile_mesonh" : -. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-1/conf/profile_mesonh-AIX64-MNH-V5-6-1-MPIAUTO-O2 +. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-2/conf/profile_mesonh-AIX64-MNH-V5-6-2-MPIAUTO-O2 # and examples here : -/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # # - At CINES on JADE : @@ -914,11 +914,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /work/escobar/DEV/MNH-V5-6-1/conf/profile_mesonh-LXifort-MNH-V5-6-1-MPIICE-O2 +. /work/escobar/DEV/MNH-V5-6-2/conf/profile_mesonh-LXifort-MNH-V5-6-2-MPIICE-O2 # and the exemples -/work/escobar/DEV/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/work/escobar/DEV/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # # - At ECMWF on cxa : @@ -926,11 +926,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /c1a/ms_perm/au5/MNH-V5-6-1/conf/profile_mesonh-AIX64-MNH-V5-6-1-MPIAUTO-O2 +. /c1a/ms_perm/au5/MNH-V5-6-2/conf/profile_mesonh-AIX64-MNH-V5-6-2-MPIAUTO-O2 # and the examples -/c1a/ms_perm/au5/MNH-V5-6-1/MY_RUN/KTEST/007_16janvier_scandollar +/c1a/ms_perm/au5/MNH-V5-6-2/MY_RUN/KTEST/007_16janvier_scandollar # diff --git a/src/MNH/condsamp.f90 b/src/MNH/condsamp.f90 index 7de29c11466164bcf28683e3c8c2491c37191913..8142daedce3f69924b0ca33b215881bc3eb10dae 100644 --- a/src/MNH/condsamp.f90 +++ b/src/MNH/condsamp.f90 @@ -70,6 +70,8 @@ USE MODD_DYN , ONLY : XTSTEP_MODEL1 USE MODD_CONDSAMP USE MODE_ll USE MODD_CST +USE MODE_MPPDB +USE MODE_REPRO_SUM, ONLY : SUM_DD_R2_ll ! !* 0. DECLARATIONS ! ------------ @@ -98,7 +100,9 @@ REAL, DIMENSION(SIZE(XRT,1),SIZE(XRT,2),SIZE(XRT,3)) :: ZRT REAL, DIMENSION(SIZE(XSVT,1),SIZE(XSVT,2),SIZE(XSVT,3),SIZE(XSVT,4)) :: ZSVT REAL, DIMENSION(SIZE(XTHT,1),SIZE(XTHT,2),SIZE(XTHT,3)) :: ZSUM,ZTHV REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZLVOCPEXNM,ZLSOCPEXNM ! Lv/Cp/EXNREF and Ls/Cp/EXNREF at t-1 - +! +CHARACTER(LEN=3) :: YJSV +INTEGER :: IIMAX_ll,IJMAX_ll ! !-------------------------------------------------------------------------------------- ! @@ -111,9 +115,16 @@ IKU = SIZE(XRT,3) IKB = 1 + JPVEXT IKE = IKU - JPVEXT CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) +CALL GET_GLOBALDIMS_ll ( IIMAX_ll,IJMAX_ll) ! ZSVT(:,:,:,:) = XSVT(:,:,:,:) ! +IF (MPPDB_INITIALIZED) THEN +DO JSV=NSV_CSBEG, NSV_CSEND + WRITE( YJSV, '( I3.3 )' ) JSV + CALL MPPDB_CHECK3D(ZSVT(:,:,:,JSV),"BEG CONDSAMP ZSVT"//YJSV,PRECISION) +END DO +END IF ! ! !* 1. INITIALIZATION OF CONDITIONAL SAMPLING TRACERS @@ -159,10 +170,10 @@ IF ( NSV_CS >= 2 ) THEN ZTHV(:,:,JK)=XTHT(:,:,JK) * ( 1. + XRV/XRD*XRT(:,:,JK,1) ) & / ( 1. + ZSUM(:,:,JK) ) END DO - ZTHVMEAN = SUM(ZTHV(:,:,2))/SIZE(ZTHV(:,:,2)) + ZTHVMEAN = SUM_DD_R2_ll(ZTHV(IIB:IIE,IJB:IJE,2))/REAL(IIMAX_ll*IJMAX_ll) DO JK=3,IKE IF (ITOP == 0) THEN - ZDT = SUM(ZTHV(:,:,JK))/SIZE(ZTHV(:,:,JK)) + ZDT = SUM_DD_R2_ll(ZTHV(IIB:IIE,IJB:IJE,JK))/REAL(IIMAX_ll*IJMAX_ll) ZTHVMEAN = (1.0/XZHAT(JK+1))* & (XZHAT(JK)*ZTHVMEAN + (XZHAT(JK+1)-XZHAT(JK))*ZDT) IF (ZDT > ZTHVMEAN + ZOFFSET ) THEN @@ -181,7 +192,7 @@ IF ( NSV_CS >= 2 ) THEN ! DO JK=1,IKE ! ZDT need to become positive at least once - ZDT = SUM((XTHT(:,:,JK+1)-XTHT(:,:,JK)))/SIZE(XTHT(:,:,JK)) + ZDT = SUM_DD_R2_ll(XTHT(IIB:IIE,IJB:IJE,JK+1)-XTHT(IIB:IIE,IJB:IJE,JK))/REAL(IIMAX_ll*IJMAX_ll) ZDT = ZDT/(XZHAT(JK+1)-XZHAT(JK)) IF ( ZDT > ZMAXZDT ) THEN ITOP=JK @@ -260,6 +271,12 @@ DO JSV=NSV_CSBEG, NSV_CSEND XRSVS(:,:,:,JSV) = XRSVS(:,:,:,JSV) + & XRHODJ(:,:,:)*(ZSVT(:,:,:,JSV)-XSVT(:,:,:,JSV))/PTSTEP END DO +IF (MPPDB_INITIALIZED) THEN +DO JSV=NSV_CSBEG, NSV_CSEND + WRITE( YJSV, '( I3.3 )' ) JSV + CALL MPPDB_CHECK3D(ZSVT(:,:,:,JSV),"END CONDSAMP ZSVT"//YJSV,PRECISION) +END DO +END IF !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- diff --git a/src/configure b/src/configure index 49916ee35c1e3fa956b21f543fdf5000b7781cd7..1c765c1827274ca722e16863ece4c15ba4b2ed10 100755 --- a/src/configure +++ b/src/configure @@ -9,9 +9,9 @@ if [ "x$XYZ" = "x" ] then # export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-6} -export VERSION_BUG=${VERSION_BUG:-1} +export VERSION_BUG=${VERSION_BUG:-2} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} -export VERSION_DATE=${VERSION_DATE:-"05/09/2023"} +export VERSION_DATE=${VERSION_DATE:-"28/11/2023"} export VERSION_LIBAEC=${VERSION_LIBAEC:-"v1.0.6"} export VERSION_HDF=${VERSION_HDF:-"1.14.0"} export VERSION_CDFC=${VERSION_CDFC:-"4.9.0"} diff --git a/src/job_make_examples_Atos_HPCF b/src/job_make_examples_Atos_HPCF index 65ba970c370e156ff7f5909a600ac158ca392502..ae66d0d1a980e1b334a84cf3cd053dba33941af0 100755 --- a/src/job_make_examples_Atos_HPCF +++ b/src/job_make_examples_Atos_HPCF @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " export POSTRUN="echo " diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index e8f6132974c132d298ca4a76436445931fa9c8b3..049c496096b8c5cb22da726fd5cd04fedcf1dfbd 100755 --- a/src/job_make_examples_BG +++ b/src/job_make_examples_BG @@ -20,7 +20,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-2-MPIAUTO-O2 #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier diff --git a/src/job_make_examples_BGQ b/src/job_make_examples_BGQ index c03278a8d207cab00f3f9e155d2649b6e232702f..89fd486027972143994f87b08d0e1b74b09569d4 100755 --- a/src/job_make_examples_BGQ +++ b/src/job_make_examples_BGQ @@ -20,7 +20,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-2-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index 0b587f09176955c3d9aaaa944ee6865e58ee65ca..1296ec63c27f63f1ca7376039c7fe178fda88af2 100755 --- a/src/job_make_examples_BullX +++ b/src/job_make_examples_BullX @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O3 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " export POSTRUN="time " diff --git a/src/job_make_examples_BullX_irene b/src/job_make_examples_BullX_irene index 06ae65615c65f1c48d3b572b75c0aa7bb6d5400c..1b93983b9eb0105fa8e1d5ad4ba0c63bb1d50e99 100755 --- a/src/job_make_examples_BullX_irene +++ b/src/job_make_examples_BullX_irene @@ -23,7 +23,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_irene_AMD b/src/job_make_examples_BullX_irene_AMD index be925880cc4f00619b193c534d429017c75bcb09..8951653c51c93ac4dfefc2fcb12f58c7a2a048b2 100755 --- a/src/job_make_examples_BullX_irene_AMD +++ b/src/job_make_examples_BullX_irene_AMD @@ -22,7 +22,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-AMD-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-AMD-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen index 6542f508bd854b85a1ed6d42a2cd5fa7ac6a6fa9..ed5c476d24efe1e0a3b6d41d85edcbef6c6168db 100755 --- a/src/job_make_examples_BullX_occigen +++ b/src/job_make_examples_BullX_occigen @@ -20,7 +20,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 export MONORUN="Mpirun -prepend-rank -np 1 " export MPIRUN="Mpirun -prepend-rank -np 4 " export POSTRUN="echo " diff --git a/src/job_make_examples_BullX_olympe b/src/job_make_examples_BullX_olympe index 69b879082fb2b47a19789d9757fe0b0b39fb3509..72f1be33044e505b65b27b077857edf3dff85c9d 100755 --- a/src/job_make_examples_BullX_olympe +++ b/src/job_make_examples_BullX_olympe @@ -19,7 +19,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 export MONORUN="mpirun -prepend-rank -np 1 " export MPIRUN="mpirun -prepend-rank -np 4 " export POSTRUN="echo " diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index 377799f8126694bab83565fb81b2263b5e2c4c49..0a5a77910103986878fce1c47af7db7ab8ad3ad2 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -30,7 +30,7 @@ cd ${PBS_O_WORKDIR} ARCH=LXifort #ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-2-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_HPE_adastra_genoa b/src/job_make_examples_HPE_adastra_genoa index 748fac3e0def27fc0474208dd6853444cb3e316c..86a9e5dc6b8fb7114008a75b57af7af6077dd141 100755 --- a/src/job_make_examples_HPE_adastra_genoa +++ b/src/job_make_examples_HPE_adastra_genoa @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-2-MPICRAY-O2 export MONORUN="Exec srun -l -n 1 --export=ALL" export MPIRUN="Exec srun -l -n 4 --export=ALL" export POSTRUN="echo " diff --git a/src/job_make_examples_HPE_jeanzay b/src/job_make_examples_HPE_jeanzay index 69cf4ed54a4edb480afe5733ca0b30cc4cd603c7..8c37f922dc8e969fa6a3d6b13428ed14abf390a2 100755 --- a/src/job_make_examples_HPE_jeanzay +++ b/src/job_make_examples_HPE_jeanzay @@ -21,7 +21,7 @@ hostname unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 export MONORUN="Exec srun -l -n 1 --export=ALL numabind_core_slurm" export MPIRUN="Exec srun -l -n 4 --export=ALL numabind_core_slurm" export POSTRUN="echo " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index fab87c7c9b0e0d83b75a738f19b130dd585a21bc..5269e3ed36849acc701f1321139fd999df7c22ca 100755 --- a/src/job_make_examples_IBM_ada +++ b/src/job_make_examples_IBM_ada @@ -21,7 +21,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 # Pour avoir l'echo des commandes set -x diff --git a/src/job_make_examples_IBM_sp6_vargas b/src/job_make_examples_IBM_sp6_vargas index a9b0f45279275b91ee4cc24bd6d1c85bf6d26f31..98e322800d74b5cb9a762d80b90349a1999ea581 100755 --- a/src/job_make_examples_IBM_sp6_vargas +++ b/src/job_make_examples_IBM_sp6_vargas @@ -26,7 +26,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-2-MPIAUTO-O2 #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier diff --git a/src/job_make_examples_NEC_SX8 b/src/job_make_examples_NEC_SX8 index c3a8d5b4eed43e25551d63f03e1ae691f5a24334..26589cc95aa3a1590a68d1ba558b009abd0e800a 100755 --- a/src/job_make_examples_NEC_SX8 +++ b/src/job_make_examples_NEC_SX8 @@ -20,7 +20,7 @@ unset MAKEFLAGS [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-2-MPIAUTO-O4 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " diff --git a/src/job_make_examples_SX8 b/src/job_make_examples_SX8 index 8b64eb53b84448310688fca97cb9b72cda39c5d5..f001453c6e3ca50d16103991f7b8b3a3f3317558 100755 --- a/src/job_make_examples_SX8 +++ b/src/job_make_examples_SX8 @@ -21,7 +21,7 @@ unset MAKEFLAGS [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-2-MPIAUTO-O2 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " diff --git a/src/job_make_examples_cxa b/src/job_make_examples_cxa index e47b714dbc480a2ca76068d9f63febf48e8c7278..492c07550bee2022a46a6ce41ba3e8130fb16ceb 100755 --- a/src/job_make_examples_cxa +++ b/src/job_make_examples_cxa @@ -36,7 +36,7 @@ cd $LOADL_STEP_INITDIR unset MAKEFLAGS -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-2-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index b1d7561bf18c046e886d5d4d6ed81f96b3beb2b4..0e08b650dc3a7e2aff8572a8e08a1c37f0e25a61 100755 --- a/src/job_make_mesonh_BG +++ b/src/job_make_mesonh_BG @@ -18,7 +18,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-2-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index cf6051a1f8b4d2f3b474cff9ea9fead3df1a949c..dae7ba1ec9fdce5744c122b23d06f521a5e38a43 100755 --- a/src/job_make_mesonh_BGQ +++ b/src/job_make_mesonh_BGQ @@ -20,7 +20,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-1-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-2-MPIAUTO-O2NAN time gmake -j8 time gmake -j8 diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index d25fe2a8fb563a1efa57d89657cecfb58f8231e2..43a95cff8ce714bbd0b629e25bcd905e6ac9e94c 100755 --- a/src/job_make_mesonh_BullX +++ b/src/job_make_mesonh_BullX @@ -19,7 +19,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O3 time gmake -j 4 time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_CRAY_cca b/src/job_make_mesonh_CRAY_cca index 4c6d3a42ba60c585bebf90e86bd9172eacc58d1f..e930aaf5ccea3a5c332d9f401f1f04d29a6964f5 100755 --- a/src/job_make_mesonh_CRAY_cca +++ b/src/job_make_mesonh_CRAY_cca @@ -21,7 +21,7 @@ pwd ARCH=LXifort #ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-6-2-MPICRAY-O2 time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}.$$ time gmake -j 4 2>&1 | tee sortie_compile_${ARCH}2.$$ diff --git a/src/job_make_mesonh_HPE_adastra_genoa b/src/job_make_mesonh_HPE_adastra_genoa index c7816c7764735623a0c0ba94cea0fcaef41a39d4..3610778312ff94c6ca1a047c5eeeceebe8e84ae4 100755 --- a/src/job_make_mesonh_HPE_adastra_genoa +++ b/src/job_make_mesonh_HPE_adastra_genoa @@ -15,7 +15,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-1-MPICRAY-O2 +. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-2-MPICRAY-O2 time make -j 32 time make -j 1 installmaster diff --git a/src/job_make_mesonh_HPE_jeanzay b/src/job_make_mesonh_HPE_jeanzay index 76fe333e1e8581204ab1a7b38595bd24919a1f17..344266251eb510b472ccd2f0ddbdd11d60132bbe 100755 --- a/src/job_make_mesonh_HPE_jeanzay +++ b/src/job_make_mesonh_HPE_jeanzay @@ -14,7 +14,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 time gmake -j 16 time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada index a5cdc87fb08b5715ddf1781a3c7f2278a0c14737..928c3d4bdb1d8e5460dc546b35d54fc04fc92d25 100755 --- a/src/job_make_mesonh_IBM_ada +++ b/src/job_make_mesonh_IBM_ada @@ -16,7 +16,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-MPIINTEL-O2 # Pour avoir l'echo des commandes set -x diff --git a/src/job_make_mesonh_IBM_sp6_vargas b/src/job_make_mesonh_IBM_sp6_vargas index a2aa69838080a721aaf6254af7eaed8ad3744245..9d046b1abcde17a5ed3745142285d6ca6f884370 100755 --- a/src/job_make_mesonh_IBM_sp6_vargas +++ b/src/job_make_mesonh_IBM_sp6_vargas @@ -24,7 +24,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-2-MPIAUTO-O2 time gmake -r -j8 time gmake installmaster diff --git a/src/job_make_mesonh_MFSX8 b/src/job_make_mesonh_MFSX8 index 75c2ab68eac63f863b30976f33bcd158f625a1b7..18af1071971ce0352b4bd5ba03c8847da5bff2be 100644 --- a/src/job_make_mesonh_MFSX8 +++ b/src/job_make_mesonh_MFSX8 @@ -12,7 +12,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR} -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-2-MPIAUTO-O4 time gmake -j 4 ########## compile on four processors to speedup the compilation time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_NEC_SX8 b/src/job_make_mesonh_NEC_SX8 index 9d67f48fb08d41071ed409fd1e459dc2e4449ee4..ce15a0ee577c401801552b0973c3aa38d305a20f 100755 --- a/src/job_make_mesonh_NEC_SX8 +++ b/src/job_make_mesonh_NEC_SX8 @@ -11,7 +11,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job [ $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-2-MPIAUTO-O4 time gmake -j 4 time gmake -j 4 # some time problem with first pass in parallel compilation diff --git a/src/job_make_mesonh_cxa b/src/job_make_mesonh_cxa index 3ef0e1c19413717964d748be693108ccd371385d..f7b78647f7f405a520b766623484477900fa8110 100755 --- a/src/job_make_mesonh_cxa +++ b/src/job_make_mesonh_cxa @@ -27,7 +27,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-2-MPIAUTO-O2 time gmake -r -j1 time gmake installmaster diff --git a/src/job_make_mesonh_user_BullX b/src/job_make_mesonh_user_BullX index 39186a408ef7b18f51ecfbb3b64dafda0f58f5fb..ecd10ec5de217c71184db91a04d400d765cf3aeb 100755 --- a/src/job_make_mesonh_user_BullX +++ b/src/job_make_mesonh_user_BullX @@ -19,7 +19,7 @@ export VER_USER= ########## Your own USER Directory set -x # On va lancer la compilation dans le répertoire de lancement du job -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-${VER_USER}-MPIINTEL-O3 time gmake user time gmake -j 1 installuser diff --git a/src/job_make_mesonh_user_MFSX8 b/src/job_make_mesonh_user_MFSX8 index 1caf983e77cadfaa64e45f0119d8b89a94edd0df..256aeb224440d4ac3a4d58f5820d77069a120298 100644 --- a/src/job_make_mesonh_user_MFSX8 +++ b/src/job_make_mesonh_user_MFSX8 @@ -14,7 +14,7 @@ set -x [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR} -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-2-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser