From 6b980d29f18187339b7495ea49366ad843406a18 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 30 May 2024 17:39:05 +0000 Subject: [PATCH 01/11] Initial commit --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index b3640007c5..435e2094ea 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit b3640007c51c8899533e1b835940a2030a768fcc +Subproject commit 435e2094ea1c0ea1d49dc4b2dfa379370d8ca5f9 From 1f721506845b8059005f447ed98aa3623cb79e97 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Mon, 1 Jul 2024 15:22:22 +0000 Subject: [PATCH 02/11] UPdate hashes --- CDEPS-interface/CDEPS | 2 +- CICE-interface/CICE | 2 +- HYCOM-interface/HYCOM | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS index fbdf6843d6..3d7067a523 160000 --- a/CDEPS-interface/CDEPS +++ b/CDEPS-interface/CDEPS @@ -1 +1 @@ -Subproject commit fbdf6843d6bde852d97f1547591d90136103f669 +Subproject commit 3d7067a523b8557058755289e4275f5f5c985daf diff --git a/CICE-interface/CICE b/CICE-interface/CICE index 9452de8c3c..9c0cd8d3ba 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit 9452de8c3cb43fb2628f0722e6a51f79429d2160 +Subproject commit 9c0cd8d3ba5963d01711094a3c81b6358fcb8367 diff --git a/HYCOM-interface/HYCOM b/HYCOM-interface/HYCOM index bcf7777bb0..35789c7577 160000 --- a/HYCOM-interface/HYCOM +++ b/HYCOM-interface/HYCOM @@ -1 +1 @@ -Subproject commit bcf7777bb037ae2feb2a8a8ac51aacb3511b52d9 +Subproject commit 35789c757766e07f688b4c0c7c5229816f224b09 From bf2a31b07fd338a7ac35fa43a9b00e417d216828 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Mon, 1 Jul 2024 15:46:31 +0000 Subject: [PATCH 03/11] Update hashes --- CDEPS-interface/CDEPS | 2 +- CICE-interface/CICE | 2 +- HYCOM-interface/HYCOM | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS index 3d7067a523..fbdf6843d6 160000 --- a/CDEPS-interface/CDEPS +++ b/CDEPS-interface/CDEPS @@ -1 +1 @@ -Subproject commit 3d7067a523b8557058755289e4275f5f5c985daf +Subproject commit fbdf6843d6bde852d97f1547591d90136103f669 diff --git a/CICE-interface/CICE b/CICE-interface/CICE index 9c0cd8d3ba..9452de8c3c 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit 9c0cd8d3ba5963d01711094a3c81b6358fcb8367 +Subproject commit 9452de8c3cb43fb2628f0722e6a51f79429d2160 diff --git a/HYCOM-interface/HYCOM b/HYCOM-interface/HYCOM index 35789c7577..bcf7777bb0 160000 --- a/HYCOM-interface/HYCOM +++ b/HYCOM-interface/HYCOM @@ -1 +1 @@ -Subproject commit 35789c757766e07f688b4c0c7c5229816f224b09 +Subproject commit bcf7777bb037ae2feb2a8a8ac51aacb3511b52d9 From 34d1087dd24a12099fdebd4f9ccf7b79b942c0e8 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 18 Jul 2024 13:03:19 +0000 Subject: [PATCH 04/11] Update FV3 hash --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 67835ec175..1eda2d3279 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 67835ec1753c66a18de6dfe91eac65fd7b5ac409 +Subproject commit 1eda2d32793861e9cb87a348fa01018e5990e143 From de1c02e5c3e98d7f623af03b69d91f74e3bd5a4d Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 8 Aug 2024 13:03:02 +0000 Subject: [PATCH 05/11] Update FV3 hash --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 06ef6fc591..13e6733362 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 06ef6fc591b7ccd106f93a9f0a541747a0e3c08e +Subproject commit 13e6733362515357ac0ec6b6daa575eebcfe22ee From 403369a12c6a5a96a3bdebdc72844a25dc8e31a4 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 8 Aug 2024 14:46:09 +0000 Subject: [PATCH 06/11] Set .gitmodules --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a3775fc12d..322e3893e7 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/NOAA-EMC/fv3atm +# branch = develop + url = https://github.com/DavidNew-NOAA/ufs-weather-model + branch = feature/cubed_sphere_inc [submodule "WW3"] path = WW3 url = https://github.com/NOAA-EMC/WW3 diff --git a/FV3 b/FV3 index 13e6733362..7634b7ad4a 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 13e6733362515357ac0ec6b6daa575eebcfe22ee +Subproject commit 7634b7ad4aa21bbaf435620602c539abe7a6b753 From e2a55e3bfef09becaa530494877a1fb94948f0c0 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 9 Aug 2024 17:09:48 +0000 Subject: [PATCH 07/11] add increment_file_on_native_grid to test namelists --- tests/default_vars.sh | 1 + tests/parm/control.nml.IN | 1 + tests/parm/control_ca.nml.IN | 1 + tests/parm/control_csawmg.nml.IN | 1 + tests/parm/control_flake.nml.IN | 1 + tests/parm/control_gdas.nml.IN | 2 +- tests/parm/control_gfsv17.nml.IN | 1 + tests/parm/control_noahmp.nml.IN | 1 + tests/parm/csawmg3shoc127.nml.IN | 1 + tests/parm/csawmgshoc.nml.IN | 1 + tests/parm/global_control.nml.IN | 1 + tests/parm/input_global_hafs.nml.IN | 1 + tests/parm/input_global_nest.nml.IN | 1 + tests/parm/input_global_parent.nml.IN | 1 + tests/parm/input_nest02.nml.IN | 1 + tests/parm/input_nest_hafs.nml.IN | 1 + tests/parm/input_regional_hafs.nml.IN | 1 + tests/parm/rap.nml.IN | 1 + tests/parm/regional.nml.IN | 1 + tests/parm/regional_atmaq.nml.IN | 1 + tests/parm/regional_rrfs_a.nml.IN | 1 + tests/parm/regional_wofs.nml.IN | 1 + tests/parm/rrfs_conus13km_hrrr.nml.IN | 1 + tests/parm/wam_v17.nml.IN | 1 + 24 files changed, 24 insertions(+), 1 deletion(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 78a89ec8e6..b7beeef5bb 100644 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -555,6 +555,7 @@ export MODEL_INITIALIZATION=false export WARM_START=.false. export READ_INCREMENT=.false. export RES_LATLON_DYNAMICS="''" +export INCREMENT_FILE_ON_NATIVE_GRID=.false. export NGGPS_IC=.true. export EXTERNAL_IC=.true. export MAKE_NH=.true. diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN index d48d1fb422..c7b45874f1 100644 --- a/tests/parm/control.nml.IN +++ b/tests/parm/control.nml.IN @@ -89,6 +89,7 @@ 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 diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN index 95abe17265..527eb7e296 100644 --- a/tests/parm/control_ca.nml.IN +++ b/tests/parm/control_ca.nml.IN @@ -89,6 +89,7 @@ agrid_vel_rst = .true. read_increment = .false. res_latlon_dynamics = "" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] / &external_ic_nml diff --git a/tests/parm/control_csawmg.nml.IN b/tests/parm/control_csawmg.nml.IN index 6729ed1031..88a46c3e58 100644 --- a/tests/parm/control_csawmg.nml.IN +++ b/tests/parm/control_csawmg.nml.IN @@ -87,6 +87,7 @@ z_tracer = .true. agrid_vel_rst = .true. read_increment = .false. + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] res_latlon_dynamics = "" / diff --git a/tests/parm/control_flake.nml.IN b/tests/parm/control_flake.nml.IN index cea5817471..27f96e5c61 100644 --- a/tests/parm/control_flake.nml.IN +++ b/tests/parm/control_flake.nml.IN @@ -88,6 +88,7 @@ agrid_vel_rst = .true. read_increment = .false. res_latlon_dynamics = "" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] / &external_ic_nml diff --git a/tests/parm/control_gdas.nml.IN b/tests/parm/control_gdas.nml.IN index 9ffeadd0e3..0d5991b24a 100644 --- a/tests/parm/control_gdas.nml.IN +++ b/tests/parm/control_gdas.nml.IN @@ -91,7 +91,7 @@ agrid_vel_rst = .true. read_increment = .false. res_latlon_dynamics = "" - + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] / &cires_ugwp_nml diff --git a/tests/parm/control_gfsv17.nml.IN b/tests/parm/control_gfsv17.nml.IN index 247cca85e8..ce77835c8f 100644 --- a/tests/parm/control_gfsv17.nml.IN +++ b/tests/parm/control_gfsv17.nml.IN @@ -89,6 +89,7 @@ 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 diff --git a/tests/parm/control_noahmp.nml.IN b/tests/parm/control_noahmp.nml.IN index 6082aa789b..bc61672a00 100644 --- a/tests/parm/control_noahmp.nml.IN +++ b/tests/parm/control_noahmp.nml.IN @@ -88,6 +88,7 @@ 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 diff --git a/tests/parm/csawmg3shoc127.nml.IN b/tests/parm/csawmg3shoc127.nml.IN index b01ba5f205..d510d0ca6f 100644 --- a/tests/parm/csawmg3shoc127.nml.IN +++ b/tests/parm/csawmg3shoc127.nml.IN @@ -90,6 +90,7 @@ z_tracer = .true. read_increment = @[READ_INCREMENT] res_latlon_dynamics = "fv3_increment.nc" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] / &external_ic_nml diff --git a/tests/parm/csawmgshoc.nml.IN b/tests/parm/csawmgshoc.nml.IN index 3f77e6fd0f..2bd6144f3e 100644 --- a/tests/parm/csawmgshoc.nml.IN +++ b/tests/parm/csawmgshoc.nml.IN @@ -89,6 +89,7 @@ z_tracer = .true. read_increment = @[READ_INCREMENT] res_latlon_dynamics = "fv3_increment.nc" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] / &external_ic_nml diff --git a/tests/parm/global_control.nml.IN b/tests/parm/global_control.nml.IN index ecdc0c5d0b..8868906af9 100644 --- a/tests/parm/global_control.nml.IN +++ b/tests/parm/global_control.nml.IN @@ -94,6 +94,7 @@ 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 diff --git a/tests/parm/input_global_hafs.nml.IN b/tests/parm/input_global_hafs.nml.IN index fdc887c8f5..2c7173fce7 100644 --- a/tests/parm/input_global_hafs.nml.IN +++ b/tests/parm/input_global_hafs.nml.IN @@ -94,6 +94,7 @@ 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. diff --git a/tests/parm/input_global_nest.nml.IN b/tests/parm/input_global_nest.nml.IN index affbb2af94..dab50280d1 100644 --- a/tests/parm/input_global_nest.nml.IN +++ b/tests/parm/input_global_nest.nml.IN @@ -101,6 +101,7 @@ agrid_vel_rst = .true. read_increment = @[READ_INCREMENT] res_latlon_dynamics = @[RES_LATLON_DYNAMICS] + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] nested = @[NESTED] twowaynest = @[TWOWAYNEST02] nestupdate = 7 diff --git a/tests/parm/input_global_parent.nml.IN b/tests/parm/input_global_parent.nml.IN index 2027367087..33c1baa34f 100644 --- a/tests/parm/input_global_parent.nml.IN +++ b/tests/parm/input_global_parent.nml.IN @@ -100,6 +100,7 @@ agrid_vel_rst = .true. read_increment = @[READ_INCREMENT] res_latlon_dynamics = @[RES_LATLON_DYNAMICS] + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] do_schmidt = .true. target_lat = @[TARGET_LAT] target_lon = @[TARGET_LON] diff --git a/tests/parm/input_nest02.nml.IN b/tests/parm/input_nest02.nml.IN index 561afaffa9..4056f629bb 100644 --- a/tests/parm/input_nest02.nml.IN +++ b/tests/parm/input_nest02.nml.IN @@ -89,6 +89,7 @@ warm_start = @[WARM_START] read_increment = @[READ_INCREMENT] res_latlon_dynamics = "fv3_increment.nc" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] no_dycore = .false. z_tracer = .true. diff --git a/tests/parm/input_nest_hafs.nml.IN b/tests/parm/input_nest_hafs.nml.IN index 3fdf8e7d5e..055e4ddeac 100644 --- a/tests/parm/input_nest_hafs.nml.IN +++ b/tests/parm/input_nest_hafs.nml.IN @@ -94,6 +94,7 @@ 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. nested = .true. diff --git a/tests/parm/input_regional_hafs.nml.IN b/tests/parm/input_regional_hafs.nml.IN index d88db070ef..95cec669bd 100644 --- a/tests/parm/input_regional_hafs.nml.IN +++ b/tests/parm/input_regional_hafs.nml.IN @@ -93,6 +93,7 @@ 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. diff --git a/tests/parm/rap.nml.IN b/tests/parm/rap.nml.IN index 8ed7dcfa75..849e9f78cc 100644 --- a/tests/parm/rap.nml.IN +++ b/tests/parm/rap.nml.IN @@ -90,6 +90,7 @@ 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 diff --git a/tests/parm/regional.nml.IN b/tests/parm/regional.nml.IN index 511cbe1e34..f0911503c7 100644 --- a/tests/parm/regional.nml.IN +++ b/tests/parm/regional.nml.IN @@ -96,6 +96,7 @@ agrid_vel_rst = .true. read_increment = .F. res_latlon_dynamics = "fv3_increment.nc" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] do_schmidt = .true. target_lat = 55.0 target_lon = -112.5 diff --git a/tests/parm/regional_atmaq.nml.IN b/tests/parm/regional_atmaq.nml.IN index 0a5b3e3812..a5a596a55c 100644 --- a/tests/parm/regional_atmaq.nml.IN +++ b/tests/parm/regional_atmaq.nml.IN @@ -93,6 +93,7 @@ regional = .true. regional_bcs_from_gsi = .false. res_latlon_dynamics = @[RES_LATLON_DYNAMICS] + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] reset_eta = .false. rf_cutoff = 750.0 stretch_fac = 0.999 diff --git a/tests/parm/regional_rrfs_a.nml.IN b/tests/parm/regional_rrfs_a.nml.IN index 1e1255e81b..d7c903a954 100644 --- a/tests/parm/regional_rrfs_a.nml.IN +++ b/tests/parm/regional_rrfs_a.nml.IN @@ -120,6 +120,7 @@ regional = .true. regional_bcs_from_gsi = .false. res_latlon_dynamics = 'fv3_increment.nc' + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] reset_eta = .false. rf_cutoff = 2000.0 sg_cutoff = 10000.0 diff --git a/tests/parm/regional_wofs.nml.IN b/tests/parm/regional_wofs.nml.IN index e79f196863..e5d49e3858 100644 --- a/tests/parm/regional_wofs.nml.IN +++ b/tests/parm/regional_wofs.nml.IN @@ -112,6 +112,7 @@ regional = .true. regional_bcs_from_gsi = .false. res_latlon_dynamics = 'fv3_increment.nc' + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] reset_eta = .false. rf_cutoff = 2000.0 stretch_fac = 0.999 diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN index 883a508911..b582d1d357 100644 --- a/tests/parm/rrfs_conus13km_hrrr.nml.IN +++ b/tests/parm/rrfs_conus13km_hrrr.nml.IN @@ -115,6 +115,7 @@ regional = .true. regional_bcs_from_gsi = .false. res_latlon_dynamics = @[RES_LATLON_DYNAMICS] + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] reset_eta = .false. rf_cutoff = 20000.0 sg_cutoff = 10000.0 diff --git a/tests/parm/wam_v17.nml.IN b/tests/parm/wam_v17.nml.IN index 8e5c6cb90d..f6ec526bc7 100644 --- a/tests/parm/wam_v17.nml.IN +++ b/tests/parm/wam_v17.nml.IN @@ -93,6 +93,7 @@ agrid_vel_rst = .false. read_increment = @[READ_INCREMENT] res_latlon_dynamics = "fv3_increment.nc" + increment_file_on_native_grid = @[INCREMENT_FILE_ON_NATIVE_GRID] / &external_ic_nml From 01582b467babd68d6f85734dbf55de1db8e91d5b Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 9 Aug 2024 17:15:47 +0000 Subject: [PATCH 08/11] Update FV3 hash --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 7634b7ad4a..2b2aaf9936 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 7634b7ad4aa21bbaf435620602c539abe7a6b753 +Subproject commit 2b2aaf99363ec5baec6e52724c5c6523ea1a9e85 From 11564008b979d946edcce90011c6a175f8b7d9cd Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 9 Aug 2024 17:18:56 +0000 Subject: [PATCH 09/11] Update hash --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 2b2aaf9936..a3d8fe04e6 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 2b2aaf99363ec5baec6e52724c5c6523ea1a9e85 +Subproject commit a3d8fe04e62d98b9cad35ebe4f423c2c73430f79 From 35ce742b45b20ebf738639bce469154c076427f3 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Wed, 14 Aug 2024 14:35:44 +0000 Subject: [PATCH 10/11] Fix typo in .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 322e3893e7..1a958b9109 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ path = FV3 # url = https://github.com/NOAA-EMC/fv3atm # branch = develop - url = https://github.com/DavidNew-NOAA/ufs-weather-model + url = https://github.com/DavidNew-NOAA/fv3atm branch = feature/cubed_sphere_inc [submodule "WW3"] path = WW3 From 1efc97f110eafc1271e3f12241de772690492d1c Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Thu, 15 Aug 2024 13:43:21 +0000 Subject: [PATCH 11/11] Update hash --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index d7d7e80b22..40fa2b517f 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit d7d7e80b22e9a96697632a0ab0497a70d80dbf97 +Subproject commit 40fa2b517f4502728d37c85ebfd2d8762fb40a4a