From 483442e2f33e8c6620de7bc7cea1b05dc55a22a9 Mon Sep 17 00:00:00 2001 From: Juan Escobar <escj@aero.obs-mip.fr> Date: Wed, 30 Jan 2019 17:30:08 +0100 Subject: [PATCH] Juan 30/01/2018: Minor modification to test IOZ by uncommenting NAM_CONFZ lines in namelist files --- MY_RUN/KTEST/002_3Drelief/002_mesonh/run_mesonh_xyz | 2 +- MY_RUN/KTEST/003_KW78/002_mesonh/run_mesonh_xyz | 2 +- MY_RUN/KTEST/003_KW78/006_diag/run_diag_xyz | 2 +- MY_RUN/KTEST/004_Reunion/001_prep_pgd/PRE_PGD1.nam | 2 +- MY_RUN/KTEST/004_Reunion/002_prep_ideal_case/PRE_IDEA1.nam | 2 +- MY_RUN/KTEST/004_Reunion/003_mesonh/run_mesonh_xyz | 2 +- MY_RUN/KTEST/007_16janvier/004_arp2lfi/PRE_REAL1.nam | 2 +- MY_RUN/KTEST/007_16janvier/005_spa_mod1_mod2/SPAWN1.nam | 4 ++++ MY_RUN/KTEST/007_16janvier/006_preal/PRE_REAL1.nam | 3 +++ MY_RUN/KTEST/007_16janvier/006_preal/run_preal_xyz | 4 ++-- MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src | 2 +- MY_RUN/KTEST/007_16janvier/008_run2/run_mesonh_xyz | 4 ++-- 12 files changed, 19 insertions(+), 12 deletions(-) diff --git a/MY_RUN/KTEST/002_3Drelief/002_mesonh/run_mesonh_xyz b/MY_RUN/KTEST/002_3Drelief/002_mesonh/run_mesonh_xyz index 88fee2ebc..97878c3aa 100755 --- a/MY_RUN/KTEST/002_3Drelief/002_mesonh/run_mesonh_xyz +++ b/MY_RUN/KTEST/002_3Drelief/002_mesonh/run_mesonh_xyz @@ -4,6 +4,6 @@ #MNH_LIC for details. version 1. set -x set -e -ln -fs ../001_prep_ideal_case/RELIEF3D.{des,lfi,nc} . +ln -fs ../001_prep_ideal_case/RELIEF3D*.{des,lfi,nc} . rm -f REL3D.1* OUT* time ${MPIRUN} MESONH${XYZ} diff --git a/MY_RUN/KTEST/003_KW78/002_mesonh/run_mesonh_xyz b/MY_RUN/KTEST/003_KW78/002_mesonh/run_mesonh_xyz index cfee5d165..e86549305 100755 --- a/MY_RUN/KTEST/003_KW78/002_mesonh/run_mesonh_xyz +++ b/MY_RUN/KTEST/003_KW78/002_mesonh/run_mesonh_xyz @@ -4,6 +4,6 @@ #MNH_LIC for details. version 1. set -x set -e -ln -fs ../001_prep_ideal_case/KWRAIN.{des,lfi,nc} . +ln -fs ../001_prep_ideal_case/KWRAIN*.{des,lfi,nc} . rm -f KWRAI.1.* OUT* time ${MPIRUN} MESONH${XYZ} diff --git a/MY_RUN/KTEST/003_KW78/006_diag/run_diag_xyz b/MY_RUN/KTEST/003_KW78/006_diag/run_diag_xyz index 99484f493..dae2b32d9 100755 --- a/MY_RUN/KTEST/003_KW78/006_diag/run_diag_xyz +++ b/MY_RUN/KTEST/003_KW78/006_diag/run_diag_xyz @@ -9,7 +9,7 @@ rm -f KWRAI* OUT* # # ln -sf ../002_mesonh/KWRAI.1.SEG01.004.des . -ln -sf ../002_mesonh/KWRAI.1.SEG01.004.nc . +ln -sf ../002_mesonh/KWRAI.1.SEG01.004.*nc . time ${MPIRUN} DIAG${XYZ} diff --git a/MY_RUN/KTEST/004_Reunion/001_prep_pgd/PRE_PGD1.nam b/MY_RUN/KTEST/004_Reunion/001_prep_pgd/PRE_PGD1.nam index a44162511..8c6897877 100644 --- a/MY_RUN/KTEST/004_Reunion/001_prep_pgd/PRE_PGD1.nam +++ b/MY_RUN/KTEST/004_Reunion/001_prep_pgd/PRE_PGD1.nam @@ -3,7 +3,7 @@ !JPHEXT = 3 , NHALO_MNH = 3 / &NAM_CONFZ - ! NZ_VERB=5 , NB_PROCIO_W=8 + !NZ_VERB=5 , NB_PROCIO_W=1 / &NAM_PGDFILE CPGDFILE='REUNION_PGD_1km5' / &NAM_CONF_PROJ diff --git a/MY_RUN/KTEST/004_Reunion/002_prep_ideal_case/PRE_IDEA1.nam b/MY_RUN/KTEST/004_Reunion/002_prep_ideal_case/PRE_IDEA1.nam index a30e8bbc6..76198aa8a 100644 --- a/MY_RUN/KTEST/004_Reunion/002_prep_ideal_case/PRE_IDEA1.nam +++ b/MY_RUN/KTEST/004_Reunion/002_prep_ideal_case/PRE_IDEA1.nam @@ -1,6 +1,6 @@ &NAM_CONFIO LCDF4=T, LLFIOUT=T, LLFIREAD=F / &NAM_CONFZ - ! NZ_VERB=5 , NB_PROCIO_R=8 , NB_PROCIO_W=8 + !NZ_VERB=5 , NB_PROCIO_R=1 , NB_PROCIO_W=8 / &NAM_REAL_PGD CPGD_FILE = 'REUNION_PGD_1km5', LREAD_ZS= T, LREAD_GROUND_PARAM= T / diff --git a/MY_RUN/KTEST/004_Reunion/003_mesonh/run_mesonh_xyz b/MY_RUN/KTEST/004_Reunion/003_mesonh/run_mesonh_xyz index 20bd41ff7..ce9bd3dc3 100755 --- a/MY_RUN/KTEST/004_Reunion/003_mesonh/run_mesonh_xyz +++ b/MY_RUN/KTEST/004_Reunion/003_mesonh/run_mesonh_xyz @@ -6,7 +6,7 @@ set -x set -e -ln -fs ../002_prep_ideal_case/REUNION_IDEA.{des,lfi,nc} . +ln -fs ../002_prep_ideal_case/REUNION_IDEA*.{des,lfi,nc} . ln -sf ../001_prep_pgd/REUNION_PGD_1km5.{des,lfi,nc} . if [ "x${MNH_ECRAD}" != "x" ] ; then diff --git a/MY_RUN/KTEST/007_16janvier/004_arp2lfi/PRE_REAL1.nam b/MY_RUN/KTEST/007_16janvier/004_arp2lfi/PRE_REAL1.nam index 681314cdd..48e51ec56 100644 --- a/MY_RUN/KTEST/007_16janvier/004_arp2lfi/PRE_REAL1.nam +++ b/MY_RUN/KTEST/007_16janvier/004_arp2lfi/PRE_REAL1.nam @@ -1,6 +1,6 @@ &NAM_CONFIO LCDF4=T, LLFIOUT=T, LLFIREAD=F / &NAM_CONFZ - ! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=1 + !NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=8 / &NAM_REAL_CONF NVERB=5 , CPRESOPT='ZRESI' !JPHEXT=3 , NHALO=3 diff --git a/MY_RUN/KTEST/007_16janvier/005_spa_mod1_mod2/SPAWN1.nam b/MY_RUN/KTEST/007_16janvier/005_spa_mod1_mod2/SPAWN1.nam index fe0169861..379402143 100644 --- a/MY_RUN/KTEST/007_16janvier/005_spa_mod1_mod2/SPAWN1.nam +++ b/MY_RUN/KTEST/007_16janvier/005_spa_mod1_mod2/SPAWN1.nam @@ -1,4 +1,8 @@ &NAM_CONFIO LCDF4=T, LLFIOUT=T, LLFIREAD=F / +&NAM_CONFZ + !NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=8 , NB_PROCIO_W=8 +/ + &NAM_LUNIT2_SPA CINIFILE = "16JAN_06_MNH", CINIFILEPGD="16JAN98_36km.neste1", YDOMAIN = "16JAN98_9km.neste1", diff --git a/MY_RUN/KTEST/007_16janvier/006_preal/PRE_REAL1.nam b/MY_RUN/KTEST/007_16janvier/006_preal/PRE_REAL1.nam index 963196cc0..25d4ccf12 100644 --- a/MY_RUN/KTEST/007_16janvier/006_preal/PRE_REAL1.nam +++ b/MY_RUN/KTEST/007_16janvier/006_preal/PRE_REAL1.nam @@ -1,4 +1,7 @@ &NAM_CONFIO LCDF4=T, LLFIOUT=T, LLFIREAD=F / +&NAM_CONFZ + !NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=8 , NB_PROCIO_W=8 +/ &NAM_FILE_NAMES HATMFILE ='16JAN_06_MNH.spa04' , HATMFILETYPE='MESONH', HPGDFILE ='16JAN98_9km.neste1' , CINIFILE='16JAN_06_MNH2' / &NAM_REAL_CONF NVERB=5 diff --git a/MY_RUN/KTEST/007_16janvier/006_preal/run_preal_xyz b/MY_RUN/KTEST/007_16janvier/006_preal/run_preal_xyz index 56c362fd8..0c88f2ff3 100755 --- a/MY_RUN/KTEST/007_16janvier/006_preal/run_preal_xyz +++ b/MY_RUN/KTEST/007_16janvier/006_preal/run_preal_xyz @@ -8,8 +8,8 @@ set -e rm -f 16JAN* OUTPUT_LISTING* pipe* *.tex ln -sf ../003_nest/16JAN98_9km.neste1.{des,lfi,nc} . ln -sf ../003_nest/16JAN98_36km.neste1.{des,lfi,nc} . -ln -sf ../004_arp2lfi/16JAN_06_MNH.{des,lfi,nc} . -ln -sf ../005_spa_mod1_mod2/16JAN_06_MNH.spa04.{des,lfi,nc} . +ln -sf ../004_arp2lfi/16JAN_06_MNH*.{des,lfi,nc} . +ln -sf ../005_spa_mod1_mod2/16JAN_06_MNH.spa04*.{des,lfi,nc} . #exit time ${MPIRUN} PREP_REAL_CASE${XYZ} #ddd --directory=~/DEV/MNH.V4.6.2/src/dir_obj_bug2 PREP_REAL_CASE diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src index 43a028c9c..7040ceed9 100644 --- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src +++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src @@ -2,7 +2,7 @@ ! , NIO_VERB=5, NGEN_VERB=5 / &NAM_CONFZ - ! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=8 + !NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=8 , NB_PROCIO_W=8 / &NAM_LUNITn CINIFILE = "16JAN_06_MNH",CINIFILEPGD="16JAN98_36km.neste1" / &NAM_DYNn XTSTEP = 60., diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/run_mesonh_xyz b/MY_RUN/KTEST/007_16janvier/008_run2/run_mesonh_xyz index 056e03e5d..654ba1e18 100755 --- a/MY_RUN/KTEST/007_16janvier/008_run2/run_mesonh_xyz +++ b/MY_RUN/KTEST/007_16janvier/008_run2/run_mesonh_xyz @@ -8,8 +8,8 @@ set -e rm -f 16JAN* OUT* EXSEG?.nam -ln -sf ../004_arp2lfi/16JAN_06_MNH.{des,lfi,nc} . -ln -sf ../006_preal/16JAN_06_MNH2.{des,lfi,nc} . +ln -sf ../004_arp2lfi/16JAN_06_MNH*.{des,lfi,nc} . +ln -sf ../006_preal/16JAN_06_MNH2*.{des,lfi,nc} . ln -sf ../003_nest/16JAN98_36km.neste1.{des,lfi,nc} . ln -sf ../003_nest/16JAN98_9km.neste1.{des,lfi,nc} . -- GitLab