From b275e1267d1a6f4cfa16f4f99a365c16f4a50125 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Wed, 1 Sep 2021 17:14:02 -0600 Subject: [PATCH] Revert "Make usrf condition in is_in_active_grid consistent with other checks" This reverts commit 3b899f4cc249a4e740e17458049cead4a71376cf. This didn't work: it resulted in the ice mask being 1 everywhere. See https://github.com/ESCOMP/CISM/issues/39#issuecomment-910863395 We'll fix this later (see https://github.com/ESCOMP/CISM/issues/41) --- libglad/glad_output_states.F90 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libglad/glad_output_states.F90 b/libglad/glad_output_states.F90 index 181f6699..d54fbae9 100644 --- a/libglad/glad_output_states.F90 +++ b/libglad/glad_output_states.F90 @@ -119,13 +119,11 @@ 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 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.