Skip to content

Commit

Permalink
MOM6: set descale in reproducing_sum_3d
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@7ca5ed9f2 set descale in reproducing_sum_3d
- NOAA-GFDL/MOM6@7846b80c1 +Add a vector of defaults to get_param_array_int
- NOAA-GFDL/MOM6@81ea4b696 Corrected the rescaling of 5 KPP diagnostics
- NOAA-GFDL/MOM6@fcf5fffdd Move MOM_generic_tracer with no changes (NOAA-GFDL#22)
- NOAA-GFDL/MOM6@45add79dd Updates to use EPBL_BBL_EFFIC - The present code only tests BBL_EFFIC when deciding whether to set the bottom TKE and ustar, but this means they are all zero when EPBL_BBL_EFFIC is non-zero and BBL_EFFIC is zero. - Adds logic to also check EPBL_BBL_EFFIC, thereby allowing non-zero ustar and TKE for EPBL_BBL_EFFIC>0.0 - Fixed BBL_TKE diagnostic in EPBL that was not populated. - Will change answers when EPBL_BBL_EFFIC>0.0, but won't change answers in any of our existing configurations.
- NOAA-GFDL/MOM6@956449305 Update MOM_wave_interface.F90 (#784)
- NOAA-GFDL/MOM6@9371bb02c Recover diagnostic "SSH_inst"
- NOAA-GFDL/MOM6@8062d20d9 Minor change of SSH check in extract_surface_state
- NOAA-GFDL/MOM6@dae622625 Fix indexing error in extract_surface_state
- NOAA-GFDL/MOM6@e6e08702c Bug fix related to directional internal wave drag (#774)
- NOAA-GFDL/MOM6@a4d13e825 Use reproducing_sum with unscale in 5 places
- NOAA-GFDL/MOM6@8dcb6a46b Work in rescaled units in write_energy
- NOAA-GFDL/MOM6@7060d51ef +Add RZL2_to_kg element to unit_scale_type
- NOAA-GFDL/MOM6@a3cef876b +Add optional unscale argument to reproducing_sum
  • Loading branch information
mom6bot committed Jan 6, 2025
1 parent b61847f commit 15fd85d
Show file tree
Hide file tree
Showing 82 changed files with 83 additions and 83 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 6 !
! in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 5 !
! in SIS2_memory.h at compile time.
LAYOUT = 6, 5 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 6 !
! in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ NJPROC_FAST = 5 !
! in SIS2_memory.h at compile time.
LAYOUT_FAST = 6, 5 !
! The processor layout that was actually used.
IO_LAYOUT_FAST = 1, 1 ! default = 1
IO_LAYOUT_FAST = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 6 !
! in SIS2_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 6 !
! in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ NJPROC_FAST = 5 !
! in SIS2_memory.h at compile time.
LAYOUT_FAST = 6, 5 !
! The processor layout that was actually used.
IO_LAYOUT_FAST = 1, 1 ! default = 1
IO_LAYOUT_FAST = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 6 !
! in SIS2_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/Baltic/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in SIS2_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down Expand Up @@ -74,6 +74,6 @@ NJPROC_FAST = 1 !
! in SIS2_memory.h at compile time.
LAYOUT_FAST = 2, 1 !
! The processor layout that was actually used.
IO_LAYOUT_FAST = 1, 1 ! default = 1
IO_LAYOUT_FAST = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@ TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False
USE_PREVIOUS_TIDES = False ! [Boolean] default = False
! If true, use the SAL from the previous iteration of the tides to facilitate
! convergent iteration. This is only used if TIDES is true.
TIDE_REF_DATE = 0, 0, 0 ! default = 0
TIDE_REF_DATE = 0, 0, 0 ! default = 0, 0, 0
! Year,month,day to use as reference date for tidal forcing. If not specified,
! defaults to 0.
TIDE_USE_EQ_PHASE = False ! [Boolean] default = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in SIS2_memory.h at compile time.
LAYOUT = 2, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 8 !
! in MOM_memory.h at compile time.
LAYOUT = 4, 8 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 8 !
! in SIS2_memory.h at compile time.
LAYOUT = 4, 8 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 4 !
! in MOM_memory.h at compile time.
LAYOUT = 2, 4 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 4 !
! in SIS2_memory.h at compile time.
LAYOUT = 2, 4 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 18 !
! in MOM_memory.h at compile time.
LAYOUT = 32, 18 !
! The processor layout that was actually used.
IO_LAYOUT = 2, 2 ! default = 1
IO_LAYOUT = 2, 2 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 18 !
! in SIS2_memory.h at compile time.
LAYOUT = 32, 18 !
! The processor layout that was actually used.
IO_LAYOUT = 2, 2 ! default = 1
IO_LAYOUT = 2, 2 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_05/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 20 !
! in MOM_memory.h at compile time.
LAYOUT = 21, 20 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_05/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 20 !
! in SIS2_memory.h at compile time.
LAYOUT = 21, 20 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 10 !
! in MOM_memory.h at compile time.
LAYOUT = 12, 10 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 10 !
! in SIS2_memory.h at compile time.
LAYOUT = 12, 10 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/SIS2/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 6 !
! in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/SIS2/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 6 !
! in SIS2_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 6 !
! in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 6 !
! in SIS2_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ NJPROC = 6 !
! in MOM_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.layout
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 6 !
! in SIS2_memory.h at compile time.
LAYOUT = 10, 6 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.
NIBLOCK = 1 ! default = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ NJPROC = 1 !
! in MOM_memory.h at compile time.
LAYOUT = 1, 1 !
! The processor layout that was actually used.
IO_LAYOUT = 1, 1 ! default = 1
IO_LAYOUT = 1, 1 ! default = 1, 1
! The processor layout to be used, or 0,0 to automatically set the io_layout to
! be the same as the layout.

Expand Down
Loading

0 comments on commit 15fd85d

Please sign in to comment.