Skip to content

Commit

Permalink
Fix the result of a bad automated merge
Browse files Browse the repository at this point in the history
  In merging in two separate pull requests that made corrections to similar
lines in the same file, three renamed variables retained their original names,
resulting in SIS2 code that does not compile.  Each of the PRs was fully tested
separately, but for whatever reason their combination was not, and the SIS2 git
repository does not seem to detect certain merge conflicts.  This PR updates
these variable names to their intended values, and the code is once more
compiling and is reproducing the intended outputs.
  • Loading branch information
Hallberg-NOAA authored and marshallward committed Feb 11, 2022
1 parent 87ff9e5 commit 236fa72
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/SIS_sum_output.F90
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ module SIS_sum_output
salt_in_col, & !< The salt that has been input to the ice and snow in a column since
!! the last time that write_ice_statistics was called [R Z kgSalt kg-1 ~> kgSalt m-2]
! These three arrays are only allocated and used for monitoring column-wise conservation.
water_col_prev, & !< The column integrated water that was in the ice and snow the last
water_cell_prev, & !< The cell integrated water that was in the ice and snow the last
!! time that write_ice_statistics was called [kg].
heat_col_prev, & !< The column integrated heat that was in the ice and snow the last
heat_cell_prev, & !< The cell integrated heat that was in the ice and snow the last
!! time that write_ice_statistics was called [J].
salt_col_prev !< The column integrated salt that was in the ice and snow the last
salt_cell_prev !< The cell integrated salt that was in the ice and snow the last
!! time that write_ice_statistics was called [kgSalt].

type(EFP_type) :: heat_prev_EFP !< The total amount of heat in the sea ice the last
Expand Down

0 comments on commit 236fa72

Please sign in to comment.