From 05a64484f1403529456441da8a40dcc736b0abcd Mon Sep 17 00:00:00 2001 From: Wen Chen Date: Wed, 11 Mar 2026 12:40:52 -0400 Subject: [PATCH 1/4] Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere into var_g --- UFSATM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UFSATM b/UFSATM index 939d1ddee2..521626cdd2 160000 --- a/UFSATM +++ b/UFSATM @@ -1 +1 @@ -Subproject commit 939d1ddee2b833a557459cca002989b20411c70b +Subproject commit 521626cdd2db449125e49889c0f432219b5ac002 From d78c966dbe3f51fdafbd19d27edb62007988f881 Mon Sep 17 00:00:00 2001 From: Wen Chen Date: Mon, 30 Mar 2026 14:00:58 -0400 Subject: [PATCH 2/4] remove bug --- .gitmodules | 4 ++-- UFSATM | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index b881f89393..957ebaa6a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "UFSATM"] path = UFSATM - url = https://github.com/NOAA-EMC/ufsatm - branch = develop + url = https://github.com/WChen-NOAA/ufsatm + branch = var_g [submodule "WW3"] path = WW3 url = https://github.com/NOAA-EMC/WW3 diff --git a/UFSATM b/UFSATM index 521626cdd2..fda5bd12d4 160000 --- a/UFSATM +++ b/UFSATM @@ -1 +1 @@ -Subproject commit 521626cdd2db449125e49889c0f432219b5ac002 +Subproject commit fda5bd12d4bbad4da8cbf1099c5ff05aa8a364f2 From e19633845b3ee8ac2e0dd4459b72b143c7755c11 Mon Sep 17 00:00:00 2001 From: Wen Chen Date: Mon, 30 Mar 2026 19:15:59 -0400 Subject: [PATCH 3/4] add options for variable gravity in namelist --- tests/parm/global_control.nml.IN | 1 + tests/parm/wam_v17.nml.IN | 7 ++++--- tests/tests/control_wam | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/parm/global_control.nml.IN b/tests/parm/global_control.nml.IN index a23bfbd770..45fc2b6308 100644 --- a/tests/parm/global_control.nml.IN +++ b/tests/parm/global_control.nml.IN @@ -92,6 +92,7 @@ no_dycore = @[NO_DYCORE] z_tracer = .true. agrid_vel_rst = .true. + var_grav = .false. read_increment = @[READ_INCREMENT] res_latlon_dynamics = @[RES_LATLON_DYNAMICS] ignore_rst_cksum = @[ATM_IGNORE_RST_CKSUM] diff --git a/tests/parm/wam_v17.nml.IN b/tests/parm/wam_v17.nml.IN index f80f0feaa1..4d316c4246 100644 --- a/tests/parm/wam_v17.nml.IN +++ b/tests/parm/wam_v17.nml.IN @@ -28,7 +28,7 @@ ntiles = 6 npz = @[NPZ] dz_min = @[DZ_MIN] - ncnst = 12 + ncnst = 13 psm_bc = @[PSM_BC] grid_type = -1 make_nh = @[MAKE_NH] @@ -90,6 +90,7 @@ no_dycore = .false. z_tracer = @[Z_TRACER] inline_q = @[INLINE_Q] + var_grav = .false. agrid_vel_rst = .false. read_increment = @[READ_INCREMENT] res_latlon_dynamics = "fv3_increment.nc" @@ -107,8 +108,8 @@ &gfs_physics_nml fhzero = @[FHZERO] h2o_phys = .true. - ldiag3d = .true. - qdiag3d = .true. + ldiag3d = .false. + qdiag3d = .false. print_diff_pgr= .false. fhcyc = @[FHCYC] use_ufo = .true. diff --git a/tests/tests/control_wam b/tests/tests/control_wam index c57d8e7234..5f99240abd 100644 --- a/tests/tests/control_wam +++ b/tests/tests/control_wam @@ -25,7 +25,7 @@ export FHMAX=24 export OUTPUT_GRID='gaussian_grid' export FHROT=0 export OUTPUT_FH='24 -1' - +export RESTART_INTERVAL='12 -1' #WAM settings export TAU=1.0 export D2_BG_K1=0.0 From af2fbd5a600580a6fa771560af95922a4994f7c5 Mon Sep 17 00:00:00 2001 From: Wen Chen Date: Mon, 30 Mar 2026 19:23:31 -0400 Subject: [PATCH 4/4] change submodule point address --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 957ebaa6a4..3d938e62b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "UFSATM"] path = UFSATM - url = https://github.com/WChen-NOAA/ufsatm + url = https://github.com/WChen-NOAA/fv3atm branch = var_g [submodule "WW3"] path = WW3