Merge DavidNew-NOAA/feature/cubed_sphere_inc

Add ability to read increment files on native cubed sphere grid ufs-community#2304
NickSzapiro-NOAA · Aug 21, 2024 · 0e49a81 · 0e49a81
2 parents d8f07f6 + 1efc97f
commit 0e49a81
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 4 deletions.
diff --git 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/fv3atm
+  branch = feature/cubed_sphere_inc
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+4 −2		.gitmodules
+1 −1		atmos_cubed_sphere
+2 −2		atmos_model.F90
+8 −0		ccpp/data/GFS_typedefs.F90