diff --git a/A-INSTALL b/A-INSTALL index b51c893bc330a00d0906ccdf56e02bc4fd52829b..5e3c3bdc708cb7f598aaaa149e2a54ade7cc3002 100644 --- a/A-INSTALL +++ b/A-INSTALL @@ -1,8 +1,8 @@ # # Version of PACKAGE MESONH "Open distribution" -# PACK-MNH-V5-4-3 -# DATE : 30/03/2020 -# VERSION : MESONH MASDEV5_4 + BUG-3 +# PACK-MNH-V5-4-4 +# DATE : 16/12/2020 +# VERSION : MESONH MASDEV5_4 + BUG-4 # # MAP # @@ -80,14 +80,14 @@ # # or directly # -# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-4-3.tar.gz +# http://mesonh.aero.obs-mip.fr/mesonh/dir_open/dir_MESONH/MNH-V5-4-4.tar.gz # -# Then untar the file "MNH-V5-4-3.tar.gz" where you want to. +# Then untar the file "MNH-V5-4-4.tar.gz" where you want to. # For example, in your home directory: # cd ~ -tar xvfz MNH-V5-4-3.tar.gz +tar xvfz MNH-V5-4-4.tar.gz # # Process now to the chapter to configure the MesoNH package. @@ -167,10 +167,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-54-branch MNH-V5-4-3 +git lfs clone anongit@anongit_mesonh:/gitrepos/MNH-git_open_source-lfs.git -b MNH-54-branch MNH-V5-4-4 # -# that will create the MNH-V5-4-3 directory containing a clone (copy) of the +# that will create the MNH-V5-4-4 directory containing a clone (copy) of the # Meso-NH package on the remote developpement branch MNH-54-branch # # @@ -180,34 +180,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-54-branch development branch ). # -# To create your local branch corresponding to the V5-4-3 version, type: +# To create your local branch corresponding to the V5-4-4 version, type: # -cd MNH-V5-4-3 -git checkout -b MYB-MNH-V5-4-3 PACK-MNH-V5-4-3 +cd MNH-V5-4-4 +git checkout -b MYB-MNH-V5-4-4 PACK-MNH-V5-4-4 # -# MYB-MNH-V5-4-3 is the name of the local branch you created +# MYB-MNH-V5-4-4 is the name of the local branch you created # and -# PACK-MNH-V5-4-3 is the remote/origin tag on which it is based. +# PACK-MNH-V5-4-4 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-4-4", is announced. +# Suppose that a new version, for example "PACK-MNH-V5-4-5", is announced. # # To see the differences with your working copy, do: # git fetch -git diff HEAD PACK-MNH-V5-4-4 +git diff HEAD PACK-MNH-V5-4-5 # # To go to the new version, you can, for example, create a new local branch: # -git checkout -b MYB-MNH-V5-4-4 PACK-MNH-V5-4-4 +git checkout -b MYB-MNH-V5-4-5 PACK-MNH-V5-4-5 # # At any time, you can also check for "uptodate" changes in the Git branch @@ -253,7 +253,7 @@ git clone anongit@anongit_mesonh:/gitrepos/MNH-DOC.git # use the "./configure" script like this # -cd ~/MNH-V5-4-3/src +cd ~/MNH-V5-4-4/src ./configure . ../conf/profile_mesonh @@ -304,7 +304,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-4-3.MPIAUTO.O2 +. ../conf/profile_mesonh.LXifort.MNH-V5-4-4.MPIAUTO.O2 # # REM: @@ -329,7 +329,7 @@ export OPTLEVEL=O2 # Compile in O2, 4 times faster then DEBUG, but less # go to the directory "src" # -cd ~/MNH-V5-4-3/src +cd ~/MNH-V5-4-4/src # # if you have not already configured your MESONH environment @@ -558,7 +558,7 @@ make examples # cd $WORKDIR -cd MNH-V5-4-3/src +cd MNH-V5-4-4/src ./configure @@ -572,8 +572,8 @@ cd MNH-V5-4-3/src # - On JEAN-ZAY ( HPE ) the compilation is only possible in interactive : -cd MNH-V5-4-3/src -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O2 +cd MNH-V5-4-4/src +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIINTEL-O2 make -j16 |& tee error$XYZ make installmaster @@ -604,12 +604,12 @@ sbatch job_make_examples_BullX_occigen # - ssh irene-fr : for Intel SkyLake/KNL processors # On Intel processors the MPI use is OPENMPI/2.0.4 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIAUTO-O2 # # - ssh irene-amd : for AMD , processors # On AMD processors the MPI use is OPENMPI/4.02 # the configure will generate a -# profile_mesonh-LXifort-R8I4-MNH-V5-4-3-AMD-MPIAUTO-O2 +# profile_mesonh-LXifort-R8I4-MNH-V5-4-4-AMD-MPIAUTO-O2 # # - install the PACKAGE in your $CCCHOME ( default 20Go of quota ) # - Compile in interactive mode ( see IDRIS ) @@ -650,14 +650,14 @@ qsub job_make_examples_CRAY_cca # - At Meteo-France DSI on beaufix (or prolix) # # to install the whole package on your "$HOME" directory -# untar the file "MNH-V5-4-3.tar.gz" from its location : +# untar the file "MNH-V5-4-4.tar.gz" from its location : cd ~ -tar xvf $MESONH/MNH-V5-4-3.tar.gz +tar xvf $MESONH/MNH-V5-4-4.tar.gz # run the "./configure" command : -cd MNH-V5-4-3/src +cd MNH-V5-4-4/src ./configure # @@ -757,7 +757,7 @@ scandollar ## OUTPUT :: -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-3/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-4/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -779,7 +779,7 @@ scandollar 0* ## OUTPUT :: ># -># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-3/conf/post/confdollar_aeropc_default +># read default config file :: ---> CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-4-4/conf/post/confdollar_aeropc_default ># ># read user config file :: ---> CONFIG=confdollar ># @@ -853,22 +853,22 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use this "profile_mesonh" : -. /home/rech/mnh/rmnh007/DEV/MNH-V5-4-3/conf/profile_mesonh-SX8-MNH-V5-4-3-MPIAUTO-O4 +. /home/rech/mnh/rmnh007/DEV/MNH-V5-4-4/conf/profile_mesonh-SX8-MNH-V5-4-4-MPIAUTO-O4 # And the examples are here ( link to my $WORKDIR in actually ) -/home/rech/mnh/rmnh007/DEV/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/home/rech/mnh/rmnh007/DEV/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # # On vargas # --------- # use this "profile_mesonh" : -. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-3/conf/profile_mesonh-AIX64-MNH-V5-4-3-MPIAUTO-O2 +. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-4/conf/profile_mesonh-AIX64-MNH-V5-4-4-MPIAUTO-O2 # and examples here : -/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # # - At CINES on JADE : @@ -876,11 +876,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /work/escobar/DEV/MNH-V5-4-3/conf/profile_mesonh-LXifort-MNH-V5-4-3-MPIICE-O2 +. /work/escobar/DEV/MNH-V5-4-4/conf/profile_mesonh-LXifort-MNH-V5-4-4-MPIICE-O2 # and the exemples -/work/escobar/DEV/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/work/escobar/DEV/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # # - At ECMWF on cxa : @@ -888,11 +888,11 @@ cp -R 007_16janvier_scandollar /.../your_directory # # use -. /c1a/ms_perm/au5/MNH-V5-4-3/conf/profile_mesonh-AIX64-MNH-V5-4-3-MPIAUTO-O2 +. /c1a/ms_perm/au5/MNH-V5-4-4/conf/profile_mesonh-AIX64-MNH-V5-4-4-MPIAUTO-O2 # and the examples -/c1a/ms_perm/au5/MNH-V5-4-3/MY_RUN/KTEST/007_16janvier_scandollar +/c1a/ms_perm/au5/MNH-V5-4-4/MY_RUN/KTEST/007_16janvier_scandollar # diff --git a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/A_RUN_MNH_TOY/run_mesonh_xyz b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/A_RUN_MNH_TOY/run_mesonh_xyz index 0e64c7a0705e944d9fe35db4186926307274a48b..cf56bd736ec0fce8c4b6c9ef499eb902287be0e3 100755 --- a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/A_RUN_MNH_TOY/run_mesonh_xyz +++ b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/A_RUN_MNH_TOY/run_mesonh_xyz @@ -26,4 +26,4 @@ ln -sf ../2_INPUT_TOY/TOYNAMELIST.nam_${TYPE_TOY} TOYNAMELIST.nam ln -fs ../3_INPUT_OASIS/namcouple_${TYPE_TOY} namcouple #time Mpirun -np 1 MESONH${XYZ} : -np 1 $PATH_EXETOY/toy_model -time Mpirun -np 1 $PATH_EXETOY/toy_model : -np 1 totalview MESONH${XYZ} +time Mpirun -np 1 $PATH_EXETOY/toy_model : -np 1 MESONH${XYZ} diff --git a/src/MNH/ch_convect_linox.f90 b/src/MNH/ch_convect_linox.f90 index 2642f84c38c4134c53e6616d4cec6f4ade1fc582..aae2b7345d1c1a9d6f824a6adde3133486b027b8 100644 --- a/src/MNH/ch_convect_linox.f90 +++ b/src/MNH/ch_convect_linox.f90 @@ -1,13 +1,8 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence -!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt +!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- -!--------------- special set of characters for RCS information -!----------------------------------------------------------------- -! $Source$ $Revision$ -! MASDEV4_7 chimie 2006/07/12 18:36:21 -!----------------------------------------------------------------- ! ############################ MODULE MODI_CH_CONVECT_LINOX ! ############################ @@ -115,7 +110,6 @@ END MODULE MODI_CH_CONVECT_LINOX USE MODD_CST USE MODD_PARAMETERS USE MODD_CONVPAREXT -USE MODD_NSV, ONLY : NSV_CHEMBEG, NSV_CHEMEND ! ! USE MODE_ll diff --git a/src/MNH/mnh2lpdm.f90 b/src/MNH/mnh2lpdm.f90 index 3bb745967feb6b7aeb33a6dd14696e7fde871088..d7ed74c744552ac516721d92bbf73dd793938b14 100644 --- a/src/MNH/mnh2lpdm.f90 +++ b/src/MNH/mnh2lpdm.f90 @@ -1,8 +1,8 @@ -!MNH_LIC Copyright 2002-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. -!----------------------------------------------------------------- +!----------------------------------------------------------------------- ! ######spl PROGRAM MNH2LPDM ! ############## @@ -13,9 +13,10 @@ ! Creation : 16.07.2002 ! Modification : 07.01.2006 (T.LAUVAUX, adaptation LPDM) ! Modification : 04.01.2009 (F. BONNARDOT, DP/SER/ENV ) -! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O +! P. Wautelet 05/2016-04/2018: new data structures and calls for I/O ! P. Wautelet 07/02/2019: force TYPE to a known value for IO_File_add2list ! P. Wautelet 10/04/2019: replace ABORT and STOP calls by Print_msg +! P. Wautelet 05/11/2020: correct I/O of MNH2LPDM ! !----------------------------------------------------------------------------- ! @@ -27,9 +28,12 @@ !* 0.1 Modules. ! USE MODD_CONF, ONLY : CPROGRAM -USE MODD_IO, ONLY : TFILEDATA,TPTR2FILE +USE MODD_IO, ONLY : TFILEDATA, TFILE_OUTPUTLISTING, TPTR2FILE +use modd_lunit, only: TLUOUT0 +use modd_lunit_n, only: TLUOUT USE MODD_MNH2LPDM ! +USE MODE_FIELD, ONLY: INI_FIELD_LIST, INI_FIELD_SCALARS USE MODE_IO, ONLY: IO_Init, IO_Config_set USE MODE_IO_FILE, ONLY: IO_File_open, IO_File_close USE MODE_IO_MANAGE_STRUCT, ONLY: IO_File_add2list @@ -37,8 +41,10 @@ USE MODE_MODELN_HANDLER use mode_msg USE MODE_POS ! +USE MODI_INI_CST USE MODI_MNH2LPDM_ECH USE MODI_MNH2LPDM_INI +USE MODI_VERSION ! USE MODN_CONFIO ! @@ -69,6 +75,17 @@ TYPE(TFILEDATA),POINTER :: TZNMLFILE => NULL() ! Namelist file ! CPROGRAM='M2LPDM' CALL GOTO_MODEL(1) +CALL VERSION() +CALL IO_Init() +CALL INI_CST() +CALL INI_FIELD_LIST(1) +CALL INI_FIELD_SCALARS() +! +CALL IO_File_add2list(TLUOUT0,'OUTPUT_LISTING1','OUTPUTLISTING','WRITE') +CALL IO_File_open(TLUOUT0) +!Set output files for PRINT_MSG +TLUOUT => TLUOUT0 +TFILE_OUTPUTLISTING => TLUOUT0 ! !* 1.1 Variables generales. ! diff --git a/src/MNH/mnh2lpdm_ech.f90 b/src/MNH/mnh2lpdm_ech.f90 index 7602cbaedeb897c40394f7621d8ef34b8278d706..ae2e1edd943966235bd7c319a59aef3302b7a4c5 100644 --- a/src/MNH/mnh2lpdm_ech.f90 +++ b/src/MNH/mnh2lpdm_ech.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2009-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -12,9 +12,10 @@ ! Auteur : Francois Bonnardot, DP/SERV/ENV ! Creation : 07.01.2009 ! Modifications: -! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O -! Philippe Wautelet 28/05/2018: corrected truncated integer division (1/3 -> 1./3.) +! P. Wautelet 05/2016-04/2018: new data structures and calls for I/O +! P. Wautelet 28/05/2018: corrected truncated integer division (1/3 -> 1./3.) ! P. Wautelet 26/04/2019: replace non-standard FLOAT function by REAL function +! P. Wautelet 05/11/2020: correct I/O of MNH2LPDM !----------------------------------------------------------------------- ! !* 0. DECLARATIONS. @@ -35,6 +36,7 @@ USE MODD_TIME ! USE MODD_MNH2LPDM ! +use mode_field, only: tfielddata, TYPEREAL USE MODE_IO_FILE, only: IO_File_close, IO_File_open USE MODE_IO_FIELD_READ, only: IO_Field_read USE MODE_IO_MANAGE_STRUCT, only: IO_File_add2list @@ -59,6 +61,7 @@ INTEGER :: ICURAA,ICURMM,ICURJJ ! Date courante. INTEGER :: ICURHH,ICURMN,ICURSS ! Heure courante. INTEGER :: JI,JJ,JK TYPE(DATE_TIME) :: TZDTCUR +type(tfielddata) :: tzfield TYPE(TFILEDATA),POINTER :: TZFILE ! ! @@ -106,13 +109,57 @@ CALL IO_Field_read(TPFILE,'VT', XVT) CALL IO_Field_read(TPFILE,'WT', XWT) CALL IO_Field_read(TPFILE,'THT', XTHT) CALL IO_Field_read(TPFILE,'TKET', XTKET) -!PW:TODO: where are these fields (LM,THW_FLX,DISS,FMU,FMV) written? -!Warning: not in fieldlist => won't be found -CALL IO_Field_read(TPFILE,'LM', XLM) -CALL IO_Field_read(TPFILE,'THW_FLX',XWPTHP) -CALL IO_Field_read(TPFILE,'DISS', XDISSIP) -CALL IO_Field_read(TPFILE,'FMU', XSFU) -CALL IO_Field_read(TPFILE,'FMV', XSFV) + +tzfield%cmnhname = 'LM' +tzfield%clongname = '' +tzfield%cunits = 'm' +tzfield%cdir = 'XY' +tzfield%ccomment = 'Mixing length' +tzfield%ngrid = 1 +tzfield%ntype = TYPEREAL +tzfield%ndims = 3 +CALL IO_Field_read(TPFILE, tzfield, XLM) + +tzfield%cmnhname = 'THW_FLX' +tzfield%clongname = '' +tzfield%cunits = 'K s-1' !correct? +tzfield%cdir = 'XY' +tzfield%ccomment = 'Conservative potential temperature vertical flux' +tzfield%ngrid = 4 +tzfield%ntype = TYPEREAL +tzfield%ndims = 3 +CALL IO_Field_read(TPFILE, tzfield, XWPTHP) + +tzfield%cmnhname = 'DISS' +tzfield%clongname = '' +tzfield%cunits = '' !TODO: set units +tzfield%cdir = 'XY' +tzfield%ccomment = 'X_Y_Z_DISS' +tzfield%ngrid = 1 +tzfield%ntype = TYPEREAL +tzfield%ndims = 3 +CALL IO_Field_read(TPFILE, tzfield, XDISSIP) + +tzfield%cmnhname = 'FMU' +tzfield%clongname = '' +tzfield%cunits = 'kg m-1 s-2' +tzfield%cdir = 'XY' +tzfield%ccomment = 'X_Y_FMU' +tzfield%ngrid = 4 +tzfield%ntype = TYPEREAL +tzfield%ndims = 2 +CALL IO_Field_read(TPFILE, tzfield, XSFU) + +tzfield%cmnhname = 'FMV' +tzfield%clongname = '' +tzfield%cunits = 'kg m-1 s-2' +tzfield%cdir = 'XY' +tzfield%ccomment = 'X_Y_FMV' +tzfield%ngrid = 4 +tzfield%ntype = TYPEREAL +tzfield%ndims = 2 +CALL IO_Field_read(TPFILE, tzfield, XSFV) + CALL IO_Field_read(TPFILE,'INPRT', XINRT) CALL IO_Field_read(TPFILE,'RVT', XRMVT) CALL IO_Field_read(TPFILE,'RCT', XRMCT) diff --git a/src/MNH/mnh2lpdm_ini.f90 b/src/MNH/mnh2lpdm_ini.f90 index 0d317661df0526b0141eab771a1efda2892fba32..41246e290ddba1bdde0b96a61c33bd7df986f7dc 100644 --- a/src/MNH/mnh2lpdm_ini.f90 +++ b/src/MNH/mnh2lpdm_ini.f90 @@ -1,8 +1,8 @@ -!MNH_LIC Copyright 2009-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. -!-------------------------------------------------------------------------- +!----------------------------------------------------------------------- ! ######spl SUBROUTINE MNH2LPDM_INI(TPFILE1,TPFILE2,TPLOGFILE,TPGRIDFILE,TPDATEFILE) !-------------------------------------------------------------------------- @@ -20,8 +20,9 @@ ! TPDATEFILE Date file ! ! Modifications: -! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O +! P. Wautelet 05/2016-04/2018: new data structures and calls for I/O ! P. Wautelet 26/04/2019: replace non-standard FLOAT function by REAL function +! P. Wautelet 05/11/2020: correct I/O of MNH2LPDM !-------------------------------------------------------------------------- ! ! @@ -43,6 +44,7 @@ USE MODD_TIME USE MODD_TIME_n ! USE MODE_DATETIME +use mode_field, only: tfielddata, TYPEREAL USE MODE_GRIDPROJ USE MODE_IO_FILE, only: IO_File_close, IO_File_open USE MODE_IO_FIELD_READ, only: IO_Field_read @@ -81,6 +83,7 @@ INTEGER, DIMENSION(:), ALLOCATABLE :: TAB1D INTEGER, DIMENSION(:,:), ALLOCATABLE :: TAB2D TYPE(DATE_TIME) :: TZDTCUR1,TZDTCUR2,TZDTEXP1 INTEGER :: IFDAT,IFGRI,IFLOG +type(tfielddata) :: tzfield ! ! ! @@ -204,8 +207,15 @@ CALL IO_Field_read(TPFILE1,'ZS',XZS) ! !* 2.8 Rugosite Z0. ! -!PW:TODO: where is this field written? Warning: not in fieldlist => won't be found -CALL IO_Field_read(TPFILE1,'Z0',XZ0) +tzfield%cmnhname = 'Z0' +tzfield%clongname = '' +tzfield%cunits = 'm' +tzfield%cdir = 'XY' +tzfield%ccomment = 'X_Y_Z0' +tzfield%ngrid = 4 +tzfield%ntype = TYPEREAL +tzfield%ndims = 2 +CALL IO_Field_read(TPFILE1,tzfield,XZ0) ! XXPTSOMNH=XXHAT(1)+(XXHAT(2)-XXHAT(1))/2 XYPTSOMNH=XYHAT(1)+(XYHAT(2)-XYHAT(1))/2 diff --git a/src/MNH/mode_gridcart.f90 b/src/MNH/mode_gridcart.f90 index 46fcf2656eab4cb58ced5778a9c9ef406e52ceec..552bc71ce484536a039674bb294be02b7b5f1106 100644 --- a/src/MNH/mode_gridcart.f90 +++ b/src/MNH/mode_gridcart.f90 @@ -107,6 +107,7 @@ CONTAINS ! USE MODE_ll USE MODD_ARGSLIST_ll, ONLY : LIST1D_ll +USE MODE_ARGSLIST_ll, ONLY : CLEANLIST1D_ll USE MODD_LUNIT_n, ONLY : TLUOUT ! USE MODD_PARAMETERS diff --git a/src/MNH/one_wayn.f90 b/src/MNH/one_wayn.f90 index 176fe1bc526c8a75cc81b5c5a010a9bd07db1f53..dae09f3c1fb37f07aab0a4caaa7996cf63b98b41 100644 --- a/src/MNH/one_wayn.f90 +++ b/src/MNH/one_wayn.f90 @@ -767,7 +767,6 @@ END IF ! ------------------------------------------------ ! IF (NSV_A(KMI) > 0) THEN - ! Users scalar variables DO JSV = 1,NSV_A(KMI) IGRID = 1 CALL Compute_LB( PLBXSVM(:,:,:,JSV), PLBYSVM(:,:,:,JSV), PLBXSVS(:,:,:,JSV), PLBYSVS(:,:,:,JSV), & diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90 index 02cdc55d3551888293fcd72c7a126f03d899caaf..88e3806a75a8bd53be0cc835e130b1040783a43f 100644 --- a/src/MNH/prep_ideal_case.f90 +++ b/src/MNH/prep_ideal_case.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -353,7 +353,7 @@ USE MODD_LUNIT, ONLY: TLUOUT0, TOUTDATAFILE USE MODD_LUNIT_n USE MODD_IO, ONLY: NIO_VERB, NVERB_DEBUG, TFILE_DUMMY, TFILE_OUTPUTLISTING USE MODD_CONF_n -USE MODD_NSV, ONLY: NSV +USE MODD_NSV, ONLY: NSV use modd_precision, only: LFIINT, MNHREAL_MPI, MNHTIME ! USE MODN_BLANK diff --git a/src/MNH/read_all_data_grib_case.f90 b/src/MNH/read_all_data_grib_case.f90 index b38be9d78b33525a200a7a18ae524c304ecea68d..9ba136c31475bb6b8fdb8738bbcbf2a43f260b1f 100644 --- a/src/MNH/read_all_data_grib_case.f90 +++ b/src/MNH/read_all_data_grib_case.f90 @@ -523,8 +523,7 @@ SELECT CASE (IMODEL) CASE(6,7) ! arpege and arome GRIB2 CALL SEARCH_FIELD(IGRIB,INUM_ZS,KDIS=0,KCAT=3,KNUMBER=4) IF(INUM_ZS < 0) THEN - ! Old version of EPyGraM (bug corrected since 01/2020) - CALL SEARCH_FIELD(IGRIB,INUM_ZS,KDIS=0,KCAT=3,KNUMBER=5) + CALL SEARCH_FIELD(IGRIB,INUM_ZS,KDIS=0,KCAT=193,KNUMBER=5) IF(INUM_ZS < 0) THEN WRITE (ILUOUT0,'(A)')'Orography is missing - abort' END IF @@ -634,7 +633,7 @@ SELECT CASE (IMODEL) CASE(1,2,3,4,5) ! arpege mocage aladin et aladin reunion CALL SEARCH_FIELD(IGRIB,INUM,KPARAM=1) CASE(6,7) ! NEW AROME,ARPEGE - CALL SEARCH_FIELD(IGRIB,INUM,KDIS=0,KCAT=3,KNUMBER=25) + CALL SEARCH_FIELD(IGRIB,INUM,KDIS=0,KCAT=3,KNUMBER=0) CASE(10) ! NCEP CALL SEARCH_FIELD(IGRIB,INUM,KPARAM=134) END SELECT @@ -926,7 +925,7 @@ IF (IMODEL==6) THEN ! GRIB2 AROME END IF IF (INUM < 0) THEN ISTARTLEVEL = 1 - CALL SEARCH_FIELD(IGRIB,INUM,KDIS=0,KCAT=1,KNUMBER=83,KLEV1=ISTARTLEVEL) + CALL SEARCH_FIELD(IGRIB,INUM,KDIS=0,KCAT=1,KNUMBER=0,KLEV1=ISTARTLEVEL) END IF IF (INUM > 0) THEN WRITE (ILUOUT0,'(A)') ' | Grib file from French Weather Service - Arome model (forecast)' @@ -1237,7 +1236,7 @@ IF (NRR >1) THEN DO JLOOP1=1, INLEVEL ILEV1 = JLOOP1-1+ISTARTLEVEL - CALL SEARCH_FIELD(IGRIB,INUM,KDIS=0,KCAT=1,KNUMBER=32,KLEV1=ILEV1) + CALL SEARCH_FIELD(IGRIB,INUM,KDIS=0,KCAT=1,KNUMBER=201,KLEV1=ILEV1) IF (INUM < 0) THEN WRITE(YMSG,*) 'Specific ratio ',IPAR,' at level ',JLOOP1,' is missing' CALL PRINT_MSG(NVERB_FATAL,'IO','READ_ALL_DATA_GRIB_CASE',YMSG) diff --git a/src/MNH/series_cloud_elec.f90 b/src/MNH/series_cloud_elec.f90 index 2346925601a90e9535358ee188f9f3928e82a027..cb4d18b427e80960d528689416df35526711dc03 100644 --- a/src/MNH/series_cloud_elec.f90 +++ b/src/MNH/series_cloud_elec.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. diff --git a/src/MNH/version.f90 b/src/MNH/version.f90 index 3648f934480672301cf04642feb3769ab61fd8af..510c9701e0146e596e6334cc75988972ed94ade4 100644 --- a/src/MNH/version.f90 +++ b/src/MNH/version.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2020 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -44,9 +44,9 @@ IMPLICIT NONE ! NMNHVERSION(1)=5 NMNHVERSION(2)=4 -NMNHVERSION(3)=3 +NMNHVERSION(3)=4 NMASDEV=54 -NBUGFIX=3 +NBUGFIX=4 CBIBUSER='' ! END SUBROUTINE VERSION diff --git a/src/SURFEX/mode_read_grib.F90 b/src/SURFEX/mode_read_grib.F90 index 2751bff06b17107df33231e213da599818c03176..f92149d19a20c6d00eeb29570069aecf84e819ce 100644 --- a/src/SURFEX/mode_read_grib.F90 +++ b/src/SURFEX/mode_read_grib.F90 @@ -99,7 +99,7 @@ IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:CLEAR_GRIB_INDEX',1,ZHOOK_HANDLE) END SUBROUTINE CLEAR_GRIB_INDEX !------------------------------------------------------------------- ! #################### - SUBROUTINE GET_GRIB_MESSAGE(KLUOUT,KLTYPE,KLEV1,KLEV2,KGRIB,KFOUND,HTYPELEVEL,PLEV1,PLEV2) + SUBROUTINE GET_GRIB_MESSAGE(KLUOUT,KLTYPE,KLEV1,KLEV2,KGRIB,KFOUND,HTYPELEVEL,PLEV1,PLEV2,HNAME) ! #################### ! MODIFICATIONS ! Gaelle Delautier (via Q.Rodier) 01/2019 : add GRIB 2 @@ -117,6 +117,7 @@ INTEGER, INTENT(OUT) :: KFOUND CHARACTER(LEN=*), INTENT(INOUT), OPTIONAL :: HTYPELEVEL ! TypeOfLevel JPMODIF REAL, INTENT(INOUT), OPTIONAL :: PLEV1 ! top level of soil REAL, INTENT(INOUT), OPTIONAL :: PLEV2 ! Bottom level of soil +CHARACTER(LEN=*), INTENT(INOUT), OPTIONAL :: HNAME ! name of the parameter ! INTEGER :: ILTYPE @@ -125,6 +126,7 @@ INTEGER :: ILEV2 CHARACTER(LEN=50) :: YTYPELEVEL ! TypeOfLevel JPMODIF REAL :: ZLEV1,ZLEV2 INTEGER(KIND=kindOfInt) :: IRET +CHARACTER(LEN=50) :: CNAME ! REAL(KIND=JPRB) :: ZHOOK_HANDLE ! @@ -133,7 +135,7 @@ IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:GET_GRIB_MESSAGE',0,ZHOOK_HANDLE) IRET = 0 KFOUND=0 ! -DO WHILE (IRET /= GRIB_END_OF_INDEX .AND. KFOUND/=3) +DO WHILE (IRET /= GRIB_END_OF_INDEX .AND. KFOUND/=4) ! IRET = 0 KFOUND=0 @@ -151,6 +153,16 @@ DO WHILE (IRET /= GRIB_END_OF_INDEX .AND. KFOUND/=3) ENDIF ENDIF ! + IF (IRET.EQ.0) THEN + ! + KFOUND = KFOUND + 1 + ! + IF (PRESENT(HNAME)) THEN + CALL GRIB_GET(KGRIB,'name',CNAME,IRET) + CALL TEST_IRET_STR(KLUOUT,CNAME,HNAME,IRET) + END IF + END IF + ! IF (IRET.EQ.0) THEN ! KFOUND = KFOUND + 1 @@ -182,7 +194,7 @@ DO WHILE (IRET /= GRIB_END_OF_INDEX .AND. KFOUND/=3) ! ENDIF ! - IF (KFOUND.NE.3) THEN + IF (KFOUND.NE.4) THEN CALL GRIB_RELEASE(KGRIB) CALL GRIB_NEW_FROM_INDEX(NIDX,KGRIB,IRET) ENDIF @@ -288,7 +300,7 @@ END SUBROUTINE GET_GRIB_MESSAGE !------------------------------------------------------------------- ! #################### SUBROUTINE READ_GRIB(HGRIB,HINMODEL,KLUOUT,KPARAM,KRET,PFIELD,KLTYPE,KLEV1,KLEV2,KPARAM2, & - KLTYPE2,HTYPELEVEL,PLEV1,PLEV2) + KLTYPE2,HTYPELEVEL,PLEV1,PLEV2,HNAME) ! #################### ! MODIFICATIONS ! Gaelle Delautier (via Q.Rodier) 01/2019 : add GRIB 2 @@ -309,6 +321,7 @@ INTEGER,INTENT(INOUT), OPTIONAL :: KLEV2 ! Level parameter 2 INTEGER, INTENT(INOUT), OPTIONAL :: KPARAM2 INTEGER,INTENT(INOUT), OPTIONAL :: KLTYPE2 ! Level type CHARACTER(LEN=*), INTENT(INOUT), OPTIONAL :: HTYPELEVEL +CHARACTER(LEN=*), INTENT(INOUT), OPTIONAL :: HNAME ! REAL, INTENT(INOUT), OPTIONAL :: PLEV1,PLEV2 ! @@ -317,6 +330,7 @@ INTEGER(KIND=kindOfInt) :: IGRIB INTEGER :: ISIZE, IFOUND REAL(KIND=JPRB) :: ZHOOK_HANDLE REAL :: ZLEV1,ZLEV2 +CHARACTER(LEN=50) :: CNAME ! IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:READ_GRIB',0,ZHOOK_HANDLE) ! @@ -350,7 +364,10 @@ END IF WRITE (KLUOUT,*) 'READ_GRIB GRIB_NEW_FROM_INDEX ',KPARAM,IGRIB,KRET IF (KRET.EQ.0) THEN - IF (PRESENT(HTYPELEVEL)) THEN + IF (PRESENT(HNAME)) THEN + CNAME = HNAME + CALL GET_GRIB_MESSAGE(KLUOUT,ILTYPE,ILEV1,ILEV2,IGRIB,IFOUND,HNAME=CNAME) + ELSEIF (PRESENT(HTYPELEVEL)) THEN CALL GET_GRIB_MESSAGE(KLUOUT,ILTYPE,ILEV1,ILEV2,IGRIB,IFOUND,HTYPELEVEL,ZLEV1,ZLEV2) ELSE CALL GET_GRIB_MESSAGE(KLUOUT,ILTYPE,ILEV1,ILEV2,IGRIB,IFOUND) @@ -361,7 +378,7 @@ ENDIF WRITE (KLUOUT,*) 'READ_GRIB GRIB_NEW_FROM_INDEX ',KPARAM,IGRIB,KRET,IFOUND IF (PRESENT(KPARAM2)) THEN - IF (IFOUND/=3) THEN + IF (IFOUND/=4) THEN IF (HINMODEL=='ARPEGE' .AND.NGRIB_VERSION == 2) THEN CALL GRIB_INDEX_SELECT(NIDX,'parameterNumber',KPARAM2,KRET) ELSE @@ -379,7 +396,7 @@ IF (PRESENT(KPARAM2)) THEN ENDIF ENDIF ! -IF (IFOUND==3) THEN +IF (IFOUND==4) THEN ! IF (PRESENT(KLTYPE)) KLTYPE = ILTYPE IF (PRESENT(KLEV1)) KLEV1 = ILEV1 @@ -595,7 +612,7 @@ INTEGER :: ILEV ! level definition INTEGER :: IPARAM ! number of ParamId or IndicatorOfParameter or ParameterNumber REAL(KIND=JPRB) :: ZHOOK_HANDLE CHARACTER(LEN=7) :: YTYPELEVEL ! Type of searched level - +CHARACTER(LEN=50) :: CNAME ! name of the parameter (for ARPEGE GRIB2 converted with Epygram 1.4.8) !------------------------------------------------------------------- !* Read surface temperature IF (LHOOK) CALL DR_HOOK('MODE_READ_GRIB:READ_GRIB_T',0,ZHOOK_HANDLE) @@ -608,13 +625,15 @@ SELECT CASE (HINMODEL) CASE ('ARPEGE','ALADIN','MOCAGE') ILEV=0 IF (HINMODEL=='ARPEGE' .AND. NGRIB_VERSION==2) THEN - IPARAM=18 + IPARAM=0 ILTYPE=1 + CNAME = 'Temperature' + CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,IPARAM,IRET,PT,KPARAM2=IPARAM,KLTYPE=ILTYPE,KLEV1=ILEV,HNAME=CNAME) ELSE IPARAM=11 ILTYPE=111 + CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,IPARAM,IRET,PT,KLTYPE=ILTYPE,KLEV1=ILEV) ENDIF - CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,IPARAM,IRET,PT,KLTYPE=ILTYPE,KLEV1=ILEV) IF (IRET /= 0) THEN ILTYPE=1 CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,IPARAM,IRET,PT,KLTYPE=ILTYPE) @@ -1655,7 +1674,7 @@ PD(:,2) = 0.20 ILEV1 = 0 IF (HINMODEL == 'ARPEGE' .OR. HINMODEL=='MOCAGE') THEN IF (HINMODEL=='ARPEGE' .AND. NGRIB_VERSION==2) THEN - IPARAM=20 + IPARAM=193 ILTYPE=1 CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,IPARAM,IRET,ZFIELD,KLTYPE=ILTYPE) ELSE @@ -1678,7 +1697,7 @@ PFIELD(:,1) = ZFIELD(:) ! --------------------- IF (HINMODEL == 'ARPEGE' .OR. HINMODEL=='MOCAGE') THEN IF (HINMODEL=='ARPEGE' .AND. NGRIB_VERSION==2) THEN - IPARAM=20 + IPARAM=193 ILTYPE=106 CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,IPARAM,IRET,ZFIELD,KLTYPE=ILTYPE) ELSE @@ -2173,7 +2192,7 @@ SELECT CASE(HINMODEL) CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,141,IRET,ZFIELD) CASE('ARPEGE','ALADIN','MOCAGE','HIRLAM') IF (HINMODEL=='ARPEGE' .AND. NGRIB_VERSION==2) THEN - CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,11,IRET,ZFIELD) + CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,60,IRET,ZFIELD) ELSE CALL READ_GRIB(HGRIB,HINMODEL,KLUOUT,66,IRET,ZFIELD) ENDIF diff --git a/src/configure b/src/configure index 31e21f5699a5b8514218bd8a284c4d4319728cfc..339ae9d29850b02470d57cdb8820b04c1d844221 100755 --- a/src/configure +++ b/src/configure @@ -1,5 +1,5 @@ #!/bin/bash -#MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +#MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier #MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence #MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt #MNH_LIC for details. version 1. @@ -9,7 +9,7 @@ if [ "x$XYZ" = "x" ] then # export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-4} -export VERSION_BUG=${VERSION_BUG:-3} +export VERSION_BUG=${VERSION_BUG:-4} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}} export VERSION_DATE=${VERSION_DATE:-"06/03/2020"} export VERSION_LIBAEC=${VERSION_LIBAEC:-"0.3.4"} @@ -67,7 +67,7 @@ export I_MPI_PIN_PROCESSOR_LIST=all:map=spread export MNHENV=${MNHENV:-" ulimit -s unlimited module purge -module load intel/17.0 intelmpi/2017.2.174 +module load intel/19.4 intelmpi/2019.4.243 export SLURM_CPU_BIND=none export I_MPI_PIN_PROCESSOR_LIST=all:map=spread # force CC=gcc , for HDF5 divide by zero problem with icc !!! @@ -159,7 +159,21 @@ export ARMCI_SHR_BUF_METHOD=COPY ;; esac ;; - +'Linux belenos'*|'Linux taranis'*) + export ARCH=${ARCH:-LXifort} + export VER_MPI=${VER_MPI:-MPIAUTO} + export OPTLEVEL=${OPTLEVEL:-O3} + export MVWORK=${MVWORK:-NO} + export VER_CDF=${VER_CDF:-CDFAUTO} + export NEED_NCARG=${NEED_NCARG:-YES} + export NEED_TOOLS=YES + export MNHENV=${MNHENV:-" +module purge +module load intel/2019.5.281 +module load openmpi/intel/4.0.2.2 +unset CC CXX +"} + ;; 'Linux beaufix'*|'Linux prolix'*) export ARCH=${ARCH:-LXifort} export VER_MPI=${VER_MPI:-MPIINTEL} @@ -360,7 +374,7 @@ export I_MPI_PIN_PROCESSOR_LIST=all:map=spread export VER_CDF=${VER_CDF:-CDFAUTO} export MNHENV=${MNHENV:-" module purge -module load intel/18.2 intelmpi/18.2 +module load intel/20.0.015 intelmpi/20.0.015 export SLURM_CPU_BIND=none export I_MPI_PIN_PROCESSOR_LIST=all:map=spread "} diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index 6da925726b7a56986ee9f49780a0f04e26a6b422..38146598843e829cf2918db6a0f445045b922dd9 100755 --- a/src/job_make_examples_BG +++ b/src/job_make_examples_BG @@ -18,7 +18,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BG-R8I4-MNH-V5-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-4-4-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 d79d3f120d1d920c4987242061804a81218701c7..e8609776412ec371817098f0f6f0ad4befdd06bf 100755 --- a/src/job_make_examples_BGQ +++ b/src/job_make_examples_BGQ @@ -18,7 +18,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-4-3-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-4-4-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index f7b3df0436b43c8ed7cd83fc45aef6ba36cadeda..ec1726f0ae3924f131397fb613b1879e890b65b1 100755 --- a/src/job_make_examples_BullX +++ b/src/job_make_examples_BullX @@ -19,7 +19,7 @@ set -e hostname # Echo des commandes -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIINTEL-O3 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " export POSTRUN="time " diff --git a/src/job_make_examples_BullX_belenos b/src/job_make_examples_BullX_belenos new file mode 100755 index 0000000000000000000000000000000000000000..6411dafe3df591c4c8a9a3bdd2c468194545d14b --- /dev/null +++ b/src/job_make_examples_BullX_belenos @@ -0,0 +1,60 @@ +#!/bin/bash +#MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence +#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt +#MNH_LIC for details. version 1. +#SBATCH -J Examples +#SBATCH -N 1 # nodes number +#SBATCH -n 2 # CPUs number (on all nodes) +#SBATCH -o Examples.eo%j # +#SBATCH -e Examples.eo%j # +#SBATCH -t 01:00:00 # time limit + +ulimit -c 0 +ulimit -s unlimited +# Arret du job des la premiere erreur +set -e +# Nom de la machine +hostname +# Echo des commandes + +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIAUTO-O3 +export MONORUN="Mpirun -np 1 " +export MPIRUN="Mpirun -np 2 " +export POSTRUN="time " + +cd $SRC_MESONH/MY_RUN/KTEST/003_KW78 +make -k +# +echo "#################################################################################" +echo "##CAS SUIVANT####################################################################" +echo "#################################################################################" +cd $SRC_MESONH/MY_RUN/KTEST/001_2Drelief +make -k +# +echo "#################################################################################" +echo "##CAS SUIVANT####################################################################" +echo "#################################################################################" +cd $SRC_MESONH/MY_RUN/KTEST/002_3Drelief +make -k +# +echo "#################################################################################" +echo "##CAS SUIVANT####################################################################" +echo "#################################################################################" + +cd $SRC_MESONH/MY_RUN/KTEST/004_Reunion +make -k << EOF + + +EOF +# +echo "#################################################################################" +echo "##CAS SUIVANT####################################################################" +echo "#################################################################################" +cd $SRC_MESONH/MY_RUN/KTEST/007_16janvier +make -k << EOF + + +EOF +# + diff --git a/src/job_make_examples_BullX_irene b/src/job_make_examples_BullX_irene index 231bdbf7f163f0a2ee974cfac0f67f795cde82e7..95e5349b354e15dd8b7dadbb70acea8fe8b3cd67 100755 --- a/src/job_make_examples_BullX_irene +++ b/src/job_make_examples_BullX_irene @@ -21,7 +21,7 @@ set +x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_irene_AMD b/src/job_make_examples_BullX_irene_AMD index b853b78c6797c042a7f0ffffb5c2809f4b55db3e..cc3c5d60ba2d5a3c9c11c5428770a17e9d3a0c51 100755 --- a/src/job_make_examples_BullX_irene_AMD +++ b/src/job_make_examples_BullX_irene_AMD @@ -20,7 +20,7 @@ set +x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-AMD-MPIAUTO-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-AMD-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen index 9952bcf9486133b25cd9f5e74d26e14af3fbcfc1..e5217b9426f3616a6b9ad94cb5cfef891fea22bd 100755 --- a/src/job_make_examples_BullX_occigen +++ b/src/job_make_examples_BullX_occigen @@ -18,7 +18,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 06c0e0d595416ce2994eed3a9b6d6421b34930a7..7bbb559ee3399cca28445cab49fb056fec7e8e77 100755 --- a/src/job_make_examples_BullX_olympe +++ b/src/job_make_examples_BullX_olympe @@ -17,7 +17,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 54c9a164718efb5d59ce26c430c230926730c0f1..a8b617cda3e39baaa161c33787c78916570b06f8 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -28,7 +28,7 @@ cd ${PBS_O_WORKDIR} ARCH=LXifort #ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-4-3-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-4-4-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_BullX_jeanzay b/src/job_make_examples_HPE_jeanzay similarity index 95% rename from src/job_make_examples_BullX_jeanzay rename to src/job_make_examples_HPE_jeanzay index 71ddd1a7653ae74bf3dc4bdc2ee9f7a249ee7a85..1e27a8821b2066e122b78c2e94e9d66bba0f61f9 100755 --- a/src/job_make_examples_BullX_jeanzay +++ b/src/job_make_examples_HPE_jeanzay @@ -8,6 +8,7 @@ #SBATCH -e Examples.eo%j # #SBATCH -t 01:00:00 # time limit #SBATCH --export=NONE +#SBATCH -A mnh@cpu # put here you account/projet name # Echo des commandes ulimit -c 0 @@ -18,7 +19,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 6b7efd0de14094d62506ccc6bef16a61e40efc59..15a3d2e12cfa3a01e25b0818be80cd0ff4e1c722 100755 --- a/src/job_make_examples_IBM_ada +++ b/src/job_make_examples_IBM_ada @@ -19,7 +19,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 daaf5d3f5f24a5e6a9b02cf1689ea4084eff23d0..436d008c854912cefb77cdacd0872df02173287e 100755 --- a/src/job_make_examples_IBM_sp6_vargas +++ b/src/job_make_examples_IBM_sp6_vargas @@ -24,7 +24,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-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 ec4067cdd7726551bdf4dd7a1a5eace7d37693e0..ed77d09517ba30e753894412a541138d2074d7c2 100755 --- a/src/job_make_examples_NEC_SX8 +++ b/src/job_make_examples_NEC_SX8 @@ -18,7 +18,7 @@ hostname [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 19893d36c3c7036b8394e135dbaf45954ccdb925..42f2c8e4a8a41313d592044710b0f41a22f31839 100755 --- a/src/job_make_examples_SX8 +++ b/src/job_make_examples_SX8 @@ -19,7 +19,7 @@ hostname [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 53dc47aed3a98c74f3662b6f78c5117f41ff6d11..efd6f0033cee95e6c7033e5b21afb08897be15bb 100755 --- a/src/job_make_examples_cxa +++ b/src/job_make_examples_cxa @@ -34,7 +34,7 @@ echo SHELL=$SHELL cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index f239dcf20ffb3f4a972e9ec538f75d118ce24f7d..71af86fb07d3dad8d9d32375c9b05d255e337e6f 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-BG-R8I4-MNH-V5-4-4-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index fc3efc0117fe7b30c6ed198c9e17899b26852b87..815ba0c5a17e429d95fb2ee1e1b1f4c6df23fef3 100755 --- a/src/job_make_mesonh_BGQ +++ b/src/job_make_mesonh_BGQ @@ -34,7 +34,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-4-3-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-4-4-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index 96a3af99022bc50f7e41bc929091bbc9c4726112..10c70674b13a2e331b7f9d78c5a86ad9cef031f6 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-4-3-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIINTEL-O3 time gmake -j 4 time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_BullX_belenos b/src/job_make_mesonh_BullX_belenos new file mode 100755 index 0000000000000000000000000000000000000000..6d634f3c34ff9adae2955efbaab99616ecabfb08 --- /dev/null +++ b/src/job_make_mesonh_BullX_belenos @@ -0,0 +1,23 @@ +#!/bin/bash +#MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence +#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt +#MNH_LIC for details. version 1. +#SBATCH --verbose +#SBATCH --job-name=compile +#SBATCH --time=01:00:00 +#SBATCH --nodes=1 +#SBATCH --ntasks-per-node=1 +#SBATCH --cpus-per-task=16 +#SBATCH -o MasterI_belenos.eo%j # +#SBATCH -e MasterI_belenos.eo%j # + +set -x +# On va lancer la compilation dans le répertoire de lancement du job +pwd + +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-MPIAUTO-O3 + +time make -j 16 +time make -j 1 installmaster + diff --git a/src/job_make_mesonh_CRAY_cca b/src/job_make_mesonh_CRAY_cca index 44d5a607b2cf6b4e1aac6710f4d6158280dd1a9c..e669181470655a7afa5817c381c520072ea462e4 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-4-3-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}-R8I4-MNH-V5-4-4-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_jeanzay b/src/job_make_mesonh_HPE_jeanzay new file mode 100755 index 0000000000000000000000000000000000000000..d5ea7ebfa0543ff3aa78088e46ebe0010e328466 --- /dev/null +++ b/src/job_make_mesonh_HPE_jeanzay @@ -0,0 +1,21 @@ +#!/bin/bash +#MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence +#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt +#MNH_LIC for details. version 1. +#SBATCH --job-name=compile_MNH +#SBATCH -N 1 -n 1 -c 16 +#SBATCH -o Sortie_compile_MasterI.eo%j +#SBATCH --export=NONE +#SBATCH -p compil +#SBATCH -A mnh@cpu # put here your account/projet name + +set -x +# On va lancer la compilation dans le répertoire de lancement du job +pwd + +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 d2eec06db352d72438706c6cbbb03ce6b2d655aa..bb8b9abf42c10de4bdfd6b8e76b515157eeda90f 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-4-3-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-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 311f8acb189cc30e797cb96cfdf3b959dc874b24..9c26e4641ab7689adf99b61194a91bd747ad0578 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-MPIAUTO-O2 time gmake -j1 gribapi time gmake -r -j8 diff --git a/src/job_make_mesonh_MFSX8 b/src/job_make_mesonh_MFSX8 index 707d71f973c4413086295a439e7e4014d956d36c..faf9365b793332ddba1315ed94ccab988f73ba37 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-4-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 651fe30a7f9fe2a8759254c93a944c9c2a4605ea..9bcb36b1b7758853de16817e61e8bb03d1206fae 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-4-3-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-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 88de08f162975a58f3bb0c415e3100f7df5994f3..98d324f50aee8ac00b49fc15a20509522c5c17eb 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-4-3-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-4-4-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 3c044c434ea4f265761de5ea0ed052ac22e118f2..8dfcd279ef4f4fb009eb8262f6c825ee6882a233 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-4-3-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-${VER_USER}-MPIINTEL-O3 time gmake user time gmake -j 1 installuser diff --git a/src/job_make_mesonh_user_BullX_belenos b/src/job_make_mesonh_user_BullX_belenos new file mode 100755 index 0000000000000000000000000000000000000000..5d53cdf7649bb9baf1f391eeb431a61055b5c26f --- /dev/null +++ b/src/job_make_mesonh_user_BullX_belenos @@ -0,0 +1,24 @@ +#!/bin/bash +#MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence +#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt +#MNH_LIC for details. version 1. +#SBATCH --verbose +#SBATCH --job-name=compile +#SBATCH --time=01:00:00 +#SBATCH --nodes=1 +#SBATCH --ntasks-per-node=1 +#SBATCH --cpus-per-task=2 +#SBATCH -o VuserII_belenos.eo%j # +#SBATCH -e VUserII_belenos.eo%j # + +export VER_USER= ######## Your own USER Directory + +set -x +# On va lancer la compilation dans le répertoire de lancement du job +pwd + +. ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-4-4-${VER_USER}-MPIAUTO-O3 + +time make user -j 2 +time make -j 1 installuser diff --git a/src/job_make_mesonh_user_MFSX8 b/src/job_make_mesonh_user_MFSX8 index 2ddfd3f4eb41645c5767fe9860fac592a1400443..0e0ab4c9f22c549a5b710695fa5caa76d869214a 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-4-3-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8-R8I4-MNH-V5-4-4-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser