Changeset 18378

Timestamp:

08/13/14 13:44:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed some issues related to melting_rates with old models

File:

• issm/trunk-jpl/src/m/classes/model.m (modified) (3 diffs)

issm/trunk-jpl/src/m/classes/model.m

@@ -221 +221 @@
 
                         %special for thermal modeling:
-                        md.basalforcings.groundedice_melting_rate=project2d(md,md.basalforcings.groundedice_melting_rate,1); 
-                        md.basalforcings.floatingice_melting_rate=project2d(md,md.basalforcings.floatingice_melting_rate,1); 
+                        if ~isnan(md.basalforcings.groundedice_melting_rate),
+                                md.basalforcings.groundedice_melting_rate=project2d(md,md.basalforcings.groundedice_melting_rate,1); 
+                        end
+                        if ~isnan(md.basalforcings.floatingice_melting_rate),
+                                md.basalforcings.floatingice_melting_rate=project2d(md,md.basalforcings.floatingice_melting_rate,1); 
+                        end
                         md.basalforcings.geothermalflux=project2d(md,md.basalforcings.geothermalflux,1); %bedrock only gets geothermal flux
 
@@ -238 +242 @@
                         md.geometry.bed=project2d(md,md.geometry.bed,1);
 
-                        md.mask.groundedice_levelset=project2d(md,md.mask.groundedice_levelset,1);
-                        md.mask.ice_levelset=project2d(md,md.mask.ice_levelset,1);
+                        if ~isnan(md.mask.groundedice_levelset),
+                                md.mask.groundedice_levelset=project2d(md,md.mask.groundedice_levelset,1);
+                        end
+                        if ~isnan(md.mask.ice_levelset),
+                                md.mask.ice_levelset=project2d(md,md.mask.ice_levelset,1);
+                        end
 
                         %lat long
@@ -825 +833 @@
                         if isfield(structmd,'p'), md.friction.p=structmd.p; end
                         if isfield(structmd,'q'), md.friction.q=structmd.p; end
-                        if isfield(structmd,'melting'), md.basalforcings.melting_rate=structmd.melting; end
+                        if isfield(structmd,'melting'), md.basalforcings.floatingice_melting_rate=structmd.melting; end
                         if isfield(structmd,'melting_rate'), md.basalforcings.floatingice_melting_rate=structmd.melting_rate; end
+                        if isfield(structmd,'melting_rate'), md.basalforcings.groundedice_melting_rate=structmd.melting_rate; end
                         if isfield(structmd,'accumulation'), md.surfaceforcings.mass_balance=structmd.accumulation; end
                         if isfield(structmd,'numberofgrids'), md.mesh.numberofvertices=structmd.numberofgrids; end