Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ability to read increment files on native cubed sphere grid #2304 #2

Merged
merged 22 commits into from
Aug 21, 2024
Merged

Add ability to read increment files on native cubed sphere grid #2304 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6b980d2
Initial commit
DavidNew-NOAA May 30, 2024
0449407
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jun 3, 2024
e09b851
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jun 17, 2024
c3be4de
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jun 20, 2024
83f696e
Merge remote-tracking branch 'origin/develop' into feature/cubed_sphe…
DavidNew-NOAA Jul 1, 2024
1f72150
UPdate hashes
DavidNew-NOAA Jul 1, 2024
bf2a31b
Update hashes
DavidNew-NOAA Jul 1, 2024
44bbc02
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jul 15, 2024
34d1087
Update FV3 hash
DavidNew-NOAA Jul 18, 2024
24cb269
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jul 18, 2024
040f4c5
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jul 18, 2024
0edee86
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Jul 30, 2024
7688f67
Merge branch 'ufs-community:develop' into feature/cubed_sphere_inc
DavidNew-NOAA Aug 8, 2024
de1c02e
Update FV3 hash
DavidNew-NOAA Aug 8, 2024
403369a
Set .gitmodules
DavidNew-NOAA Aug 8, 2024
e2a55e3
add increment_file_on_native_grid to test namelists
DavidNew-NOAA Aug 9, 2024
01582b4
Update FV3 hash
DavidNew-NOAA Aug 9, 2024
2988735
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Aug 9, 2024
1156400
Update hash
DavidNew-NOAA Aug 9, 2024
699ead8
Merge branch 'develop' into feature/cubed_sphere_inc
DavidNew-NOAA Aug 13, 2024
35ce742
Fix typo in .gitmodules
DavidNew-NOAA Aug 14, 2024
1efc97f
Update hash
DavidNew-NOAA Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 4 files
+4 −2 .gitmodules
+1 −1 atmos_cubed_sphere
+2 −2 atmos_model.F90
+8 −0 ccpp/data/GFS_typedefs.F90
1 change: 1 addition & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_ca.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_csawmg.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
/

Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_flake.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/control_gdas.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_gfsv17.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_noahmp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/csawmg3shoc127.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/csawmgshoc.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/global_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_global_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_global_nest.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_global_parent.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_nest02.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_nest_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_regional_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/rap.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/regional.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/regional_atmaq.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/regional_rrfs_a.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/regional_wofs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/rrfs_conus13km_hrrr.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/parm/wam_v17.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down