<p><b>mhoffman@lanl.gov</b> 2012-07-02 12:08:26 -0600 (Mon, 02 Jul 2012)</p><p>BRANCH COMMIT<br>
Fix for using option to prevent ice from advancing beyond initial extent.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/land_ice_projects/implement_core/src/core_land_ice/Registry
===================================================================
--- branches/land_ice_projects/implement_core/src/core_land_ice/Registry 2012-06-28 22:02:18 UTC (rev 2006)
+++ branches/land_ice_projects/implement_core/src/core_land_ice/Registry 2012-07-02 18:08:26 UTC (rev 2007)
@@ -231,7 +231,8 @@
% Masks: calculated diagnostically at each time step
-var persistent integer cellMask ( nCells Time ) 2 - cellMask state - -
+var persistent integer cellMask ( nCells Time ) 2 r cellMask state - -
+% cellMask only needs to be a restart field if config_allow_additional_advance = false (to keep the mask of initial ice extent)
var persistent integer edgeMask ( nEdges Time ) 2 - edgeMask state - -
var persistent integer vertexMask ( nVertices Time ) 2 - vertexMask state - -
% Needed for LifeV solver to know if the region to solve on the block's domain has changed (treated as a logical):
Modified: branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_mask.F
===================================================================
--- branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_mask.F 2012-06-28 22:02:18 UTC (rev 2006)
+++ branches/land_ice_projects/implement_core/src/core_land_ice/mpas_land_ice_mask.F 2012-07-02 18:08:26 UTC (rev 2007)
@@ -106,12 +106,13 @@
cellMask = 0
- if (config_allow_additional_advance .eqv. .false.) then
-
+ if (config_allow_additional_advance .eqv. .false.) then ! Need to save a mask of the initial ice extent
+ if (config_do_restart .eqv. .false.) then ! We only want to set this bit of the mask when a new simulation starts, but not during a restart.
! Bit 8: Identify points without ice initially
where (thickness == 0.0)
cellMask = MASK_VALUE_INITIALLY_NOT_ICE
end where
+ endif
endif
</font>
</pre>