From f638241ef3846466ca2ff541c0ef541a0a764860 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Mon, 30 Jan 2023 21:17:23 +0000 Subject: [PATCH 1/7] updates for movingnest debug mode --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a3775fc12d..2715fb10da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + url = https://github.com/junwang-noaa/fv3atm + branch = hafs_movingnest + #url = https://github.com/NOAA-EMC/fv3atm + #branch = develop [submodule "WW3"] path = WW3 url = https://github.com/NOAA-EMC/WW3 diff --git a/FV3 b/FV3 index 4506546ba3..77b56d5319 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 4506546ba32d2e1e9d7157e3b29df264efa77ef5 +Subproject commit 77b56d5319191a65a4cbd833549d35f5239cf829 From ee348f97ea3d666208ae018e5e2ec1eaa888bf0e Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Mon, 30 Jan 2023 21:23:02 +0000 Subject: [PATCH 2/7] update fv3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 77b56d5319..694d621488 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 77b56d5319191a65a4cbd833549d35f5239cf829 +Subproject commit 694d621488ad8c3d4a10a81d7a9526260fdd143e From b63622bb0b66c2f303b187707031fc8028ddf0b5 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Mon, 30 Jan 2023 21:25:01 +0000 Subject: [PATCH 3/7] remove print --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 694d621488..048c88afc8 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 694d621488ad8c3d4a10a81d7a9526260fdd143e +Subproject commit 048c88afc8638ad3a969543fad19da14d9f23871 From 79fd4a03509fc35ab598a74b65d1c51e1b984f09 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 31 Jan 2023 02:27:00 +0000 Subject: [PATCH 4/7] add hafs_regional_storm_following_1nest_atm_ocn_debug test --- tests/rt.conf | 3 + ...gional_storm_following_1nest_atm_ocn_debug | 136 ++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug diff --git a/tests/rt.conf b/tests/rt.conf index f676ed8480..832e5f4c17 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -204,6 +204,9 @@ RUN | hafs_regional_storm_following_1nest_atm RUN | hafs_regional_storm_following_1nest_atm_ocn | - jet.intel | fv3 | RUN | hafs_global_storm_following_1nest_atm | - jet.intel | fv3 | +COMPILE | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_thompson_tedmf_gfdlsf -D32BIT=ON -DDEBUG=ON | | fv3 | +RUN | hafs_regional_storm_following_1nest_atm_ocn_debug | - jet.intel | fv3 | + COMPILE | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_thompson_noahmp_nonsst,FV3_HAFS_v1_thompson_noahmp,FV3_HAFS_v1_thompson_nonsst,FV3_HAFS_v1_thompson,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_thompson_tedmf_gfdlsf -D32BIT=ON -DFASTER=ON | | fv3 | RUN | hafs_regional_storm_following_1nest_atm_ocn_wav | - jet.intel | fv3 | diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug new file mode 100644 index 0000000000..ce11d58fc6 --- /dev/null +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug @@ -0,0 +1,136 @@ +############################################################################### +# +# HAFS regional with 1 storm-following moving nest and atmosphere-ocean coupled with HYCOM +# +############################################################################### + +export TEST_DESCR="Compare HAFS regional with 1 storm-following moving nest and atmosphere-ocean coupled results with previous trunk version" + +export CNTL_DIR=hafs_regional_storm_following_1nest_atm_ocn + +export LIST_FILES="atmf001.nc \ + sfcf001.nc \ + atm.nest02.f001.nc \ + sfc.nest02.f001.nc + +export_fv3 +export_hafs +export_hafs_regional + +export HAFS=true +export FHMAX=1 +export RESTART_N=${FHMAX} +export DT_ATMOS=180 +export IDEFLATE=1 +export NFHMAX_HF=-1 +export NFHOUT_HF=1 +export NFHOUT=1 +export OUTPUT_FILE="'netcdf' 'netcdf'" +export SDAY=25 +export SHOUR=12 +export SMONTH=08 +export SYEAR=2020 +export WRTTASK_PER_GROUP=120 + +export OUTPUT_GRID='regional_latlon' +export CEN_LON=-86.3 +export CEN_LAT=23.3 +export LON1=-131.30 +export LAT1=-16.70 +export LON2=-41.30 +export LAT2=63.30 +export DLON=0.25 +export DLAT=0.25 + +export OUTPUT_GRID_2='regional_latlon_moving' +export IMO_2=501 +export JMO_2=501 +export DLON_2=0.1 +export DLAT_2=0.1 + +export BLOCKSIZE=${BLOCKSIZE:-24} +export CCPP_SUITE="FV3_HAFS_v1_gfdlmp_tedmf_nonsst" +export DEFLATE_LEVEL=-1 +export INPES=6 +export JNPES=10 +export NPX=241 +export NPY=241 +export NPZ=64 +export NPZP=$(($NPZ + 1)) +export K_SPLIT=4 +export N_SPLIT=5 +export NWAT=6 +export NA_INIT=1 +export EXTERNAL_IC=.true. +export NGGPS_IC=.true. +export MOUNTAIN=.false. +export WARM_START=.false. +export TARGET_LAT="23.3" +export TARGET_LON="-86.3" +export STRETCH_FAC=1.0001 +export REGIONAL=.true. +export BC_UPDATE_INTERVAL=3 +export NROWS_BLEND=10 +export FULL_ZS_FILTER=.false. +export N_ZS_FILTER=0 + +export GRID_PES="60,60" +export TILE_COARSE="0,1" +export NUM_TILE_TOP=1 +export NEST_REFINE="0,3" +export NEST_IOFFSETS="999,61" +export NEST_JOFFSETS="999,61" +export IS_MOVING_NEST=".false.,.true." +export VORTEX_TRACKER="0,7" +export NTRACK="0,5" +export MOVE_CD_X="0,0" +export MOVE_CD_Y="0,0" + +export INPES_NEST02=6 +export JNPES_NEST02=10 +export NPX_NEST02=361 +export NPY_NEST02=361 +export K_SPLIT_NEST02=4 +export N_SPLIT_NEST02=5 + +export FHCYC=0 +export FHSWR=1800 +export FHLWR=1800 +export NSTF_NAME=0,0,0,0,0 +export CPLFLX=.true. +export CPLOCN2ATM=.true. +export CPLWAV=.false. +export CPLWAV2ATM=.false. +export CPL_IMP_MRG=.true. + +# nems.configure +export med_model=cmeps +export CAP_DBUG_FLAG=0 +export RESTART_N=${FHMAX} +export CPLMODE=hafs +export RUNTYPE=startup +export USE_COLDSTART=false + +export CDEPS_DOCN=false +export OCEAN_START_DTG=43702.50000 + +export atm_model="fv3" +export ocn_model="hycom" + +ATM_compute_tasks=$(( INPES*JNPES + INPES_NEST02*JNPES_NEST02 )) +OCN_tasks=60 + +export atm_omp_num_threads=2 +export med_omp_num_threads=2 +export ocn_omp_num_threads=2 + +export coupling_interval_sec=360 +export MESH_ATM="unset" + +export FIELD_TABLE=field_table_hafs +export DIAG_TABLE=diag_table_hafs_template +export INPUT_NML=input_regional_hafs.nml.IN +export INPUT_NEST02_NML=input_nest_hafs.nml.IN +export MODEL_CONFIGURE="model_configure_hafs.IN" +export NEMS_CONFIGURE="nems.configure.hafs_atm_ocn.IN" +export FV3_RUN="hafs_fv3_run.IN hycom_hat10_run.IN" From dfac422c7c00fabb56621fc6bd2d3a9b7d78ddd2 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 31 Jan 2023 02:32:16 +0000 Subject: [PATCH 5/7] sync fv3 with develop branch --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 048c88afc8..011c218507 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 048c88afc8638ad3a969543fad19da14d9f23871 +Subproject commit 011c2185072be9cd20ceca0261e1c801d3e5ea7a From 5f3dd7c90b64aae0c2f634e894ef8227361f560e Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 31 Jan 2023 13:37:47 +0000 Subject: [PATCH 6/7] fix syntax in the new text --- tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug index ce11d58fc6..2826bfd8de 100644 --- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug +++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug @@ -11,7 +11,7 @@ export CNTL_DIR=hafs_regional_storm_following_1nest_atm_ocn export LIST_FILES="atmf001.nc \ sfcf001.nc \ atm.nest02.f001.nc \ - sfc.nest02.f001.nc + sfc.nest02.f001.nc" export_fv3 export_hafs From 4d9fd7714103d4b310b1f45c1b19b417db85ee2b Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Thu, 9 Feb 2023 19:46:56 +0000 Subject: [PATCH 7/7] update fv3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 011c218507..ffeb762cd2 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 011c2185072be9cd20ceca0261e1c801d3e5ea7a +Subproject commit ffeb762cd25dd56fac9aaa9458a45fa8da733742