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 e9ef6c04c0c96893cfe0a65048f25742c6d4aa21..ca52827171b23f937564d2af02ea0016425de330 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 18de9722998b87caaceb183468c6a54eecf3d1e8..bbc10046c28acc5be300754638a2624458e8d24c 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 5d53acb8163cba6aa84c89f988adcadff7fff983..bcd14fa30a6030f37ef3761209554e7dbcef2009 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 311fc932145d4b54a0cc37a5542ac868a84d0211..d9d630cb724365c84c251a5b52638f92d8940a83 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 bc0e191cb89f5d7552250f0d0274634791926651..841c2a0a3cff2468c289020b324807ce7870bc16 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 558a25ae95ee37beaa1317510b241f58ee1c1c27..b719a6f6158092a3ad5c6a4696a64a5b859b7eb9 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 335dbccbc23366cec50e866ab4948f73dada661b..2c11ac5bf338f9eda47f5ef394d4198145150a3a 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 9647ae355f061dfb015bf82d9ded6fdd8c06cd14..ea3b42a6993428193593e2ef09a49dc399985ed5 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 be130665b1b0ab8689037fcb27fc138b7bdb916f..8d1a7119bb3f19887b4b84297e9d27cedfcf03ac 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 ece1ab2a11787644406a816c21c90e3e90631bb3..d28e42aa3ad6b3942ebad82df9bad905acac4d7d 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 2af81230589a9e197c0e8cb31fd604b4d7a8b1a7..4841130cf185a64961bea2a0c7a16c75cbd851b2 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 eced604aed04f3e00b1d3baae2b6fef281548ca0..150fbdf333446b377f5879d749e6c8e1ae829617 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 ed57939f607fe5e8fb961db2716118db21c2bd2b..7965644e1e35a74c2f48e393f65a42ebf709fb47 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 5a2b15304e013a4bc90024b85f5fb26cde6bc063..4691bb27b11165fe1341b85a9642adffa13b9d52 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 ce1b0c9a3f7ed187667a053f03a6f5dd87e9788d..7346d208fa495d9bb530076d14d3c6098ce3e570 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 db5e7ccccd486471c9f61ac29681d6a364151cbf..1446eb49295de0dce5acff644022b13c2fdd946b 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 df552e4c4688498ed4ade18f41a7b2d2d0f5fc29..181bad42c43954db28492e533c38a6d224ba635e 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 9a29de0ae02becbb179ea0a31549cb323fdfa324..b0991d0de263551e8899614f47d4db7422c36bb6 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 879cba05f6134d056d6a92b6d63e91a9c107e755..e676898c00d7bbc8a3d31fc1ebb571a3efe4c327 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 fa928b841d33b758f3e8d308ae94a12e8219b207..07c4a71ef781cb03956e0d988de09e2ba3b25e0e 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 0e75ba2ff92d0c5602ccdcadc2ace68cc9f3ffcf..a31033bbbd12f7841e7d6e500336b954a921ffb0 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 87e2bc91c2a35f936c3a88f087b19a614627108c..64e45f20572b6c85158f08e6d3229881ba9b774a 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 428b56ef3714877d692dec665e21520ce8db43bd..51eebca032d152a79fdd96e1469d931c532fe476 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 d664ee4eba94a90e33977cea2547d4e30dd044d7..ca4cdf4e8d28d1c35e634aab055835a4a711cd19 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 094b32703bcefa5367c4714f97c70147af62e6ce..d218fb83bfe91b6e6dfd192bbe78d7d801226018 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 97a73f0e4e620125f90c3c359fdccc23a4c2f5e9..1b3fe0f4e5e46d3fd2beef3efa452f1a24aa3d63 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 bafc878a7ce14ebc08836b8b5b80e69f48ebb574..e63e25a8b5c4673031a1743c601104585263b1cf 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 c256717a926e9c7622460600162730c138e4190a..a2647f8bdc14fa4d2b72e8595c14782291162652 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 e301cdf3756c311f1290711e1ff19532271b6a80..34810e8012cb006c5000933d5bcdedbd9b0f64b6 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 106cd4e3117141f4a81a3ce458e382a68460605e..dd94b88551529ec3382efc95ee9f37c61ed0e354 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 c281eb823b3c6d6c3ec1d63861b2192b4e500389..6c7082866717b0824bb5f1c8436ddc46ab57e826 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 f632dfa254d5d2bfd1f3e965e050580187d095e0..ed0e5755abcc40be88f86ba36ea231dc8f69b096 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 4dbd15d23bd20ea0e4707fa1bb4481f68843aaed..47930de1dcf7cf6423d9a9677c121560cff58992 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 a15cfd4248d782bad388539342bf06465976ebd0..8bfd467c6a74162006900ea037e595c87bb83a0c 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 38dc81e54b5acb6dfeb86bf08245e5b34f96f0ae..681ad4332ffca0c6345df791f27604cb31df45f6 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 f9e6ce76b8c6111c6d292cf95d8ca085bf58342b..33399e2fe272e7382d8078136d63fa3120ad98ef 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 f5f29b7aaaec5cdcd0396295b65ac1a581728762..a53feb2eb0ade420eb39079e4b4e6d307bb179ba 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 7958e74d559fbf0934d11131e5b49ef4b63006e5..9b7be713ced70c1fb3144fefd3f5dbd7ac36d94f 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 2702c920e7f757f8cb494342c38671ab7a3d3dd2..bef88656bb0fc584dfab3832e6db8ecb1ff5ecdb 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 ffbf4d2bf8370b1befa31ada419144164578e69e..33399e2fe272e7382d8078136d63fa3120ad98ef 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 4817a68c9e40e6044f2a5f219f54dd3c27e9721c..259407d11db5612a8fb783dce963bb0fa7c8c486 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 988448ef5616b3d1c30131f9ddadcba435d64ad4..33399e2fe272e7382d8078136d63fa3120ad98ef 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 341bd488726899ebadcd67a758a289989bab2de2..7407efcd53ba1e3da3f8e0bf67f66a0d714f2918 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 dacb1fd2509584e9d8f599dbdb0e82e9e7831562..b6cfefbdd6239e7eda48239e4c6912c4d15b7cad 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 af1823f4e3d1ff5cc9e5fa7d375ad8792bb92c33..017e22c8d57a195abfa09ff1ca91279bfa671e4e 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 8b315702eba615673f20875167280c944b8751d0..5ce2fc5b56c3a07113427b8d00b913d68b004acf 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 cdc4ed4fe53df1ecc1b53c18b969c411d5b3a111..ffc9a6be980fcd00032448ed2872412d34653c7f 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 2880d3c4d81128148b44294fb55445472c23afe6..df0cba5a26ba67da02bcc962abb46489646580a2 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 0152e601c81a2954d2a6b9a4d23bb8a2f01c0d1c..5f33b5fc96027d708937bf03a0c21b256422461a 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 5480d92c98402c08d998ad6b7d921871ba304e9e..9abe8a08df30b4c70fc10b2d356bd3a187b90bf1 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