Skip to content

Commit

Permalink
create branch for WW3 netcdf work
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeniseWorthen
DeniseWorthen committed Aug 27, 2024
1 parent fcc9f84 commit b089f61
Show file tree
Hide file tree
Showing 15 changed files with 143 additions and 10 deletions.
6 changes: 4 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
branch = develop
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
branch = dev/ufs-weather-model
#url = https://github.com/NOAA-EMC/WW3
#branch = dev/ufs-weather-model
url = https://github.com/DeniseWorthen/WW3
branch = feature/restartnc
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/NOAA-PSL/stochastic_physics
Expand Down
2 changes: 1 addition & 1 deletion WW3
Submodule WW3 updated 16 files
+1 −0 model/bin/switch_meshcap_pdlib_bt4
+6 −5 model/src/CMakeLists.txt
+4 −1 model/src/cmake/src_list.cmake
+96 −52 model/src/w3initmd.F90
+39 −14 model/src/w3iogoncmd.F90
+616 −0 model/src/w3iogoncmd_pio.F90
+15 −56 model/src/w3iorsmd.F90
+24 −18 model/src/w3odatmd.F90
+152 −157 model/src/w3wavemd.F90
+108 −74 model/src/wav_comp_nuopc.F90
+37 −16 model/src/wav_grdout.F90
+598 −198 model/src/wav_import_export.F90
+387 −0 model/src/wav_pio_mod.F90
+309 −0 model/src/wav_restart_mod.F90
+8 −11 model/src/wav_shel_inp.F90
+1 −1 model/src/wmwavemd.F90
25 changes: 23 additions & 2 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,17 @@ export_ww3() {
export WW3_ICE='C'
export WW3_IC1='F'
export WW3_IC5='F'
export WW3_user_sets_restname="true"
export WW3_user_sets_histname='false'
export WW3_historync='false'
export WW3_user_sets_restname='true'
export WW3_restartnc='false'
export WW3_restart_from_binary='false'
# For either history_nc or restart_nc true
export WW3_PIO_FORMAT='pnetcdf'
export WW3_PIO_STRIDE=-99
export WW3_PIO_IOTASKS=-99
export WW3_PIO_REARR='box'
export WW3_PIO_ROOT=-99
}

# Defaults for the coupled 5-component
Expand Down Expand Up @@ -1113,7 +1123,7 @@ export NY_GLB=320
export NPZ=127
export NPZP=128

# Use updated omega calculations if
# Use updated omega calculations if
# hydrostatic is set to false
if [[ "${HYDROSTATIC}" == .false. ]]; then
export UPDATE_FULL_OMEGA=.true.
Expand Down Expand Up @@ -1444,6 +1454,17 @@ export_hafs_regional ()
export WW3_MODDEF=mod_def.${WW3_DOMAIN}
export WW3_ICE='F'
export WW3_OUTPARS="WND HS T01 T02 DIR FP DP PHS PTP PDIR UST CHA USP"
export WW3_user_sets_histname='false'
export WW3_historync='false'
export WW3_user_sets_restname='true'
export WW3_restartnc='false'
export WW3_restart_from_binary='false'
# For either history_nc or restart_nc true
export WW3_PIO_FORMAT='pnetcdf'
export WW3_PIO_STRIDE=-99
export WW3_PIO_IOTASKS=-99
export WW3_PIO_REARR='box'
export WW3_PIO_ROOT=-99

# Set CMEPS component defaults
export_cmeps
Expand Down
11 changes: 10 additions & 1 deletion tests/parm/ufs.configure.atmw.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,16 @@ WAV_attributes::
Verbosity = 0
OverwriteSlice = false
mesh_wav = @[MESH_WAV]
user_sets_restname = true
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::


