Skip to content

Commit

Permalink
Merge pull request #42 from billsacks/usrf0_consistency_revert
Browse files Browse the repository at this point in the history
Revert PR #40

This didn't work: it resulted in the ice mask being 1 everywhere.

See #39 (comment)

We'll fix this later (see #41)
  • Loading branch information
billsacks authored Sep 1, 2021
2 parents ed80880 + f9ba23f commit a1487a9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions libglad/glad_output_states.F90
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ logical function is_in_active_grid(geometry, i, j)
! TODO(wjs, 2015-03-18) Could the logic here be replaced by the use of some existing
! mask? For now I am simply re-implementing the logic that was in glint.
!
! (2021-08-31) See also comments in https://github.com/ESCOMP/CISM/issues/39
! (2021-09-01) See also https://github.com/ESCOMP/CISM/issues/41

usrf = thk0 * geometry%usrf(i,j)

if (usrf >= 0.d0) then
! points at or above sea level are assumed to be land or ice sheet
if (usrf > 0.d0) then
! points not at sea level are assumed to be land or ice sheet
is_in_active_grid = .true.
else
is_in_active_grid = .false.
Expand Down

0 comments on commit a1487a9

Please sign in to comment.