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

Gcc 7 4 0 patch #2

Merged
merged 4 commits into from
Nov 1, 2019
Merged

Gcc 7 4 0 patch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
231f120
add unit scaling
MJHarrison-GFDL Oct 29, 2019
c4606e1
fix restart fail for tc4 and some cleanup
MJHarrison-GFDL Oct 29, 2019
8a52f40
Merge branch 'gcc_7_4_0_patch' of github.com:MJHarrison-GFDL/MOM6 int…
MJHarrison-GFDL Oct 29, 2019
251b0d9
remove trailiny ws
MJHarrison-GFDL Oct 29, 2019
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
5 changes: 5 additions & 0 deletions .testing/tc4/MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,11 @@ DAYMAX = 0.25 ! [days]
! The final time of the whole simulation, in units of TIMEUNIT seconds. This
! also sets the potential end time of the present run segment if the end time is
! not set via ocean_solo_nml in input.nml.

ENERGYSAVEDAYS = 0.125 ! [days] default = 1.44E+04
! The interval in units of TIMEUNIT between saves of the
! energies of the run and other globally summed diagnostics.

RESTART_CONTROL = 3 ! default = 1
! An integer whose bits encode which restart files are written. Add 2 (bit 1)
! for a time-stamped file, and odd (bit 0) for a non-time-stamped file. A
Expand Down
4 changes: 2 additions & 2 deletions src/initialization/MOM_state_initialization.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,8 +1864,8 @@ subroutine initialize_sponges_file(G, GV, US, use_temperature, tv, param_file, C
call MOM_read_data(filename, salin_var, tmp(:,:,:), G%Domain)
call set_up_sponge_field(tmp, tv%S, G, nz, CSp)
elseif (use_temperature) then
call set_up_ALE_sponge_field(filename, potemp_var, Time, G, GV, tv%T, ALE_CSp)
call set_up_ALE_sponge_field(filename, salin_var, Time, G, GV, tv%S, ALE_CSp)
call set_up_ALE_sponge_field(filename, potemp_var, Time, G, GV, US, tv%T, ALE_CSp)
call set_up_ALE_sponge_field(filename, salin_var, Time, G, GV, US, tv%S, ALE_CSp)
endif

end subroutine initialize_sponges_file
Expand Down
Loading