Expand Down
11 changes: 10 additions & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,16 @@ WAV_attributes::
OverwriteSlice = false
merge_import = .true.
mesh_wav = @[MESH_WAV]
user_sets_restname = true
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# Run Sequence #
Expand Down
11 changes: 10 additions & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,16 @@ WAV_attributes::
OverwriteSlice = false
merge_import = .false.
mesh_wav = @[MESH_WAV]
user_sets_restname = true
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# Run Sequence #
Expand Down
11 changes: 10 additions & 1 deletion tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,16 @@ WAV_attributes::
OverwriteSlice = false
merge_import = .false.
mesh_wav = @[MESH_WAV]
user_sets_restname = true
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# Run Sequence #
Expand Down
11 changes: 10 additions & 1 deletion tests/parm/ufs.configure.hafs_atm_wav.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,16 @@ WAV_attributes::
OverwriteSlice = false
merge_import = .true.
mesh_wav = @[MESH_WAV]
user_sets_restname = true
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# Run Sequence #
Expand Down
9 changes: 9 additions & 0 deletions tests/parm/ufs.configure.s2sw.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,16 @@ WAV_attributes::
Verbosity = 0
OverwriteSlice = false
mesh_wav = @[MESH_WAV]
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# CMEPS warm run sequence
Expand Down
9 changes: 9 additions & 0 deletions tests/parm/ufs.configure.s2sw_esmf.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,16 @@ WAV_attributes::
Verbosity = 0
OverwriteSlice = false
mesh_wav = @[MESH_WAV]
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# CMEPS warm run sequence
Expand Down
9 changes: 9 additions & 0 deletions tests/parm/ufs.configure.s2sw_fast_esmf.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,16 @@ WAV_attributes::
Verbosity = 0
OverwriteSlice = false
mesh_wav = @[MESH_WAV]
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# CMEPS warm run sequence
Expand Down
9 changes: 9 additions & 0 deletions tests/parm/ufs.configure.s2swa.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,16 @@ WAV_attributes::
Verbosity = 0
OverwriteSlice = false
mesh_wav = @[MESH_WAV]
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# CMEPS warm run sequence
Expand Down
9 changes: 9 additions & 0 deletions tests/parm/ufs.configure.s2swa_esmf.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,16 @@ WAV_attributes::
Verbosity = 0
OverwriteSlice = false
mesh_wav = @[MESH_WAV]
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# CMEPS warm run sequence
Expand Down
9 changes: 9 additions & 0 deletions tests/parm/ufs.configure.s2swa_fast_esmf.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,16 @@ WAV_attributes::
Verbosity = 0
OverwriteSlice = false
mesh_wav = @[MESH_WAV]
user_sets_histname=@[WW3_user_sets_histname]
use__historync=@[WW3_historync]
user_sets_restname = @[WW3_user_sets_restname]
use_restartnc = @[WW3_restartnc]
restart_from_binary = @[WW3_restart_from_binary]
pio_typename = @[WW3_PIO_FORMAT]
pio_numiotasks = @[WW3_PIO_IOTASKS]
pio_stride = @[WW3_PIO_STRIDE]
pio_rearranger = @[WW3_PIO_REARR]
pio_root = @[WW3_PIO_ROOT]
::

# CMEPS warm run sequence
Expand Down
11 changes: 11 additions & 0 deletions tests/tests/atmwav_control_noaero_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@ export wav_model=ww3
export WW3_MULTIGRID=false
export WW3_MODDEF=mod_def.glo_1deg
export MESH_WAV=mesh.glo_1deg.nc
export WW3_user_sets_histname='false'
export WW3_historync='false'
export WW3_user_sets_restname='true'
export WW3_restartnc='false'
export WW3_restart_from_binary='false'
# For either history_nc or restart_nc true
export WW3_PIO_FORMAT='pnetcdf'
export WW3_PIO_STRIDE=-99
export WW3_PIO_IOTASKS=-99
export WW3_PIO_REARR='box'
export WW3_PIO_ROOT=-99

# ufs.configure
export coupling_interval_sec=${DT_ATMOS}
Expand Down

0 comments on commit b089f61

Please sign in to comment.