From a8732b30ba99faff2e359519fae45f5057ff6e63 Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Wed, 7 Aug 2024 11:23:31 +0200 Subject: [PATCH] Quentin 07/08/2024: HPC test cases multiple adaptation for 571: - CSEG length now more than 5 characters allowed: adapt plot and pre-steps link and file names - BACKUP files at time=0 not possible any more - fix some variables name to plot (the ending 'T' is removed) --- .../HPC/16JAN/RUN/EXSEG1.nam_run1 | 2 +- .../INTEGRATION_CASES/HPC/16JAN/RUN/run_diag | 8 ----- .../HPC/ARMCU_LES/DEAR/run_mesonh | 10 ------ .../HPC/ARMCU_LES/HM21/run_mesonh | 10 ------ .../HPC/CHARMEX/NCL/plot_chem_06.ncl | 2 +- .../HPC/CHARMEX/NCL/plot_chem_12.ncl | 2 +- .../HPC/CHARMEX/RUN/EXSEG1.nam_dom1 | 2 +- .../HPC/CHARMEX/RUN/EXSEG1.nam_dom2 | 2 +- .../HPC/DUST/PYTHON/plot_DUST.py | 2 +- .../HPC/DUST/PYTHON/run_python | 2 +- .../HPC/DUST/RUN/EXSEG1.nam.2 | 2 +- .../HPC/DUST/RUN/EXSEG1.nam.3 | 2 +- .../02-1WT_and_Nest/04_RUN_EOL/EXSEG1.nam | 2 +- .../02-1WT_and_Nest/04_RUN_EOL/EXSEG2.nam | 2 +- .../02-1WT_and_Nest/04_RUN_EOL/run_mesonh | 4 +-- .../03-2WT_Pre_and_Nest/03_SPAWN/SPAWN1.nam | 2 +- .../03-2WT_Pre_and_Nest/03_SPAWN/run_spawn | 4 +-- .../03-2WT_Pre_and_Nest/04_RUN_PRE/EXSEG1.nam | 2 +- .../03-2WT_Pre_and_Nest/04_RUN_PRE/run_mesonh | 2 +- .../03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG1.nam | 2 +- .../03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG2.nam | 2 +- .../03-2WT_Pre_and_Nest/05_RUN_EOL/run_mesonh | 2 +- .../ADR/01_1WT_opti/02_RUN_EOL/EXSEG1.nam | 4 +-- .../ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam | 6 ++-- .../HPC/FANNY/LIMA/run_mesonh | 3 -- .../HPC/FIRE/CEN4TH_RKC4/run_mesonh | 8 ----- .../FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh | 11 ------ .../HPC/FOG_3D/ICE3/EXSEG1.nam_SEG02 | 2 +- .../HPC/FOG_3D/ICE3/run_mesonh2 | 7 ---- .../HPC/FOG_3D/LIMA_ECRAD/EXSEG1.nam_SEG02 | 2 +- .../HPC/FOG_3D/LIMA_v22222/EXSEG1.nam_SEG02 | 2 +- .../HPC/KMAP/PYTHON/plot_KMAP.py | 2 +- .../INTEGRATION_CASES/HPC/KMAP/RUN/DIAG1.nam | 2 +- .../INTEGRATION_CASES/HPC/KMAP/RUN/run_diag | 4 +-- .../MEGAN/EUROPE/005_mesonh_tst1/EXSEG1.nam | 14 ++++---- .../EUROPE/005_mesonh_tst1/run_mesonh.sh | 7 ++-- .../MEGAN/EUROPE/005_mesonh_tst2/EXSEG1.nam | 12 ++++--- .../EUROPE/005_mesonh_tst2/run_mesonh.sh | 7 ++-- .../MEGAN/EUROPE/005_mesonh_tst3/EXSEG1.nam | 12 ++++--- .../EUROPE/005_mesonh_tst3/run_mesonh.sh | 7 ++-- .../MEGAN/EUROPE/005_mesonh_tst4/EXSEG1.nam | 12 ++++--- .../EUROPE/005_mesonh_tst4/run_mesonh.sh | 6 ++-- .../HPC/MEGAN/EUROPE/006_plot/plot_MEGAN.py | 2 +- .../006_mesonh_283TO3003/EXSEG1.nam | 4 +-- .../REUNION_DMS/PYTHON/plot_MEGAN_REUNION.py | 36 +++++++++---------- .../HPC/OCEAN_LES/002_run1/EXSEG1.nam | 2 +- .../HPC/OCEAN_LES/004_run2/EXSEG1.nam | 2 +- .../HPC/STERAO/RUN/EXSEG1.nam | 2 +- .../HPC/STERAO/RUN/PRE_IDEA1.nam | 2 +- .../HPC/STERAO/RUN/run_mesonh | 8 ----- 50 files changed, 98 insertions(+), 160 deletions(-) diff --git a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/EXSEG1.nam_run1 b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/EXSEG1.nam_run1 index e9ef6c04c..ca5282717 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/EXSEG1.nam_run1 +++ b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/EXSEG1.nam_run1 @@ -18,7 +18,7 @@ &NAM_TURBn CTURBLEN = "BL89", CTURBDIM = "1DIM", LTURB_DIAG = F, LTURB_FLX = F / &NAM_CONF CCONF = "START", NMODEL = 1, NVERB = 5, - CEXP = "16JA1v ", CSEG = "WENO5",NHALO=3 / + CEXP = "16JA1 ", CSEG = "WENO5",NHALO=3 / &NAM_DYN XSEGLEN = 43200., LCORIO = T, LNUMDIFU = F,LNUMDIFTH = F, XALKTOP = 0.001, XALZBOT = 15000. / &NAM_BACKUP XBAK_TIME(1,1)=10800., XBAK_TIME(1,2)=21600.,XBAK_TIME(1,3)=32400.,XBAK_TIME(1,4)=43200./ diff --git a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/run_diag b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/run_diag index 18de97229..bbc10046c 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/run_diag +++ b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/run_diag @@ -39,12 +39,4 @@ mv OUTPUT_LISTING1 OUTPUT_LISTING1_diag2 rm -f DIAG1.nam rm -f file_for_xtransfer pipe_name -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. -mkdir NETCDF -mv *.nc NETCDF ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/DEAR/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/DEAR/run_mesonh index 5d53acb81..bcd14fa30 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/DEAR/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/DEAR/run_mesonh @@ -34,15 +34,5 @@ ls -lrt rm -f file_for_xtransfer pipe_name PRESSURE REMAP* -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. -mkdir NETCDF -mv *.nc NETCDF/. -ja - cd ../PYTHON sbatch run_python diff --git a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/HM21/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/HM21/run_mesonh index 311fc9321..d9d630cb7 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/HM21/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/HM21/run_mesonh @@ -34,15 +34,5 @@ ls -lrt rm -f file_for_xtransfer pipe_name PRESSURE REMAP* -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. -mkdir NETCDF -mv *.nc NETCDF/. -ja - cd ../PYTHON sbatch run_python diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_06.ncl b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_06.ncl index bc0e191cb..841c2a0a3 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_06.ncl +++ b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_06.ncl @@ -8,7 +8,7 @@ begin ; open file and read in data ;=================================================; - a = addfile("../RUN/OUTFILES/CHARM.1.SEG02.004.nc", "r") + a = addfile("../RUN/OUTFILES/CHARM.1.SEG02.003.nc", "r") ;=================================================; ; Get informations on variable sizes ; dims are dims-2 to remove non-physical values diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_12.ncl b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_12.ncl index 558a25ae9..b719a6f61 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_12.ncl +++ b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NCL/plot_chem_12.ncl @@ -8,7 +8,7 @@ begin ; open file and read in data ;=================================================; - a = addfile("../RUN/OUTFILES/CHARM.1.SEG02.010.nc", "r") + a = addfile("../RUN/OUTFILES/CHARM.1.SEG02.009.nc", "r") ;=================================================; ; Get informations on variable sizes ; dims are dims-2 to remove non-physical values diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom1 b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom1 index 335dbccbc..2c11ac5bf 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom1 +++ b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom1 @@ -2,7 +2,7 @@ &NAM_CONFZ NZ_VERB=5 , NZ_PROC=0 , MPI_BUFFER_SIZE=50, NB_PROCIO_R=1 , NB_PROCIO_W=1, LMNH_MPI_BSEND = F, LMNH_MPI_ALLTOALLV_REMAP = T / -&NAM_CONF CCONF = "START", NVERB=10, NMODEL = 1, +&NAM_CONF CCONF = "START", NVERB=2, NMODEL = 1, CEXP = "CHARM", CSEG = "SEG01" , CSPLIT="BSPLITTING",NHALO=3 / &NAM_DYN XSEGLEN = 43200., LCORIO = T, LNUMDIFU = F, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom2 b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom2 index 9647ae355..ea3b42a69 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom2 +++ b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/RUN/EXSEG1.nam_dom2 @@ -2,7 +2,7 @@ &NAM_CONFZ NZ_VERB=5 , NZ_PROC=0 , MPI_BUFFER_SIZE=50, NB_PROCIO_R=1 , NB_PROCIO_W=1, LMNH_MPI_BSEND = F, LMNH_MPI_ALLTOALLV_REMAP = T / -&NAM_CONF CCONF = "START", NVERB=5, NMODEL = 1, +&NAM_CONF CCONF = "START", NVERB=2, NMODEL = 1, CEXP = "CHARM", CSEG = "SEG02" , CSPLIT="BSPLITTING",NHALO=3 / &NAM_DYN XSEGLEN = 32400., LCORIO = T, LNUMDIFU = F, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/plot_DUST.py b/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/plot_DUST.py index be130665b..8d1a7119b 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/plot_DUST.py +++ b/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/plot_DUST.py @@ -17,7 +17,7 @@ os.system('rm -f tempgraph*') # path="" -LnameFiles = ['DUST7.1.W5_S3.009.nc'] +LnameFiles = ['DUST7.1.W5_S3.008.nc'] Dvar_input = {'f1':['F_DST001P1','F_DST002P1','F_DST003P1', 'latitude', 'longitude', 'time']} diff --git a/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/run_python index ece1ab2a1..d28e42aa3 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/run_python +++ b/MY_RUN/INTEGRATION_CASES/HPC/DUST/PYTHON/run_python @@ -18,6 +18,6 @@ ln -sf ${SRC_MESONH}/src/LIB/Python/* . module purge module load python/3.7.6 -ln -sf ../RUN/DUST7.1.W5_S3.009.nc . +ln -sf ../RUN/DUST7.1.W5_S3.008.nc . python3 plot_DUST.py convert *.png DUST.pdf diff --git a/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.2 b/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.2 index 2af812305..4841130cf 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.2 +++ b/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.2 @@ -1,5 +1,5 @@ &NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F / - &NAM_LUNITn CINIFILE = "DUST7.1.W5_S1.009" ,CINIFILEPGD="pgd_shade", + &NAM_LUNITn CINIFILE = "DUST7.1.W5_S1.008" ,CINIFILEPGD="pgd_shade", CCPLFILE(1) = "S7020000925.06", CCPLFILE(2) = "S7020000925.12", CCPLFILE(3) = "S7020000925.18", CCPLFILE(4) = "S7020000926.00" / &NAM_DYNn XTSTEP = 120., CPRESOPT = "ZRESI", NITR = 12, LITRADJ=T, XRELAX = 1., LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.3 b/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.3 index eced604ae..150fbdf33 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.3 +++ b/MY_RUN/INTEGRATION_CASES/HPC/DUST/RUN/EXSEG1.nam.3 @@ -1,5 +1,5 @@ &NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F / - &NAM_LUNITn CINIFILE = "DUST7.1.W5_S2.009" ,CINIFILEPGD="pgd_shade", + &NAM_LUNITn CINIFILE = "DUST7.1.W5_S2.008" ,CINIFILEPGD="pgd_shade", CCPLFILE(1) = "S7020000926.06", CCPLFILE(2) = "S7020000926.12", CCPLFILE(3) = "S7020000926.18", CCPLFILE(4) = "S7020000927.00" / &NAM_DYNn XTSTEP = 120., CPRESOPT = "ZRESI", NITR = 12, LITRADJ=T, XRELAX = 1., LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG1.nam index ed57939f6..7965644e1 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG1.nam @@ -1,4 +1,4 @@ -&NAM_LUNITn CINIFILE = "FIRE_.1.SEG1.003", +&NAM_LUNITn CINIFILE = "FIRE_.1.SEG1.002", CINIFILEPGD = "FIRE_PGD"/ &NAM_CONFIO LCDF4 = T, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG2.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG2.nam index 5a2b15304..4691bb27b 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG2.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/EXSEG2.nam @@ -1,4 +1,4 @@ -&NAM_LUNITn CINIFILE = "FIRE_.2.SEG1.003", +&NAM_LUNITn CINIFILE = "FIRE_.2.SEG1.002", CINIFILEPGD = "FIRE_INI.spa00"/ &NAM_DYNn XTSTEP = 1, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_mesonh index ce1b0c9a3..7346d208f 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_mesonh @@ -22,8 +22,8 @@ set -e ln -sf ../01_PREP/FIRE_* . ln -sf ../02_SPAWN/FIRE_INI.spa* . -ln -sf ../03_RUN_PRE/FIRE_.1.SEG1.003* . -ln -sf ../03_RUN_PRE/FIRE_.2.SEG1.003* . +ln -sf ../03_RUN_PRE/FIRE_.1.SEG1.002* . +ln -sf ../03_RUN_PRE/FIRE_.2.SEG1.002* . time ${MPIRUN} MESONH${XYZ} diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/SPAWN1.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/SPAWN1.nam index db5e7cccc..1446eb492 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/SPAWN1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/SPAWN1.nam @@ -13,7 +13,7 @@ / &NAM_LUNIT2_SPA - CINIFILE = 'DADDY.1.SEG1.003', + CINIFILE = 'DADDY.1.SEG1.002', CINIFILEPGD = 'DAD_PGD', YSPANBR = '00', YSPAFILE = 'SON_INInPGD', diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/run_spawn b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/run_spawn index df552e4c4..181bad42c 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/run_spawn +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/03_SPAWN/run_spawn @@ -22,11 +22,11 @@ set -e export MPIRUN="mpirun -np 1" ln -sf ../01_PREP/DAD* . -ln -sf ../02_RUN_PERE/DADDY.1.SEG1.003.* . +ln -sf ../02_RUN_PERE/DADDY.1.SEG1.002.* . time ${MPIRUN} SPAWNING${XYZ} -sed -i 's/DADDY.1.SEG1.003/SON_INInPGD/g' SON_INInPGD.des +sed -i 's/DADDY.1.SEG1.002/SON_INInPGD/g' SON_INInPGD.des sed -i 's/CINIFILEPGD = "/CINIFILEPGD="SON_INInPGD/g' SON_INInPGD.des diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/EXSEG1.nam index 9a29de0ae..b0991d0de 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/EXSEG1.nam @@ -1,4 +1,4 @@ -&NAM_LUNITn CINIFILE = "DADDY.1.SEG1.003", +&NAM_LUNITn CINIFILE = "DADDY.1.SEG1.002", CINIFILEPGD = "DAD_PGD"/ &NAM_CONFIO LCDF4 = T, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/run_mesonh index 879cba05f..e676898c0 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/04_RUN_PRE/run_mesonh @@ -21,7 +21,7 @@ set -x set -e ln -sf ../01_PREP/DAD_PGD* . -ln -sf ../02_RUN_PERE/DADDY.1.SEG1.003.* . +ln -sf ../02_RUN_PERE/DADDY.1.SEG1.002.* . ln -sf ../03_SPAWN/SON* . time ${MPIRUN} MESONH${XYZ} diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG1.nam index fa928b841..07c4a71ef 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG1.nam @@ -1,4 +1,4 @@ -&NAM_LUNITn CINIFILE = "RUN_P.1.SEG1.003", +&NAM_LUNITn CINIFILE = "RUN_PRE.1.SEG1.002", CINIFILEPGD = "DAD_PGD"/ &NAM_CONFIO LCDF4 = T, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG2.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG2.nam index 0e75ba2ff..a31033bbb 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG2.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/EXSEG2.nam @@ -1,4 +1,4 @@ -&NAM_LUNITn CINIFILE = "RUN_P.2.SEG1.003", +&NAM_LUNITn CINIFILE = "RUN_PRE.2.SEG1.002", CINIFILEPGD = "SON_INInPGD"/ &NAM_DYNn XTSTEP = 1, diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_mesonh index 87e2bc91c..64e45f205 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_mesonh @@ -22,7 +22,7 @@ set -e ln -sf ../01_PREP/DAD_PGD* . ln -sf ../03_SPAWN/SON_INInPGD* . -ln -sf ../04_RUN_PRE/RUN_P.*.SEG1.003.* . +ln -sf ../04_RUN_PRE/RUN_P*.SEG1.002.* . time ${MPIRUN} MESONH${XYZ} diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADR/01_1WT_opti/02_RUN_EOL/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADR/01_1WT_opti/02_RUN_EOL/EXSEG1.nam index 428b56ef3..51eebca03 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADR/01_1WT_opti/02_RUN_EOL/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADR/01_1WT_opti/02_RUN_EOL/EXSEG1.nam @@ -90,6 +90,6 @@ LTECOUTPTS = .FALSE. LCSVOUTFRM = .FALSE./ -&NAM_BACKUP XBAK_TIME(1,1) = 0.0, +&NAM_BACKUP XBAK_TIME(1,1) = 1.0, XBAK_TIME(1,2) = 300.0, - XBAK_TIME(1,3) = 306.25/ + XBAK_TIME(1,3) = 306/ diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam index d664ee4eb..ca4cdf4e8 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam @@ -1,11 +1,9 @@ -&NAM_LUNITn CINIFILE = "DTU10.1.SEG3.002", +&NAM_LUNITn CINIFILE = "FIRE_INI", CINIFILEPGD = "FIRE_PGD"/ &NAM_CONFIO LCDF4 = T, LLFIOUT = F, - LLFIREAD = F, - NIO_ABORT_LEVEL = 1, - NGEN_ABORT_LEVEL = 1/ + LLFIREAD = F/ &NAM_DYNn XTSTEP = 0.01, CPRESOPT = "ZRESI", diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_mesonh index 094b32703..d218fb83b 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/LIMA/run_mesonh @@ -33,6 +33,3 @@ mv OUTPUT_LISTING1 OUTPUT_LISTING1_run1 ls -lrt rm -f file_for_xtransfer pipe_name PRESSURE REMAP* - -sbatch run_diag -ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh index 97a73f0e4..1b3fe0f4e 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4/run_mesonh @@ -31,13 +31,5 @@ mv OUTPUT_LISTING0 OUTPUT_LISTING0_run mv OUTPUT_LISTING1 OUTPUT_LISTING1_run ls -lrt - rm -f file_for_xtransfer pipe_name PRESSURE REMAP* - -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh index bafc878a7..e63e25a8b 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/FIRE/CEN4TH_RKC4_LIMA_ECRAD/run_mesonh @@ -30,15 +30,4 @@ rm -f FIRE_.1.CEN4T.* time ${MPIRUN} MESONH${XYZ} mv OUTPUT_LISTING0 OUTPUT_LISTING0_run mv OUTPUT_LISTING1 OUTPUT_LISTING1_run - -ls -lrt - rm -f file_for_xtransfer pipe_name PRESSURE REMAP* - -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. -ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/EXSEG1.nam_SEG02 b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/EXSEG1.nam_SEG02 index c256717a9..a2647f8bd 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/EXSEG1.nam_SEG02 +++ b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/EXSEG1.nam_SEG02 @@ -1,5 +1,5 @@ &NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F / -&NAM_LUNITn CINIFILE = "FOG3D.1.CE_S1.007" , +&NAM_LUNITn CINIFILE = "FOG3D.1.CE_S1.006" , CINIFILEPGD="PGD_CDG", CCPLFILE(1) = "CPL_20090228.03", CCPLFILE(2) = "CPL_20090228.06" / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/run_mesonh2 b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/run_mesonh2 index e301cdf37..34810e801 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/run_mesonh2 +++ b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/ICE3/run_mesonh2 @@ -35,11 +35,4 @@ ls -lrt rm -f EXSEG1.nam rm -f file_for_xtransfer pipe_name PRESSURE REMAP* -ls -lrt -rm -Rf OUTPUT -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. ja diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_ECRAD/EXSEG1.nam_SEG02 b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_ECRAD/EXSEG1.nam_SEG02 index 106cd4e31..dd94b8855 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_ECRAD/EXSEG1.nam_SEG02 +++ b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_ECRAD/EXSEG1.nam_SEG02 @@ -1,5 +1,5 @@ &NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F / -&NAM_LUNITn CINIFILE = "FOG3D.1.CE_S1.007" , +&NAM_LUNITn CINIFILE = "FOG3D.1.CE_S1.006" , CINIFILEPGD="PGD_CDG", CCPLFILE(1) = "CPL_20090228.03", CCPLFILE(2) = "CPL_20090228.06" / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_v22222/EXSEG1.nam_SEG02 b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_v22222/EXSEG1.nam_SEG02 index c281eb823..6c7082866 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_v22222/EXSEG1.nam_SEG02 +++ b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/LIMA_v22222/EXSEG1.nam_SEG02 @@ -1,5 +1,5 @@ &NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F / -&NAM_LUNITn CINIFILE = "FOG3D.1.CE_S1.007" , +&NAM_LUNITn CINIFILE = "FOG3D.1.CE_S1.006" , CINIFILEPGD="PGD_CDG", CCPLFILE(1) = "CPL_20090228.03", CCPLFILE(2) = "CPL_20090228.06" / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/plot_KMAP.py b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/plot_KMAP.py index f632dfa25..ed0e5755a 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/plot_KMAP.py +++ b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/plot_KMAP.py @@ -20,7 +20,7 @@ os.system('rm -f tempgraph*') # path="" -LnameFiles = ['K_MAP.3.WENO5.009diag.nc'] + ['K_MAP.3.WENO5.01'+str(i)+'diag.nc' for i in range(4)] +LnameFiles = ['K_MAP.3.WENO5.008diag.nc', 'K_MAP.3.WENO5.009diag.nc'] + ['K_MAP.3.WENO5.01'+str(i)+'diag.nc' for i in range(3)] Dvar_input = {'f'+str(i):['RARE', 'level', 'latitude', 'longitude', 'time'] for i in range(1,6)} diff --git a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/DIAG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/DIAG1.nam index 4dbd15d23..47930de1d 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/DIAG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/DIAG1.nam @@ -1,5 +1,5 @@ &NAM_CONFIO LCDF4=T, LLFIOUT=F, LLFIREAD=F / &NAM_DIAG LTOTAL_PR=T, LRADAR=T , LVAR_PR=T / &NAM_DIAG_FILE YSUFFIX = "diag" -YINIFILE(1) = "K_MAP.3.WENO5.013", +YINIFILE(1) = "K_MAP.3.WENO5.012", YINIFILEPGD(1)='KMAP_PGD_2km.neste1'/ diff --git a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag index a15cfd424..8bfd467c6 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag +++ b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag @@ -25,11 +25,11 @@ set -e ls -lrt -for ECH in '009' '010' '011' '012' '013' +for ECH in '008' '009' '010' '011' '012' do cat > DIAG1.nam << EOF -&NAM_CONFIO LCDF4=T, LLFIOUT=T, LLFIREAD=T / +&NAM_CONFIO LCDF4=T, LLFIOUT=F, LLFIREAD=F / &NAM_DIAG LTOTAL_PR=T, LRADAR=T , LVAR_PR=T / &NAM_DIAG_FILE YSUFFIX = "diag" YINIFILE(1) = "K_MAP.3.WENO5.${ECH}", diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/EXSEG1.nam index 38dc81e54..681ad4332 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/EXSEG1.nam @@ -2,14 +2,16 @@ NB_PROCIO_R=1 , NB_PROCIO_W=1, LMNH_MPI_BSEND = F, LMNH_MPI_ALLTOALLV_REMAP = T / &NAM_CONFIO LCDF4 = T / -&NAM_CONF CCONF = "START", NVERB=10, NMODEL = 1, +&NAM_CONF CCONF = "START", NVERB=2, NMODEL = 1, CEXP = "CHARM", CSEG = "SEG01" , CSPLIT="BSPLITTING",NHALO=3 / &NAM_DYN XSEGLEN = 3600., LCORIO = T, LNUMDIFU = F, XALKTOP = 0.005, XALZBOT = 14000. / -&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km" +&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km", + CCPLFILE(1) = "CPLCHE20140630.06" / + / -&NAM_DYNn XTSTEP = 15., +&NAM_DYNn XTSTEP = 60., CPRESOPT = "ZRESI", NITR = 8, LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T, @@ -62,7 +64,7 @@ CMINERAL = "EQSAM", CORGANIC = "MPMPO", CNUCLEATION = "MAATTANEN_NEUTRAL" / -&NAM_BACKUP XBAK_TIME(1,1) = 20., XBAK_TIME(1,2) = 3600. XBAK_TIME(1,3) = 21600.,XBAK_TIME(1,4) = 43200/ +&NAM_BACKUP XBAK_TIME(1,1) = 3600 / &NAM_DIAG_SURFn N2M = 0, LSURF_BUDGET = F / &NAM_ISBA CALBEDO="DRY" / &NAM_ISBAn CSCOND="NP89", @@ -72,7 +74,7 @@ &NAM_SEAFLUXn CSEA_ALB="TA96", LPRECIP = T / &NAM_CH_SURFn LCH_SURF_EMIS=T / &NAM_CH_CONTROLn CCHEM_SURF_FILE= "ReLACS3_MACCity.nam" / -&NAM_CH_ISBAn CCH_DRY_DEP="WES89",LCH_BIO_FLUX=.FALSE., CPARAMBVOC="", +&NAM_CH_ISBAn CCH_DRY_DEP="WES89",LCH_BIO_FLUX=F, CPARAMBVOC="", XDROUGHT=0., XMODPREC=0., XDAILYPAR=800., XDAILYTEMP=295. / &NAM_CH_SEAFLUXn CCH_DRY_DEP="WES89" / &NAM_CH_WATFLUXn CCH_DRY_DEP="WES89" / @@ -87,4 +89,4 @@ &NAM_BLANK / &NAM_NEBn LSUBG_COND = F / -&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / \ No newline at end of file +&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/run_mesonh.sh b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/run_mesonh.sh index f9e6ce76b..33399e2fe 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/run_mesonh.sh +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst1/run_mesonh.sh @@ -1,11 +1,10 @@ #!/bin/sh #SBATCH -J run_megan1 #SBATCH -N 1 # nodes number (=NBP) -#SBATCH -n 1 # CPUs number (on all nodes) (=NBP*TPN) +#SBATCH -n 4 # CPUs number (on all nodes) (=NBP*TPN) #SBATCH -o run_megan.eo%j # #SBATCH -e run_megan.eo%j # -#SBATCH -t 00:30:00 # time limit - +#SBATCH -t 05:00:00 # time limit # Echo des commandes ulimit -c 0 ulimit -s unlimited @@ -16,7 +15,7 @@ hostname . ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-RELACS -export MPIRUN="Mpirun -np 1" +export MPIRUN="Mpirun -np 4" set -x set -e diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/EXSEG1.nam index f5f29b7aa..a53feb2eb 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/EXSEG1.nam @@ -2,14 +2,16 @@ NB_PROCIO_R=1 , NB_PROCIO_W=1, LMNH_MPI_BSEND = F, LMNH_MPI_ALLTOALLV_REMAP = T / &NAM_CONFIO LCDF4 = T / -&NAM_CONF CCONF = "START", NVERB=10, NMODEL = 1, +&NAM_CONF CCONF = "START", NVERB=2, NMODEL = 1, CEXP = "CHARM", CSEG = "SEG01" , CSPLIT="BSPLITTING",NHALO=3 / &NAM_DYN XSEGLEN = 3600., LCORIO = T, LNUMDIFU = F, XALKTOP = 0.005, XALZBOT = 14000. / -&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km" +&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km", + CCPLFILE(1) = "CPLCHE20140630.06" / + / -&NAM_DYNn XTSTEP = 15., +&NAM_DYNn XTSTEP = 60., CPRESOPT = "ZRESI", NITR = 8, LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T, @@ -62,7 +64,7 @@ CMINERAL = "EQSAM", CORGANIC = "MPMPO", CNUCLEATION = "MAATTANEN_NEUTRAL" / -&NAM_BACKUP XBAK_TIME(1,1) = 20., XBAK_TIME(1,2) = 3600. XBAK_TIME(1,3) = 21600.,XBAK_TIME(1,4) = 43200/ +&NAM_BACKUP XBAK_TIME(1,1) = 3600 / &NAM_DIAG_SURFn N2M = 0, LSURF_BUDGET = F / &NAM_ISBA CALBEDO="DRY" / &NAM_ISBAn CSCOND="NP89", @@ -87,4 +89,4 @@ &NAM_BLANK / &NAM_NEBn LSUBG_COND = F / -&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / \ No newline at end of file +&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/run_mesonh.sh b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/run_mesonh.sh index 7958e74d5..9b7be713c 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/run_mesonh.sh +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst2/run_mesonh.sh @@ -1,11 +1,10 @@ #!/bin/sh #SBATCH -J run_megan1 #SBATCH -N 1 # nodes number (=NBP) -#SBATCH -n 1 # CPUs number (on all nodes) (=NBP*TPN) +#SBATCH -n 4 # CPUs number (on all nodes) (=NBP*TPN) #SBATCH -o run_megan.eo%j # #SBATCH -e run_megan.eo%j # -#SBATCH -t 02:30:00 # time limit - +#SBATCH -t 05:00:00 # time limit # Echo des commandes ulimit -c 0 ulimit -s unlimited @@ -17,7 +16,7 @@ hostname . ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-RELACS -export MPIRUN="Mpirun -np 1" +export MPIRUN="Mpirun -np 4" set -x set -e diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/EXSEG1.nam index 2702c920e..bef88656b 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/EXSEG1.nam @@ -2,14 +2,16 @@ NB_PROCIO_R=1 , NB_PROCIO_W=1, LMNH_MPI_BSEND = F, LMNH_MPI_ALLTOALLV_REMAP = T / &NAM_CONFIO LCDF4 = T / -&NAM_CONF CCONF = "START", NVERB=10, NMODEL = 1, +&NAM_CONF CCONF = "START", NVERB=2, NMODEL = 1, CEXP = "CHARM", CSEG = "SEG01" , CSPLIT="BSPLITTING",NHALO=3 / &NAM_DYN XSEGLEN = 3600., LCORIO = T, LNUMDIFU = F, XALKTOP = 0.005, XALZBOT = 14000. / -&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km" +&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km", + CCPLFILE(1) = "CPLCHE20140630.06" / + / -&NAM_DYNn XTSTEP = 15., +&NAM_DYNn XTSTEP = 60., CPRESOPT = "ZRESI", NITR = 8, LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T, @@ -62,7 +64,7 @@ CMINERAL = "EQSAM", CORGANIC = "MPMPO", CNUCLEATION = "MAATTANEN_NEUTRAL" / -&NAM_BACKUP XBAK_TIME(1,1) = 20., XBAK_TIME(1,2) = 3600. XBAK_TIME(1,3) = 21600.,XBAK_TIME(1,4) = 43200/ +&NAM_BACKUP XBAK_TIME(1,1) = 3600 / &NAM_DIAG_SURFn N2M = 0, LSURF_BUDGET = F / &NAM_ISBA CALBEDO="DRY" / &NAM_ISBAn CSCOND="NP89", @@ -87,4 +89,4 @@ &NAM_BLANK / &NAM_NEBn LSUBG_COND = F / -&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / \ No newline at end of file +&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/run_mesonh.sh b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/run_mesonh.sh index ffbf4d2bf..33399e2fe 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/run_mesonh.sh +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst3/run_mesonh.sh @@ -1,11 +1,10 @@ #!/bin/sh #SBATCH -J run_megan1 #SBATCH -N 1 # nodes number (=NBP) -#SBATCH -n 1 # CPUs number (on all nodes) (=NBP*TPN) +#SBATCH -n 4 # CPUs number (on all nodes) (=NBP*TPN) #SBATCH -o run_megan.eo%j # #SBATCH -e run_megan.eo%j # -#SBATCH -t 02:30:00 # time limit - +#SBATCH -t 05:00:00 # time limit # Echo des commandes ulimit -c 0 ulimit -s unlimited @@ -16,7 +15,7 @@ hostname . ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-RELACS -export MPIRUN="Mpirun -np 1" +export MPIRUN="Mpirun -np 4" set -x set -e diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/EXSEG1.nam index 4817a68c9..259407d11 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/EXSEG1.nam @@ -2,14 +2,16 @@ NB_PROCIO_R=1 , NB_PROCIO_W=1, LMNH_MPI_BSEND = F, LMNH_MPI_ALLTOALLV_REMAP = T / &NAM_CONFIO LCDF4 = T / -&NAM_CONF CCONF = "START", NVERB=10, NMODEL = 1, +&NAM_CONF CCONF = "START", NVERB=2, NMODEL = 1, CEXP = "CHARM", CSEG = "SEG01" , CSPLIT="BSPLITTING",NHALO=3 / &NAM_DYN XSEGLEN = 3600., LCORIO = T, LNUMDIFU = F, XALKTOP = 0.005, XALZBOT = 14000. / -&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km" +&NAM_LUNITn CINIFILE = "CPLCHE20140630.00",CINIFILEPGD="CHARMEX0714_PGD_50km", + CCPLFILE(1) = "CPLCHE20140630.06" / + / -&NAM_DYNn XTSTEP = 15., +&NAM_DYNn XTSTEP = 60., CPRESOPT = "ZRESI", NITR = 8, LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T, @@ -62,7 +64,7 @@ CMINERAL = "EQSAM", CORGANIC = "MPMPO", CNUCLEATION = "MAATTANEN_NEUTRAL" / -&NAM_BACKUP XBAK_TIME(1,1) = 20., XBAK_TIME(1,2) = 3600. XBAK_TIME(1,3) = 21600.,XBAK_TIME(1,4) = 43200/ +&NAM_BACKUP XBAK_TIME(1,1) = 3600 / &NAM_DIAG_SURFn N2M = 0, LSURF_BUDGET = F / &NAM_ISBA CALBEDO="DRY" / &NAM_ISBAn CSCOND="NP89", @@ -87,4 +89,4 @@ &NAM_BLANK / &NAM_NEBn LSUBG_COND = F / -&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / \ No newline at end of file +&NAM_PARAM_ICEn CSUBG_AUCV_RC = "CLFR" / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/run_mesonh.sh b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/run_mesonh.sh index 988448ef5..33399e2fe 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/run_mesonh.sh +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/005_mesonh_tst4/run_mesonh.sh @@ -1,10 +1,10 @@ #!/bin/sh #SBATCH -J run_megan1 #SBATCH -N 1 # nodes number (=NBP) -#SBATCH -n 1 # CPUs number (on all nodes) (=NBP*TPN) +#SBATCH -n 4 # CPUs number (on all nodes) (=NBP*TPN) #SBATCH -o run_megan.eo%j # #SBATCH -e run_megan.eo%j # -#SBATCH -t 03:00:00 # time limit +#SBATCH -t 05:00:00 # time limit # Echo des commandes ulimit -c 0 ulimit -s unlimited @@ -15,7 +15,7 @@ hostname . ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-RELACS -export MPIRUN="Mpirun -np 1" +export MPIRUN="Mpirun -np 4" set -x set -e diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/006_plot/plot_MEGAN.py b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/006_plot/plot_MEGAN.py index 341bd4887..7407efcd5 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/006_plot/plot_MEGAN.py +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/EUROPE/006_plot/plot_MEGAN.py @@ -18,7 +18,7 @@ except: import os Lpath=["../005_mesonh_tst1/","../005_mesonh_tst2/","../005_mesonh_tst3/","../005_mesonh_tst4/"] -LnameFiles=['CHARM.1.SEG01.002.nc']*4 +LnameFiles=['CHARM.1.SEG01.001.nc']*4 variables=['CO','O3','NO2','NO','ISOP','BIOL','HCHO','BIOH','latitude','longitude'] Dvar_input = {'f1': variables,'f2': variables,'f3': variables,'f4': variables} diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/006_mesonh_283TO3003/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/006_mesonh_283TO3003/EXSEG1.nam index dacb1fd25..b6cfefbdd 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/006_mesonh_283TO3003/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/006_mesonh_283TO3003/EXSEG1.nam @@ -162,7 +162,7 @@ &NAM_SEAFLUXn CSEA_ALB="TA96", LPRECIP = T / -&NAM_CH_SURFn LCH_SURF_EMIS=T / +&NAM_CH_SURFn LCH_SURF_EMIS=T, LCH_DMSEMIS=T / &NAM_CH_CONTROLn CCHEM_SURF_FILE= "ReLACS_MACCity_aero.nam" / @@ -187,4 +187,4 @@ &NAM_BLANK / &NAM_NEBn LSIGMAS=T, LSUBG_COND=F / -&NAM_PARAM_ICEn CSUBG_AUCV_RC='NONE'/ \ No newline at end of file +&NAM_PARAM_ICEn CSUBG_AUCV_RC='NONE'/ diff --git a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/PYTHON/plot_MEGAN_REUNION.py b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/PYTHON/plot_MEGAN_REUNION.py index af1823f4e..017e22c8d 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/PYTHON/plot_MEGAN_REUNION.py +++ b/MY_RUN/INTEGRATION_CASES/HPC/MEGAN/REUNION_DMS/PYTHON/plot_MEGAN_REUNION.py @@ -20,10 +20,10 @@ import os Lpath=["../006_mesonh_283TO3003/"] LnameFiles=['A2830.1.MEGAD.006.nc'] -variables=['COT','O3T','NO2T','NOT','BIOPT','HCHOT','BIOT','latitude','longitude', - 'ETHT', 'CARBOT','PHOT','SO2T','SULFT','DMST','CH4T','XO2T','PANT', - 'DEAERM31CT','DEAERM32CT','DEAERM31RT','DEAERM32RT', - 'SLTM01T','SLTM02T','SLTM03T','SLTM04T','SLTM05T','SLTM06T','SLTM07T','SLTM08T'] +variables=['CO','O3','NO2','NO','BIOP','HCHO','BIO','latitude','longitude', + 'ETH', 'CARBO','PHO','SO2','SULF','DMS','CH4','XO2','PAN', + 'DEAERM31C','DEAERM32C','DEAERM31R','DEAERM32R', + 'SLTM01','SLTM02','SLTM03','SLTM04','SLTM05','SLTM06','SLTM07','SLTM08'] Dvar_input = {'f1': variables} # Read the variables in the files @@ -47,8 +47,8 @@ Llvl = [0]*nb_subplot ############################################################### Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05) -Lplot=[f['BIOPT'],f['BIOT'],f['COT'],f['HCHOT']] -Ltitle = ['BIOPT','BIOT','COT','HCHOT'] +Lplot=[f['BIOP'],f['BIO'],f['CO'],f['HCHO']] +Ltitle = ['BIOP','BIO','CO','HCHO'] Lminval=[0, 0, 30, 0.001 ] Lmaxval=[15.0, 1000, 110, 1 ] Lstep=[0.25, 20, 2, 0.04 ] @@ -68,8 +68,8 @@ Panel.save_graph(1,fig) ############################################################### Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05) -Lplot=[f['O3T'],f['NO2T'],f['NOT'],f['ETHT']] -Ltitle = ['O3T','NO2T','NOT','ETHT'] +Lplot=[f['O3'],f['NO2'],f['NO'],f['ETH']] +Ltitle = ['O3','NO2','NO','ETH'] Lminval=[15, 0, 30, 125 ] Lmaxval=[25.0, 1000, 1000, 175 ] Lstep=[0.1, 20, 20, 0.25 ] @@ -89,8 +89,8 @@ Panel.save_graph(2,fig) ############################################################### Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05) -Lplot=[f['CARBOT'],f['PHOT'],f['SO2T'],f['SULFT']] -Ltitle = ['CARBOT','PHOT','SO2T','SULFT'] +Lplot=[f['CARBO'],f['PHO'],f['SO2'],f['SULF']] +Ltitle = ['CARBO','PHO','SO2','SULF'] Lminval=[0, 0, 50, 0 ] Lmaxval=[400, 0.7, 1000, 1 ] Lstep=[5, 0.01, 10, 0.01 ] @@ -111,8 +111,8 @@ Panel.save_graph(3,fig) ############################################################### Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05) -Lplot=[f['DMST'],f['CH4T'],f['XO2T'],f['PANT']] -Ltitle = ['DMST','CH4T','XO2T','PANT'] +Lplot=[f['DMS'],f['CH4'],f['XO2'],f['PAN']] +Ltitle = ['DMS','CH4','XO2','PAN'] Lminval=[0, 0, 0.1, 0 ] Lmaxval=[300, 0.1, 0.6, 500 ] Lstep=[2, 0.001, 0.01, 5 ] @@ -132,8 +132,8 @@ Panel.save_graph(4,fig) ############################################################### Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05) -Lplot=[f['DEAERM31CT'],f['DEAERM32CT'],f['DEAERM31RT'],f['DEAERM32RT']] -Ltitle = ['DEAERM31CT','DEAERM32CT','DEAERM31RT','DEAERM32RT'] +Lplot=[f['DEAERM31C'],f['DEAERM32C'],f['DEAERM31R'],f['DEAERM32R']] +Ltitle = ['DEAERM31C','DEAERM32C','DEAERM31R','DEAERM32R'] Lminval=[0, 0, 0, 0 ] Lmaxval=[4, 2, 1, 1 ] Lstep=[0.005, ]*4 @@ -153,8 +153,8 @@ Panel.save_graph(5,fig) ############################################################### Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05) -Lplot=[f['SLTM01T'],f['SLTM02T'],f['SLTM03T'],f['SLTM04T']] -Ltitle = ['SLTM01T','SLTM02T','SLTM03T','SLTM04T'] +Lplot=[f['SLTM01'],f['SLTM02'],f['SLTM03'],f['SLTM04']] +Ltitle = ['SLTM01','SLTM02','SLTM03','SLTM04'] Lminval=[0]*4 Lmaxval=[10]*4 Lstep=[0.01 ]*4 @@ -174,8 +174,8 @@ Panel.save_graph(6,fig) ############################################################### Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05) -Lplot=[f['SLTM05T'],f['SLTM06T'],f['SLTM07T'],f['SLTM08T']] -Ltitle = ['SLTM05T','SLTM06T','SLTM07T','SLTM08T'] +Lplot=[f['SLTM05'],f['SLTM06'],f['SLTM07'],f['SLTM08']] +Ltitle = ['SLTM05','SLTM06','SLTM07','SLTM08'] Lminval=[0 ]*4 Lmaxval=[1 ]*4 Lstep=[0.01 ]*4 diff --git a/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/002_run1/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/002_run1/EXSEG1.nam index 8b315702e..5ce2fc5b5 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/002_run1/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/002_run1/EXSEG1.nam @@ -21,7 +21,7 @@ &NAM_DYN XSEGLEN=3600., LCORIO=T, LNUMDIFU=T / -&NAM_BACKUP XBAK_TIME(1,1)=10.,XBAK_TIME(1,2)=3600.,XBAK_TIME(1,3)=43200.,XBAK_TIME(1,4)=86400./ +&NAM_BACKUP XBAK_TIME(1,1)=30.,XBAK_TIME(1,2)=3600.,XBAK_TIME(1,3)=43200.,XBAK_TIME(1,4)=86400./ &NAM_CONFZ ! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=2 , NB_PROCIO_W=2 / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/004_run2/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/004_run2/EXSEG1.nam index cdc4ed4fe..ffc9a6be9 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/004_run2/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/OCEAN_LES/004_run2/EXSEG1.nam @@ -19,7 +19,7 @@ NMODEL=2, NVERB=10, CEQNSYS='LHE', - CEXP="SPWAN0", + CEXP="SPWAN", CSEG="25m00", LFORCING=F, NHALO=1 / diff --git a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/EXSEG1.nam index 2880d3c4d..df0cba5a2 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/EXSEG1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/EXSEG1.nam @@ -1,4 +1,4 @@ -&NAM_CONFIO LCDF4=T LLFIOUT=T LLFIREAD=T / +&NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F / &NAM_LUNITn CINIFILE = "STERAO_LARGE" / &NAM_DYNn XTSTEP = 2.5, CPRESOPT = "ZRESI", diff --git a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/PRE_IDEA1.nam b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/PRE_IDEA1.nam index 0152e601c..5f33b5fc9 100644 --- a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/PRE_IDEA1.nam +++ b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/PRE_IDEA1.nam @@ -1,4 +1,4 @@ -&NAM_CONFIO LCDF4=T LLFIOUT=T LLFIREAD=T / +&NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F / &NAM_DIMn_PRE NIMAX=160 NJMAX=160 / &NAM_CONF_PRE LCARTESIAN=.TRUE. CIDEAL='RSOU' CZS='FLAT' diff --git a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/run_mesonh index 5480d92c9..9abe8a08d 100755 --- a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/run_mesonh +++ b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/RUN/run_mesonh @@ -34,11 +34,3 @@ mv OUTPUT_LISTING1 OUTPUT_LISTING1_run ls -lrt rm -f file_for_xtransfer pipe_name PRESSURE REMAP* -ls -lrt -mkdir OUTPUT -mv OUTPUT_L* OUTPUT -mkdir LFI -mv *.lfi LFI/. -mv *.des LFI/. - -ja -- GitLab