From a58332d36b91ce3ae0b2a0509064e5be09780c27 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 18 Mar 2024 14:51:55 +0000 Subject: [PATCH 01/31] GFDLv3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 21744e21f2..cbdf74c11d 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 21744e21f2b05c4e327d17ce4d088611403eab7a +Subproject commit cbdf74c11d37cd2d88ca62677a331b3a7939a815 From 79ee4756bd0e0638fbf0794db1b0572fed7c2954 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 19 Mar 2024 04:28:34 +0000 Subject: [PATCH 02/31] refactor gfdlmp. work in progress --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0934d97f95..3cb2e52b93 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0934d97f95a5e34ce6d22b27a7c78ca23b241f20 +Subproject commit 3cb2e52b9344b440a1e8c58f379a46a52fa50b2d From 1a715cafd7267b7d3fbe5411b64414a8fa4ed7f0 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 20 Mar 2024 21:57:34 +0000 Subject: [PATCH 03/31] Update physics --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 3cb2e52b93..32d7d52049 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 3cb2e52b9344b440a1e8c58f379a46a52fa50b2d +Subproject commit 32d7d52049b61c4676198eebf780a31ae02769ea From 8957f789f2425c325ebbbe274b386ab6a3939930 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 20 Mar 2024 22:19:10 +0000 Subject: [PATCH 04/31] Update physics --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 32d7d52049..7b110d7639 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 32d7d52049b61c4676198eebf780a31ae02769ea +Subproject commit 7b110d76390a038b21fd98a99e818912569e097b From 3462b3580ff887e3579dd9d5decac4587b8832ad Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 3 Apr 2024 19:39:02 +0000 Subject: [PATCH 05/31] Synced FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 70782b3e9c..58e33c8ba6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 70782b3e9cb36c99e55717d01fd3c04d649f83cd +Subproject commit 58e33c8ba643ac908baddd7b472cacea1ad3bfbf From f28227d22d74d54be26c3cd42e868321cd83459c Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 3 Apr 2024 20:04:52 +0000 Subject: [PATCH 06/31] Additional cleanup --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 58e33c8ba6..6b5ec4863e 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 58e33c8ba643ac908baddd7b472cacea1ad3bfbf +Subproject commit 6b5ec4863e13cf74b36ac2eb9bef0f62616adb98 From bb519f04d68c9f034086c1332c4707dd594197df Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 3 Apr 2024 20:41:54 +0000 Subject: [PATCH 07/31] Reverted some changes in physics --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 6b5ec4863e..10130419b1 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 6b5ec4863e13cf74b36ac2eb9bef0f62616adb98 +Subproject commit 10130419b1f96ca38102bce7ad2b198fe6b60041 From f3cfd8537a44f1ee3db84b4561e89cc1a4e664d2 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 11 Apr 2024 16:02:44 +0000 Subject: [PATCH 08/31] Updated FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 10130419b1..3ef708d81c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 10130419b1f96ca38102bce7ad2b198fe6b60041 +Subproject commit 3ef708d81c371fed1c31b6eb45bb6cafce0efce4 From 6a358a2696af95ac66a838ee9cc3fdde253010f8 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 12 Apr 2024 16:37:12 +0000 Subject: [PATCH 09/31] Some housekeeping in FV3/physics --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 3ef708d81c..14ba97186f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 3ef708d81c371fed1c31b6eb45bb6cafce0efce4 +Subproject commit 14ba97186fc2397420e8949e022bc23013cddcdc From 66f9478edaa5358ec3b2e529ec54b326f8562738 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 12 Apr 2024 16:42:53 +0000 Subject: [PATCH 10/31] Revert some changes in FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 14ba97186f..02cd74fed5 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 14ba97186fc2397420e8949e022bc23013cddcdc +Subproject commit 02cd74fed5db82d3ac738e6bc1bf916d451d8129 From 1e0fd023527a9fbc36210ef6a45da9af67be5498 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 12 Apr 2024 16:44:19 +0000 Subject: [PATCH 11/31] Update submodules in FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 02cd74fed5..62be093cbf 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 02cd74fed5db82d3ac738e6bc1bf916d451d8129 +Subproject commit 62be093cbf1038daa09760f58f05c31f8e27b92c From 12ec9bf13fd30a061e4098cdba5fba724d472b26 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 12 Apr 2024 19:18:57 +0000 Subject: [PATCH 12/31] Some more changes --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 62be093cbf..bf9efa404f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 62be093cbf1038daa09760f58f05c31f8e27b92c +Subproject commit bf9efa404f055e2ba3d8595066294a555daa9881 From 5e8116ea41c3ae94fd9112bc9764ee4534d84898 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 12 Apr 2024 21:45:07 +0000 Subject: [PATCH 13/31] Some reorg --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index bf9efa404f..e2ea42719e 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit bf9efa404f055e2ba3d8595066294a555daa9881 +Subproject commit e2ea42719e4c2c4492e2ff6306aa65d93e68c2a7 From 4b6c81d69bbba8185e81382fcb75bf2d5dc0f83b Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 22 Apr 2024 18:09:31 +0000 Subject: [PATCH 14/31] Some more cleanup. Nearly done --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index e2ea42719e..d766a64104 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit e2ea42719e4c2c4492e2ff6306aa65d93e68c2a7 +Subproject commit d766a641041a4d50b1c82fac1f5bb251f31b674c From 7f75fa52f9c670ece37da68c9c74bd35fffc93d7 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 23 May 2024 14:26:28 +0000 Subject: [PATCH 15/31] Move gfdlmp init call to fv_sat_adj init(). --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index d766a64104..0bf96985e6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit d766a641041a4d50b1c82fac1f5bb251f31b674c +Subproject commit 0bf96985e623d7b333e48d2ceab1fd72b6283f8c From 4333760f54474343bce73fc5d7395bf8e68bee44 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 26 Aug 2024 15:35:45 +0000 Subject: [PATCH 16/31] Some more changes. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0bf96985e6..2c3ef02545 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0bf96985e623d7b333e48d2ceab1fd72b6283f8c +Subproject commit 2c3ef025457661cfc2e1da971ef85c15d69427e5 From 34f137e65d560b4fa8ecb4e5cb9d52f9fdaf8d7d Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 22 Oct 2024 14:58:06 +0000 Subject: [PATCH 17/31] Some mroe changes --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 2c3ef02545..cdca580a92 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 2c3ef025457661cfc2e1da971ef85c15d69427e5 +Subproject commit cdca580a92cc9955a64d2c3d29b55491e411c1e3 From 25cdbc6d0c0d74a895fdd12ec88dd6927dfbba40 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 22 Oct 2024 15:24:03 +0000 Subject: [PATCH 18/31] Update GFDLMPV3 based SDFs --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index cdca580a92..d2cf08a15c 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit cdca580a92cc9955a64d2c3d29b55491e411c1e3 +Subproject commit d2cf08a15ce68b66c1b0bc6e1d4c66b89b4fa855 From 4ad0eb8eb6bf79f19df1b7f25473f0a206634697 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 7 Nov 2024 20:38:32 +0000 Subject: [PATCH 19/31] Updated FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index d2cf08a15c..a7d4c3a959 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit d2cf08a15ce68b66c1b0bc6e1d4c66b89b4fa855 +Subproject commit a7d4c3a959f79c649d3f4f30af232240fe02a778 From f4b966969cb587011ec1358be45daec7118091c7 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 13 Nov 2024 17:24:38 +0000 Subject: [PATCH 20/31] Update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index a7d4c3a959..cf0c776624 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit a7d4c3a959f79c649d3f4f30af232240fe02a778 +Subproject commit cf0c7766248b8d02c12773500635ed54fe691a5c From f24f41fa5df99b660ccaf7e2d4e906f9d27bec64 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 13 Nov 2024 17:26:21 +0000 Subject: [PATCH 21/31] Updated FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index cf0c776624..c2e0978fcd 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit cf0c7766248b8d02c12773500635ed54fe691a5c +Subproject commit c2e0978fcd312b16167752c95ccadb5c0b1e1206 From dccf622460657ac27ced4a59cf4f0b92d4c8d6ec Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 18 Nov 2024 17:46:30 +0000 Subject: [PATCH 22/31] Updated FV3/ccpp --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index c2e0978fcd..0f7d5e0f02 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit c2e0978fcd312b16167752c95ccadb5c0b1e1206 +Subproject commit 0f7d5e0f02688dc47a3d3d83f9d04a901d7b54f5 From f97fb277574e53966ed2b6cc3bce45194184849c Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 18 Nov 2024 18:11:23 +0000 Subject: [PATCH 23/31] Added GFDLMPV3 Regression tests --- tests/rt.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/rt.conf b/tests/rt.conf index bc6d089904..640c4895d8 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -91,7 +91,7 @@ COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_couple RUN | cpld_debug_pdlib_p8 | - noaacloud | baseline | ### ATM tests ### -COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON | | fv3 | +COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1,FV3_GFS_v16_gfdlmpv3 -D32BIT=ON | | fv3 | RUN | control_flake | | baseline | RUN | control_CubedSphereGrid | | baseline | RUN | control_CubedSphereGrid_parallel | - noaacloud | baseline | @@ -106,6 +106,7 @@ RUN | control_stochy | RUN | control_stochy_restart | - noaacloud | | control_stochy RUN | control_lndp | | baseline | RUN | control_iovr4 | | baseline | +RUN | control_iovr4_gfdlmpv3 | | baseline | RUN | control_iovr5 | | baseline | RUN | control_p8 | - noaacloud | baseline | RUN | control_p8.v2.sfc | - noaacloud | baseline | @@ -230,8 +231,9 @@ COMPILE | rrfs_dyn64_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_H RUN | rap_control_dyn64_phy32_debug | - noaacloud | baseline | ### HAFS tests ### -COMPILE | hafsw | intel | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_thompson_tedmf_gfdlsf,FV3_global_nest_v1 -D32BIT=ON | | fv3 | +COMPILE | hafsw | intel | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_thompson_tedmf_gfdlsf,FV3_global_nest_v1,FV3_HAFS_v1_gfdlmpv3_tedmf -D32BIT=ON | | fv3 | RUN | hafs_regional_atm | | baseline | +RUN | hafs_regional_atm_gfdlmpv3 | | baseline | RUN | hafs_regional_atm_thompson_gfdlsf | | baseline | RUN | hafs_regional_atm_ocn | | baseline | RUN | hafs_regional_atm_wav | | baseline | From d5f5bb3eacd20dee5e2e82bfc9f5165805285ba3 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 18 Nov 2024 20:14:10 +0000 Subject: [PATCH 24/31] Updated physics --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0f7d5e0f02..7c46b87f12 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0f7d5e0f02688dc47a3d3d83f9d04a901d7b54f5 +Subproject commit 7c46b87f12fe89c729bce6433bf051be242f2ca9 From ba698394c76778c9dc048acb5769f841b12f2efa Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 18 Nov 2024 20:19:29 +0000 Subject: [PATCH 25/31] Add new RTs fro GFDLMPV3 --- tests/parm/control_gfdlmpv3.nml.IN | 318 ++++++++++++++ .../parm/input_regional_hafs_gfdlmpv3.nml.IN | 393 ++++++++++++++++++ tests/tests/control_iovr4_gfdlmpv3 | 43 ++ tests/tests/hafs_regional_atm_gfdlmpv3 | 99 +++++ 4 files changed, 853 insertions(+) create mode 100644 tests/parm/control_gfdlmpv3.nml.IN create mode 100644 tests/parm/input_regional_hafs_gfdlmpv3.nml.IN create mode 100644 tests/tests/control_iovr4_gfdlmpv3 create mode 100644 tests/tests/hafs_regional_atm_gfdlmpv3 diff --git a/tests/parm/control_gfdlmpv3.nml.IN b/tests/parm/control_gfdlmpv3.nml.IN new file mode 100644 index 0000000000..8ff6b59287 --- /dev/null +++ b/tests/parm/control_gfdlmpv3.nml.IN @@ -0,0 +1,318 @@ +&atmos_model_nml + blocksize = 32 + chksum_debug = .false. + dycore_only = .false. + ccpp_suite = '@[CCPP_SUITE]' +/ + +&diag_manager_nml + prepend_date = .false. + max_output_fields = @[MAX_OUTPUT_FIELDS] +/ + +&fms_nml + clock_grain = 'ROUTINE' + domains_stack_size = 3000000 + print_memory_usage = .false. +/ + +&fms2_io_nml + netcdf_default_format = "netcdf4" +/ + +&fv_core_nml + layout = @[INPES],@[JNPES] + io_layout = 1,1 + npx = @[NPX] + npy = @[NPY] + ntiles = 6 + npz = @[NPZ] + grid_type = -1 + make_nh = @[MAKE_NH] + fv_debug = .false. + range_warn = .false. + reset_eta = .false. + n_sponge = 42 + nudge_qv = .true. + nudge_dz = .false. + tau = 10. + rf_cutoff = 7.5e2 + d2_bg_k1 = 0.20 + d2_bg_k2 = 0.0 + kord_tm = -9 + kord_mt = 9 + kord_wz = 9 + kord_tr = 9 + hydrostatic = .false. + phys_hydrostatic = .false. + use_hydro_pressure = .false. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 2 + n_split = 6 + nwat = 6 + na_init = @[NA_INIT] + d_ext = 0. + dnats = @[DNATS] + fv_sg_adj = 450 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.12 + vtdm4 = 0.02 + delt_max = 0.002 + ke_bg = 0. + do_vort_damp = .true. + external_ic = @[EXTERNAL_IC] + external_eta = .true. + gfs_phil = .false. + nggps_ic = @[NGGPS_IC] + mountain = @[MOUNTAIN] + ncep_ic = .false. + d_con = 1. + hord_mt = 5 + hord_vt = 5 + hord_tm = 5 + hord_dp = -5 + hord_tr = 8 + adjust_dry_mass = .false. + consv_te = 1. + do_sat_adj = .true. + consv_am = .false. + fill = .true. + dwind_2d = .false. + print_freq = 6 + warm_start = @[WARM_START] + no_dycore = .false. + z_tracer = .true. + agrid_vel_rst = .true. + read_increment = @[READ_INCREMENT] + res_latlon_dynamics = @[RES_LATLON_DYNAMICS] + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] +/ + +&external_ic_nml + filtered_terrain = .true. + levp = @[NPZP] + gfs_dwinds = .true. + checker_tr = .false. + nt_checker = 0 +/ + +&gfs_physics_nml + fhzero = @[FHZERO] + h2o_phys = .true. + ldiag3d = @[LDIAG3D] + qdiag3d = @[QDIAG3D] + print_diff_pgr = @[PRINT_DIFF_PGR] + fhcyc = @[FHCYC] + use_ufo = .true. + pre_rad = .false. + imp_physics = 11 + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = 1 + iems = 1 + iaer = @[IAER] + icliq_sw = 2 + iovr = @[IOVR] + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .true. + shal_cnv = .true. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .false. + satmedmf = .true. + isatmedmf = 1 + lheatstrg = @[LHEATSTRG] + lseaspray = @[LSEASPRAY] + random_clds = @[RANDOM_CLDS] + trans_trac = .true. + cnvcld = @[CNVCLD] + imfshalcnv = @[IMFSHALCNV] + imfdeepcnv = @[IMFDEEPCNV] + ras = @[RAS] + cdmbgwd = @[CDMBWD] + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + lsoil = 4 + lsm = 1 + iopt_dveg = 1 + iopt_crs = 1 + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = 1 + iopt_alb = 2 + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = 1 + iopt_trs = 2 + iopt_diag = 2 + debug = .false. + oz_phys = .false. + oz_phys_2015 = .true. + nstf_name = 2,0,0,0,0 + nst_anl = .true. + psautco = 0.0008,0.0005 + prautco = 0.00015,0.00015 + lgfdlmprad = .true. + cplchm = @[CPLCHM] + cplwav = @[CPLWAV] + cplwav2atm = @[CPLWAV2ATM] + effr_in = .true. + ldiag_ugwp = .false. + do_ugwp = .false. + do_tofd = .true. + do_sppt = @[DO_SPPT] + do_shum = @[DO_SHUM] + do_skeb = @[DO_SKEB] + lndp_type = @[LNDP_TYPE] + n_var_lndp = @[N_VAR_LNDP] + fscav_aero = @[FSCAV_AERO] + do_RRTMGP = @[DO_RRTMGP] + active_gases = 'h2o_co2_o3_n2o_ch4_o2' + ngases = 6 + lw_file_gas = 'rrtmgp-data-lw-g128-210809.nc' + lw_file_clouds = 'rrtmgp-cloud-optics-coeffs-lw.nc' + sw_file_gas = 'rrtmgp-data-sw-g112-210809.nc' + sw_file_clouds = 'rrtmgp-cloud-optics-coeffs-sw.nc' + rrtmgp_nGptsSW = 112 + rrtmgp_nGptsLW = 128 + rrtmgp_nBandsLW = 16 + rrtmgp_nBandsSW = 14 + rrtmgp_lw_phys_blksz = 16 + doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT] + doGP_lwscat = @[DOGP_LWSCAT] + progsigma = @[PROGSIGMA] +/ + +&gfdl_cloud_microphysics_v3_nml + tau_imlt = 1200. + rthresh = 20.0e-6 + c_psaci = 0.05 + c_pgacs = 0.01 + vi_max = 1.0 + vs_max = 2.0 + vg_max = 12.0 + rewmax = 15.0 + rermin = 16.0 + regmin = 150.0 + z_slope_ice = .true + do_sedi_w = .true. + fix_negative = .true. + reiflag = 5 +/ + +&interpolator_nml + interp_method = 'conserve_great_circle' +/ + +&namsfc + FNGLAC = 'global_glacier.2x2.grb' + FNMXIC = 'global_maxice.2x2.grb' + FNTSFC = 'RTGSST.1982.2012.monthly.clim.grb' + FNSNOC = 'global_snoclim.1.875.grb' + FNZORC = 'igbp' + FNALBC = @[FNALBC] + FNALBC2 = 'global_albedo4.1x1.grb' + FNAISC = 'CFSR.SEAICE.1982.2012.monthly.clim.grb' + FNTG3C = 'global_tg3clim.2.6x1.5.grb' + FNVEGC = 'global_vegfrac.0.144.decpercent.grb' + FNVETC = @[FNVETC] + FNSOTC = @[FNSOTC] + FNSOCC = @[FNSOCC] + FNSMCC = @[FNSMCC_control] + FNMSKH = @[FNMSKH_control] + FNTSFA = '' + FNACNA = '' + FNSNOA = '' + FNVMNC = 'global_shdmin.0.144x0.144.grb' + FNVMXC = 'global_shdmax.0.144x0.144.grb' + FNSLPC = 'global_slope.1x1.grb' + FNABSC = @[FNABSC] + LDEBUG = .false. + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + LANDICE = .true. + FTSFS = 90 + FAISL = 99999 + FAISS = 99999 + FSNOL = 99999 + FSNOS = 99999 + FSICL = 99999 + FSICS = 99999 + FTSFL = 99999 + FVETL = 99999 + FSOTL = 99999 + FvmnL = 99999 + FvmxL = 99999 + FSLPL = 99999 + FABSL = 99999 +/ + +&fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + +&nam_stochy + STOCHINI=@[STOCHINI], + SKEBNORM=1, + SKEB_NPASS=30, + SKEB_VDOF=5, + SKEB=@[SKEB], + SKEB_TAU=2.16E4, + SKEB_LSCALE=1000.E3, + SKEBINT=1800, + SHUM=@[SHUM], + SHUM_TAU=21600, + SHUM_LSCALE=500000, + SHUMINT=3600, + SPPT=@[SPPT], + SPPT_TAU=21600, + SPPT_LSCALE=500000, + SPPT_LOGIT=.TRUE., + SPPT_SFCLIMIT=.TRUE., + SPPTINT=1800, + ISEED_SHUM=1, + ISEED_SKEB=2, + ISEED_SPPT=3, +/ + +&nam_sfcperts + lndp_type = @[LNDP_TYPE] + lndp_model_type = @[LNDP_MODEL_TYPE] + LNDP_TAU=21600, + LNDP_LSCALE=500000, + ISEED_LNDP=2010, + lndp_var_list = @[LNDP_VAR_LIST] + lndp_prt_list = @[LNDP_PRT_LIST] +/ + +&cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_source = 1,1,0,0 + knob_ugwp_wvspec = 1,25,25,25 + knob_ugwp_azdir = 2,4,4,4 + knob_ugwp_stoch = 0,0,0,0 + knob_ugwp_effac = 1,1,1,1 + knob_ugwp_doaxyz = 1 + knob_ugwp_doheat = 1 + knob_ugwp_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 54 +/ + diff --git a/tests/parm/input_regional_hafs_gfdlmpv3.nml.IN b/tests/parm/input_regional_hafs_gfdlmpv3.nml.IN new file mode 100644 index 0000000000..b64938d826 --- /dev/null +++ b/tests/parm/input_regional_hafs_gfdlmpv3.nml.IN @@ -0,0 +1,393 @@ + &atmos_model_nml + blocksize = @[BLOCKSIZE] + chksum_debug = .false. + dycore_only = .false. + avg_max_length = 3600. + ccpp_suite = '@[CCPP_SUITE]' +/ + + &diag_manager_nml + prepend_date = .false. +/ + + &fms_nml + clock_grain = 'ROUTINE', + domains_stack_size = 30000000, + print_memory_usage = .false. +/ + + &fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + +&fms2_io_nml + netcdf_default_format = "netcdf4" +/ + + &fv_core_nml + layout = @[INPES],@[JNPES] + io_layout = 1,1 + npx = @[NPX] + npy = @[NPY] + ntiles = 1 + npz = @[NPZ] + !grid_type = -1 + make_nh = .false. + fv_debug = .false. + range_warn = .true. + reset_eta = .false. + n_sponge = 24 + nudge_qv = .false. + nudge_dz = .false. + tau = 5. + rf_cutoff = 50.e2 + d2_bg_k1 = 0.20 + d2_bg_k2 = 0.15 + kord_tm = -11 + kord_mt = 11 + kord_wz = 11 + kord_tr = 11 + hydrostatic = .false. + phys_hydrostatic = .false. + use_hydro_pressure = .false. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = @[K_SPLIT] + n_split = @[N_SPLIT] + nwat = @[NWAT] + na_init = @[NA_INIT] + d_ext = 0.0 + dnats = @[DNATS] + fv_sg_adj = 300 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.15 + vtdm4 = 0.04 + delt_max = 0.008 + ke_bg = 0. + do_vort_damp = .true. + external_ic = @[EXTERNAL_IC] + external_eta = .true. + gfs_phil = .false. + nggps_ic = @[NGGPS_IC] + mountain = @[MOUNTAIN] + ncep_ic = .false. + d_con = 1.0 + hord_mt = 6 + hord_vt = 6 + hord_tm = 6 + hord_dp = -6 + hord_tr = 8 + adjust_dry_mass = .false. + consv_te = 0. + do_sat_adj = @[DO_SAT_ADJ] + consv_am = .false. + fill = .true. + dwind_2d = .false. + print_freq = 3 + warm_start = @[WARM_START] + no_dycore = .false. + z_tracer = .true. + agrid_vel_rst = .true. + read_increment = .false. + res_latlon_dynamics = "fv3_increment.nc" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] + write_3d_diags = .true. + + do_schmidt = .true. + target_lat = @[TARGET_LAT] + target_lon = @[TARGET_LON] + stretch_fac = @[STRETCH_FAC] + + regional = @[REGIONAL] + bc_update_interval = @[BC_UPDATE_INTERVAL] + nrows_blend = @[NROWS_BLEND] + + full_zs_filter = @[FULL_ZS_FILTER] + n_zs_filter = @[N_ZS_FILTER] + nord_zs_filter = 4 +/ + + &fv_nest_nml + grid_pes = @[GRID_PES] + tile_coarse = @[TILE_COARSE] + num_tile_top = @[NUM_TILE_TOP] + p_split = 1 + nest_refine = @[NEST_REFINE] + nest_ioffsets= @[NEST_IOFFSETS] + nest_joffsets= @[NEST_JOFFSETS] +/ + + &fv_moving_nest_nml + surface_dir = "INPUT/moving_nest" + is_moving_nest = @[IS_MOVING_NEST] + vortex_tracker = @[VORTEX_TRACKER] + ntrack = @[NTRACK] + move_cd_x = @[MOVE_CD_X] + move_cd_y = @[MOVE_CD_Y] +/ + + &surf_map_nml + zero_ocean = .false. + cd4 = 0.15 + cd2 = -1 + n_del2_strong = 0 + n_del2_weak = 15 + n_del4 = 2 + max_slope = 0.4 + peak_fac = 1. +/ + + &external_ic_nml + filtered_terrain = .true. + levp = @[NPZP] + gfs_dwinds = .true. + checker_tr = .false. + nt_checker = 0 +/ + + &gfs_physics_nml + fhzero = 3. + ldiag3d = .false. + lradar = .true. + avg_max_length = 3600. + h2o_phys = .true. + fhcyc = @[FHCYC] + use_ufo = .true. + pre_rad = .false. + imp_physics = @[IMP_PHYSICS] + ltaerosol = .false. + lradar = .true. + ttendlim = -999 + dt_inner = @[DT_INNER] + sedi_semi = @[SEDI_SEMI] + decfl = @[DECFL] + ext_diag_thompson = .false. + pdfcld = .false. + fhswr = @[FHSWR] + fhlwr = @[FHLWR] + ialb = 1 + iems = 1 + iaer = 111 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .false. + shal_cnv = .true. !Shallow convection + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .false. + hurr_pbl = .true. ! HWRF moninedmf + moninq_fac = -1.0 ! HWRF_moninedmf + satmedmf = .true. + isatmedmf = 1 + rlmx = 300. + elmx = 300. + sfc_rlm = 1 + random_clds = .false. + trans_trac = .true. + cnvcld = .true. + imfshalcnv = 2 + imfdeepcnv = 2 + cdmbgwd = 1.0,1.0,1.0,1.0 + sfc_z0_type = 6 + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + lsm = 1 + iopt_dveg = 2 + iopt_crs = 1 + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = 1 + iopt_alb = 2 + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = 1 + iopt_trs = 2 + iopt_diag = 2 + debug = .false. + oz_phys = .false. + oz_phys_2015 = .true. + nst_anl = .true. + nstf_name = @[NSTF_NAME] + cplflx = @[CPLFLX] + cplice = .false. + cplocn2atm = @[CPLOCN2ATM] + cplwav = @[CPLWAV] + cplwav2atm = @[CPLWAV2ATM] + cpl_imp_mrg = @[CPL_IMP_MRG] + psautco = 0.0008, 0.0005 + prautco = 0.00015, 0.00015 + iau_delthrs = 6 + iaufhrs = 30 + iau_inc_files = '' + iau_drymassfixer = .false. + do_deep = .true. + lgfdlmprad = .true. + effr_in = .true. + do_sppt = .false. + do_shum = .false. + do_skeb = .false. + lndp_type = 0 + n_var_lndp = 0 + gwd_opt = 2 + do_ugwp_v0 = .false. + do_ugwp_v1 = .false. + do_ugwp_v1_w_gsldrag = .false. + do_ugwp_v1_orog_only = .false. + do_gsl_drag_ls_bl = .true. + do_gsl_drag_ss = .true. + do_gsl_drag_tofd = .true. + do_ugwp_v0_orog_only = .false. +/ + + &gfdl_cloud_microphysics_v3_nml + tau_imlt = 1200. + rthresh = 20.0e-6 + c_psaci = 0.05 + c_pgacs = 0.01 + vi_max = 1.0 + vs_max = 2.0 + vg_max = 12.0 + rewmax = 15.0 + rermin = 16.0 + regmin = 150.0 + z_slope_ice = .true + do_sedi_w = .true. + fix_negative = .true. + reiflag = 5 +/ + &gfdl_cloud_microphysics_nml + sedi_transport = .false. + do_sedi_heat = .false. + rad_snow = .true. + rad_graupel = .true. + rad_rain = .true. + const_vi = .false. + const_vs = .false. + const_vg = .false. + const_vr = .false. + vi_max = 1. + vs_max = 2. + vg_max = 12. + vr_max = 12. + qi_lim = 1. + prog_ccn = .false. + do_qa = .true. + fast_sat_adj = .true. + tau_l2v = 180. + tau_v2l = 90. + tau_g2v = 900. + rthresh = 10.e-6 ! This is a key parameter for cloud water + dw_land = 0.16 + dw_ocean = 0.10 + ql_gen = 1.0e-3 + ql_mlt = 1.0e-3 + qi0_crt = 8.0E-5 + qs0_crt = 1.0e-3 + tau_i2s = 1000. + c_psaci = 0.05 + c_pgacs = 0.01 + rh_inc = 0.30 + rh_inr = 0.30 + rh_ins = 0.30 + ccn_l = 300. + ccn_o = 100. + c_paut = 0.5 + c_cracw = 0.8 + use_ppm = .false. + use_ccn = .true. + mono_prof = .true. + z_slope_liq = .true. + z_slope_ice = .true. + de_ice = .false. + fix_negative = .true. + icloud_f = 1 + mp_time = 90. +/ + + &interpolator_nml + interp_method = 'conserve_great_circle' +/ + + &namsfc + FNGLAC = "global_glacier.2x2.grb", + FNMXIC = "global_maxice.2x2.grb", + FNTSFC = "RTGSST.1982.2012.monthly.clim.grb", + FNSNOC = "global_snoclim.1.875.grb", + FNZORC = "igbp" + !FNZORC = "global_zorclim.1x1.grb", + FNALBC = "global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb", + FNALBC2 = "global_albedo4.1x1.grb", + FNAISC = "IMS-NIC.blended.ice.monthly.clim.grb", + FNTG3C = "global_tg3clim.2.6x1.5.grb", + FNVEGC = "global_vegfrac.0.144.decpercent.grb", + FNVETC = "global_vegtype.igbp.t1534.3072.1536.rg.grb", + FNSOTC = "global_soiltype.statsgo.t1534.3072.1536.rg.grb", + FNSMCC = "global_soilmgldas.t1534.3072.1536.grb", + FNMSKH = "seaice_newland.grb", + FNTSFA = "", + FNACNA = "", + FNSNOA = "", + FNVMNC = "global_shdmin.0.144x0.144.grb", + FNVMXC = "global_shdmax.0.144x0.144.grb", + FNSLPC = "global_slope.1x1.grb", + FNABSC = "global_mxsnoalb.uariz.t1534.3072.1536.rg.grb", + LDEBUG =.true., + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + FTSFS = 90 + FAISS = 99999 + FSNOL = 99999 + FSICL = 99999 + FTSFL = 99999 + FAISL = 99999 + FVETL = 99999, + FSOTL = 99999, + FvmnL = 99999, + FvmxL = 99999, + FSLPL = 99999, + FABSL = 99999, + FSNOS = 99999, + FSICS = 99999, +/ + + &nam_stochy +/ + + &nam_sfcperts +/ + + &cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_source = 1,1,0,0 + knob_ugwp_wvspec = 1,25,25,25 + knob_ugwp_azdir = 2,4,4,4 + knob_ugwp_stoch = 0,0,0,0 + knob_ugwp_effac = 1,1,1,1 + knob_ugwp_doaxyz = 1 + knob_ugwp_doheat = 1 + knob_ugwp_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 25 +/ + + &MOM_input_nml + output_directory = 'OUTPUT', + input_filename = 'n' + restart_input_dir = 'INPUT', + restart_output_dir = 'RESTART', + parameter_filename = 'MOM_input' +/ diff --git a/tests/tests/control_iovr4_gfdlmpv3 b/tests/tests/control_iovr4_gfdlmpv3 new file mode 100644 index 0000000000..5ee0a1f2f7 --- /dev/null +++ b/tests/tests/control_iovr4_gfdlmpv3 @@ -0,0 +1,43 @@ +############################################################################### +# +# global control test: GFSv16 atmosphere only at C96L127 using cloud overlap option iovr=4 with GFDLMP Version 3.0 +# +############################################################################### + +export TEST_DESCR="Compare global control using iovr=4 results with previous trunk version" + +export CNTL_DIR=control_iovr4 + +export LIST_FILES="sfcf000.nc \ + sfcf021.nc \ + sfcf024.nc \ + atmf000.nc \ + atmf021.nc \ + atmf024.nc \ + GFSFLX.GrbF00 \ + GFSFLX.GrbF21 \ + GFSFLX.GrbF24 \ + GFSPRS.GrbF00 \ + GFSPRS.GrbF21 \ + GFSPRS.GrbF24" + +export_fv3_v16 +export NPZ=127 +export NPZP=128 +export DT_ATMOS=720 +export SYEAR=2021 +export SMONTH=03 +export SDAY=22 +export SHOUR=06 +export RESTART_INTERVAL="12 -1" +export OUTPUT_GRID='gaussian_grid' +export NSTF_NAME='2,0,0,0,0' +export WRITE_DOPOST=.true. +export IAER=5111 +export OUTPUT_FH='0 21 24' +export IOVR=4 + +export FV3_RUN=control_run.IN +export CCPP_SUITE=FV3_GFS_v16_gfdlmpv3 +export INPUT_NML=control_gfdlmpv3.nml.IN +export GFDLMP_V3=.true. diff --git a/tests/tests/hafs_regional_atm_gfdlmpv3 b/tests/tests/hafs_regional_atm_gfdlmpv3 new file mode 100644 index 0000000000..f4749e0871 --- /dev/null +++ b/tests/tests/hafs_regional_atm_gfdlmpv3 @@ -0,0 +1,99 @@ +############################################################################### +# +# HAFS regional atmosphere only using GFDLMP Version 3 +# +############################################################################### + +export TEST_DESCR="Compare HAFS regional atmosphere only results with previous trunk version" + +export CNTL_DIR=hafs_regional_atm + +export LIST_FILES="atmf006.nc \ + sfcf006.nc \ + HURPRS.GrbF06" + +export_fv3 +export_hafs + +export HAFS=true +export FHMAX=6 +export RESTART_N=${FHMAX} +export atm_omp_num_threads=2 +export DT_ATMOS=180 +export IDEFLATE=1 +export OUTPUT_FH='3 -1' +export OUTPUT_FILE="'netcdf' 'netcdf'" +export SDAY=29 +export SHOUR=00 +export SMONTH=08 +export SYEAR=2019 +export WRTTASK_PER_GROUP=60 +export WRITE_DOPOST=.true. +export POSTAPP='hafs' + +export OUTPUT_GRID='regional_latlon' +export CEN_LON=-62.0 +export CEN_LAT=22.0 +export LON1=-116.90 +export LAT1=-14.45 +export LON2=-7.10 +export LAT2=58.45 +export DLON=0.1 +export DLAT=0.1 + +export BLOCKSIZE=40 +export CCPP_SUITE=FV3_HAFS_v1_gfdlmpv3_tedmf +export DEFLATE_LEVEL=-1 +export INPES=20 +export JNPES=12 +export NPX=721 +export NPY=601 +export NPZ=91 +export NPZP=$(($NPZ + 1)) +export K_SPLIT=2 +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="22.0" +export TARGET_LON="-62.0" +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="240" +export TILE_COARSE="0" +export NUM_TILE_TOP=1 +export NEST_REFINE="0" +export NEST_IOFFSETS="999" +export NEST_JOFFSETS="999" + +export FHCYC=0 +export FHSWR=1800 +export FHLWR=1800 +export NSTF_NAME=2,0,0,0,0 +export CPLFLX=.false. +export CPLOCN2ATM=.true. +export CPLWAV=.false. +export CPLWAV2ATM=.false. +export CPL_IMP_MRG=.false. + +export CMEPS=false +export RUNTYPE=startup +export USE_COLDSTART=false + +export FIELD_TABLE=field_table_hafs +export DIAG_TABLE=diag_table_hafs_template +export INPUT_NML=input_regional_hafs_gfdlmpv3.nml.IN +export MODEL_CONFIGURE=model_configure_hafs.IN +export UFS_CONFIGURE=ufs.configure.hafs_atm.IN +export FV3_RUN=hafs_fv3_run.IN + +# GFDLMP V3 +export GFDLMP_V3=.true. \ No newline at end of file From 88d2e16c88e9bdc7ca80653147a9ed29e9a69337 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 18 Nov 2024 22:54:39 +0000 Subject: [PATCH 26/31] Updated FV3/physics --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 7c46b87f12..4a19ef66bf 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 7c46b87f12fe89c729bce6433bf051be242f2ca9 +Subproject commit 4a19ef66bfa1b0c79bfe3440e85204c692567cdf From 9e7281d71f560de0eeee77ca7cd134e74288d9dc Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 19 Nov 2024 17:04:52 +0000 Subject: [PATCH 27/31] Bug fix from GNU compile. Bug fix from merge. --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 4a19ef66bf..0c4529cd9e 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 4a19ef66bfa1b0c79bfe3440e85204c692567cdf +Subproject commit 0c4529cd9e1e9f358e668660c80e5470b125fef0 From 1c1526ab97e7d58d568a720ad19bddb079182f0e Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 21 Nov 2024 15:36:14 +0000 Subject: [PATCH 28/31] Doh! --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 0c4529cd9e..59164a6c79 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0c4529cd9e1e9f358e668660c80e5470b125fef0 +Subproject commit 59164a6c79eb61aff360ad54f0a6fbe7d15660be From b610bc56ca74d4f88a5ad966517b85095a50f719 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 16 Dec 2024 19:37:43 +0000 Subject: [PATCH 29/31] Update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 59164a6c79..21d1609da1 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 59164a6c79eb61aff360ad54f0a6fbe7d15660be +Subproject commit 21d1609da1f0b0ec61550a6a7c88e1079e684f3d From a0efe26dbd6b748928a1b8686694f13bff72af5b Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 24 Jan 2025 16:45:47 +0000 Subject: [PATCH 30/31] Update FV3 --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 21d1609da1..780a23657f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 21d1609da1f0b0ec61550a6a7c88e1079e684f3d +Subproject commit 780a23657f45130eb2eea7e5523ec8d66ae52c3e From 08431845ce1dab82ccfbffa22511e384afc09bd2 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 24 Jan 2025 22:04:18 +0000 Subject: [PATCH 31/31] Address reviewers comments --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 780a23657f..c510d82607 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 780a23657f45130eb2eea7e5523ec8d66ae52c3e +Subproject commit c510d826072ec5b735f3a6aec44560ce036c8185