Skip to content

Commit

Permalink
Use optional chunksizes argument in register_restart_field calls (com…
Browse files Browse the repository at this point in the history 
…bining PRs #1853 & 1834) (#1467)

* Update fms to 2022.04. Update acorn modulefiles

* Remove fms_io_nml and mpp_io_nml namelists from input.nml templates

* Update FMS to 2023.01

* Use netcdf4 fms2_io option

* replace tabs with spaces

* Update rt.sh to allow creating new baselines only for a subset of tests

* Update rt.sh to run compile tasks only if needed during baseline creation (-b option)

* Revert MAX_BUILDS back to 10

* Fix hrrr qutlting restart tests.
  • Loading branch information
@DusanJovic-NOAA
DusanJovic-NOAA authored Aug 31, 2023
1 parent 03fad6f commit a52686c
Show file tree
Hide file tree
Showing 39 changed files with 20,543 additions and 21,020 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 6 files
+1 −1 atmos_cubed_sphere
+36 −28 io/fv3atm_clm_lake_io.F90
+6 −3 io/fv3atm_restart_io.F90
+16 −7 io/fv3atm_rrfs_sd_io.F90
+29 −13 io/fv3atm_sfc_io.F90
+6 −1 io/module_write_restart_netcdf.F90
4,959 changes: 2,463 additions & 2,496 deletions tests/logs/RegressionTests_acorn.log
View file

Large diffs are not rendered by default.

7,592 changes: 3,800 additions & 3,792 deletions tests/logs/RegressionTests_cheyenne.log
View file

Large diffs are not rendered by default.

5,203 changes: 2,584 additions & 2,619 deletions tests/logs/RegressionTests_gaea.log
View file

Large diffs are not rendered by default.

8,260 changes: 4,067 additions & 4,193 deletions tests/logs/RegressionTests_hera.log
View file

Large diffs are not rendered by default.

4,607 changes: 2,286 additions & 2,321 deletions tests/logs/RegressionTests_jet.log
View file

Large diffs are not rendered by default.

5,705 changes: 2,835 additions & 2,870 deletions tests/logs/RegressionTests_orion.log
View file

Large diffs are not rendered by default.

4,700 changes: 2,287 additions & 2,413 deletions tests/logs/RegressionTests_wcoss2.log
View file

Large diffs are not rendered by default.

15 changes: 4 additions & 11 deletions tests/parm/control.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,16 @@
max_output_fields = @[MAX_OUTPUT_FIELDS]
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&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
Expand Down
15 changes: 4 additions & 11 deletions tests/parm/control_ca.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,16 @@
max_output_fields = @[MAX_OUTPUT_FIELDS]
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&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
Expand Down
15 changes: 4 additions & 11 deletions tests/parm/control_csawmg.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,16 @@
prepend_date = .false.
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&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
Expand Down
15 changes: 4 additions & 11 deletions tests/parm/control_flake.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,16 @@
prepend_date = .false.
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&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
Expand Down
39 changes: 15 additions & 24 deletions tests/parm/control_gdas.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,22 @@
chksum_debug = .false.
dycore_only = .false.
ccpp_suite = '@[CCPP_SUITE]'

/

&diag_manager_nml
prepend_date = .false.

/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100

/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&fms_nml
clock_grain = 'ROUTINE'
domains_stack_size = 3000000
print_memory_usage = .false.

/

&fms2_io_nml
netcdf_default_format = "netcdf4"
/

&fv_core_nml
Expand Down Expand Up @@ -100,7 +91,7 @@ deflate_level=1
agrid_vel_rst = .true.
read_increment = .false.
res_latlon_dynamics = ""

/

&cires_ugwp_nml
Expand All @@ -115,7 +106,7 @@ deflate_level=1
knob_ugwp_dokdis = 1
knob_ugwp_ndx4lh = 1
knob_ugwp_version = 0
launch_level = 54
launch_level = 54
/

&external_ic_nml
Expand All @@ -124,7 +115,7 @@ deflate_level=1
gfs_dwinds = .true.
checker_tr = .false.
nt_checker = 0

/

&gfs_physics_nml
Expand Down Expand Up @@ -204,7 +195,7 @@ deflate_level=1
iau_delthrs = 6
iau_inc_files= @[IAU_INC_FILES]
iau_drymassfixer = .false.

/

&gfdl_cloud_microphysics_nml
Expand Down Expand Up @@ -256,12 +247,12 @@ deflate_level=1
mp_time = 150.
reiflag = 2


/

&interpolator_nml
interp_method = 'conserve_great_circle'

/

&namsfc
Expand Down Expand Up @@ -306,12 +297,12 @@ deflate_level=1
FvmxL = 99999
FSLPL = 99999
FABSL = 99999

/

&fv_grid_nml
grid_file = 'INPUT/grid_spec.nc'

/

&nam_stochy
Expand All @@ -333,8 +324,8 @@ deflate_level=1
sppt_logit = .true.
sppt_sfclimit = .true.
use_zmtnblck = .true.

/
&nam_sfcperts

/
15 changes: 4 additions & 11 deletions tests/parm/control_gfsv17.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,16 @@
max_output_fields = @[MAX_OUTPUT_FIELDS]
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&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
Expand Down
15 changes: 4 additions & 11 deletions tests/parm/control_noahmp.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,16 @@
prepend_date = .false.
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&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
Expand Down
15 changes: 4 additions & 11 deletions tests/parm/control_ugwpv1.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,16 @@
prepend_date = .false.
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&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
Expand Down
19 changes: 6 additions & 13 deletions tests/parm/cpld_control.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,16 @@
max_output_fields = @[MAX_OUTPUT_FIELDS]
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100
max_files_w = 100
/

&mpp_io_nml
shuffle=1
deflate_level=1
/

&fms_nml
clock_grain = 'ROUTINE'
domains_stack_size = @[DOMAINS_STACK_SIZE]
print_memory_usage = .false.
/

&fms2_io_nml
netcdf_default_format = "netcdf4"
/

&fv_core_nml
layout = @[INPES],@[JNPES]
io_layout = 1,1
Expand Down Expand Up @@ -118,7 +111,7 @@ deflate_level=1
fhcyc = @[FHCYC]
use_ufo = .true.
pre_rad = .false.
imp_physics = @[IMP_PHYSICS]
imp_physics = @[IMP_PHYSICS]
iovr = 3
ltaerosol = .false.
lradar = .false.
Expand Down Expand Up @@ -259,7 +252,7 @@ deflate_level=1
knob_ugwp_doaxyz = 1
knob_ugwp_doheat = 1
knob_ugwp_dokdis = 1
knob_ugwp_ndx4lh = 1
knob_ugwp_ndx4lh = 1
knob_ugwp_version = @[KNOB_UGWP_VERSION]
launch_level = 54
/
Expand Down
10 changes: 4 additions & 6 deletions tests/parm/cpt.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@
prepend_date = .false.
/

&fms_io_nml
checksum_required = .false.
max_files_r = 100,
max_files_w = 100,
/

&fms_nml
clock_grain = 'ROUTINE',
domains_stack_size = 3000000,
Expand All @@ -25,6 +19,10 @@
grid_file = 'INPUT/grid_spec.nc'
/

&fms2_io_nml
netcdf_default_format = "netcdf4"
/

&fv_core_nml
layout = @[INPES],@[JNPES]
io_layout = 1,1
Expand Down
Loading

0 comments on commit a52686c

Please sign in to comment.