Skip to content

UFS-dev PR#126 #121

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

Merged
grantfirl merged 7 commits into from
Mar 8, 2024
Merged

UFS-dev PR#126 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f431fbe
Enable pdlib tests on more platforms (#1967)
JessicaMeixner-NOAA Nov 22, 2023
f6918a1
Add option to use netcdf quantization (#1990)
DusanJovic-NOAA Nov 27, 2023
17e8d84
fix type mis-matches in nst water property module (#1993)
DeniseWorthen Nov 30, 2023
907d00c
Merge commit '17e8d84b87aa726f220eaa8d4501542cb326aaba' into ufs-dev-…
grantfirl Feb 6, 2024
8f8dab5
Merge branch 'main' into ufs-dev-PR126
grantfirl Feb 23, 2024
f180c5a
add successful log
grantfirl Mar 8, 2024
930c4f9
update FV3, .gitmodules, and bl_date.ncar.conf
grantfirl Mar 8, 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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 5 files
+3 −3 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/physics
+2 −1 io/module_fv3_io_def.F90
+24 −107 io/module_write_netcdf.F90
+18 −16 io/module_wrt_grid_comp.F90
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ for i = 1, #ufs_modules do
end

prepend_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-mpich/8.1.9")
scotch_ver=os.getenv("scotch_ver") or "7.0.3"
scotch_ver=os.getenv("scotch_ver") or "7.0.4"
load(pathJoin("scotch",scotch_ver))

setenv("CC", "cc")
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20231117
export BL_DATE=20231122
2 changes: 1 addition & 1 deletion tests/bl_date.ncar.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export BL_DATE=20240222
export BL_DATE=20240229

4 changes: 2 additions & 2 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export OUTPUT_GRID="'cubed_sphere_grid'"
export OUTPUT_FILE="'netcdf'"
export ZSTANDARD_LEVEL=0
export IDEFLATE=0
export NBITS=0
export QUANTIZE_NSD=0
export ICHUNK2D=0
export JCHUNK2D=0
export ICHUNK3D=0
Expand Down Expand Up @@ -1166,7 +1166,7 @@ export FILENAME_BASE="'atm' 'sfc'"
export OUTPUT_GRID="'regional_latlon'"
export OUTPUT_FILE="'netcdf'"
export IDEFLATE=0
export NBITS=0
export QUANTIZE_NSD=0
export NFHOUT=3
export NFHMAX_HF=-1
export NFHOUT_HF=3
Expand Down
1,584 changes: 792 additions & 792 deletions tests/logs/RegressionTests_hera.log
View file
Open in desktop

Large diffs are not rendered by default.

3,698 changes: 2,126 additions & 1,572 deletions tests/logs/RegressionTests_hercules.log
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion tests/parm/model_configure.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ output_grid: @[OUTPUT_GRID]
output_file: @[OUTPUT_FILE]
zstandard_level: @[ZSTANDARD_LEVEL]
ideflate: @[IDEFLATE]
nbits: @[NBITS]
quantize_mode: 'quantize_bitround'
quantize_nsd: @[QUANTIZE_NSD]
ichunk2d: @[ICHUNK2D]
jchunk2d: @[JCHUNK2D]
ichunk3d: @[ICHUNK3D]
Expand Down
3 changes: 2 additions & 1 deletion tests/parm/model_configure_atmaq.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ dt_atmos: @[DT_ATMOS]
restart_interval: @[RESTART_INTERVAL]
write_dopost: @[WRITE_DOPOST]
ideflate: @[IDEFLATE]
nbits: @[NBITS]
quantize_mode: 'quantize_bitround'
quantize_nsd: @[QUANTIZE_NSD]
quilting: @[QUILTING]

write_groups: @[WRITE_GROUP]
Expand Down
3 changes: 2 additions & 1 deletion tests/parm/model_configure_fhout.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ filename_base: @[FILENAME_BASE]
output_grid: @[OUTPUT_GRID]
output_file: @[OUTPUT_FILE]
ideflate: @[IDEFLATE]
nbits: @[NBITS]
quantize_mode: 'quantize_bitround'
quantize_nsd: @[QUANTIZE_NSD]
imo: @[IMO]
jmo: @[JMO]

Expand Down
3 changes: 2 additions & 1 deletion tests/parm/model_configure_hafs.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ ichunk3d: -1
jchunk3d: -1
kchunk3d: -1
ideflate: @[IDEFLATE]
nbits: @[NBITS]
quantize_mode: 'quantize_bitround'
quantize_nsd: @[QUANTIZE_NSD]

output_grid: @[OUTPUT_GRID] # gaussian_grid, global_latlon, regional_latlon[_moving], rotated_latlon[_moving], lambert_conformal, cubed_sphere_grid
imo: @[IMO] # number of grid points along longitude/latitude direction
Expand Down
3 changes: 2 additions & 1 deletion tests/parm/model_configure_rrfs_conus13km.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ num_files: @[NUM_FILES]
filename_base: @[FILENAME_BASE]
output_file: @[OUTPUT_FILE]
ideflate: @[IDEFLATE]
nbits: @[NBITS]
quantize_mode: 'quantize_bitround'
quantize_nsd: @[QUANTIZE_NSD]
ichunk3d: @[ICHUNK3D]
jchunk3d: @[JCHUNK3D]
kchunk3d: @[KCHUNK3D]
Expand Down
26 changes: 13 additions & 13 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ COMPILE | s2swa_32bit | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v1
RUN | cpld_control_p8_mixedmode | - noaacloud | baseline |

#GFS
COMPILE | s2swa_32bit_pdlib | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | + hera orion cheyenne wcoss2 acorn | fv3 |
RUN | cpld_control_gfsv17 | + hera orion cheyenne wcoss2 acorn | baseline |
RUN | cpld_control_gfsv17_iau | + hera orion cheyenne wcoss2 acorn | baseline | cpld_control_gfsv17
RUN | cpld_restart_gfsv17 | + hera orion cheyenne wcoss2 acorn | | cpld_control_gfsv17
RUN | cpld_mpi_gfsv17 | + hera orion cheyenne wcoss2 acorn | |
COMPILE | s2swa_32bit_pdlib | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON | - noaacloud | fv3 |
RUN | cpld_control_gfsv17 | - noaacloud | baseline |
RUN | cpld_control_gfsv17_iau | - noaacloud | baseline | cpld_control_gfsv17
RUN | cpld_restart_gfsv17 | - noaacloud | | cpld_control_gfsv17
RUN | cpld_mpi_gfsv17 | - noaacloud | |

COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 acorn | fv3 |
RUN | cpld_debug_gfsv17 | + hera orion cheyenne wcoss2 acorn | baseline |
COMPILE | s2swa_32bit_pdlib_debug | intel | -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | cpld_debug_gfsv17 | - noaacloud | baseline |

COMPILE | s2swa | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
RUN | cpld_control_p8 | - noaacloud | baseline |
Expand Down Expand Up @@ -72,13 +72,13 @@ COMPILE | s2swa_faster | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p
RUN | cpld_control_p8_faster | - cheyenne noaacloud | baseline |

# Unstructured WW3 mesh
COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera orion cheyenne wcoss2 | fv3 |
RUN | cpld_control_pdlib_p8 | + hera orion cheyenne wcoss2 | baseline |
RUN | cpld_restart_pdlib_p8 | + hera orion cheyenne wcoss2 | | cpld_control_pdlib_p8
RUN | cpld_mpi_pdlib_p8 | + hera orion cheyenne wcoss2 | | cpld_control_pdlib_p8
COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | - noaacloud | fv3 |
RUN | cpld_control_pdlib_p8 | - noaacloud | baseline |
RUN | cpld_restart_pdlib_p8 | - noaacloud | | cpld_control_pdlib_p8
RUN | cpld_mpi_pdlib_p8 | - noaacloud | | cpld_control_pdlib_p8

COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 | fv3 |
RUN | cpld_debug_pdlib_p8 | + hera orion cheyenne wcoss2 | baseline |
COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
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 |
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_c768
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export IOVR=3
export IMO=3072
export JMO=1536
export IDEFLATE=1
export NBITS=14
export QUANTIZE_NSD=14
export ICHUNK3D=${IMO}
export JCHUNK3D=${JMO}
export KCHUNK3D=1
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_wrtGauss_netcdf_parallel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export IAER=5111
export IOVR=3
export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
export IDEFLATE=1
export NBITS=14
export QUANTIZE_NSD=14

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v16
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/control_wrtGauss_netcdf_parallel_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export IAER=5111
export IOVR=3
export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
export IDEFLATE=1
export NBITS=14
export QUANTIZE_NSD=14
export OUTPUT_FH="0 1"

export FV3_RUN=control_run.IN
Expand Down