Changeset 18961

Timestamp:

12/15/14 02:33:22 (10 years ago)

Author:

jbondzio

Message:

ADD: extrude calving.meltingrate

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.m (modified) (1 diff)
• model.py (modified) (1 diff)

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

@@ -835 +835 @@
                         % Calving variables
                         if isa(md.calving,'calving'),md.calving.calvingrate=project3d(md,'vector',md.calving.calvingrate,'type','node');end;
+                        if ~isnan(md.calving.meltingrate),md.calving.meltingrate=project3d(md,'vector',md.calving.meltingrate,'type','node');end;
                         if isa(md.calving,'calvinglevermann'),md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node');end;
                         if isa(md.calving,'calvingpi'),md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node');end;

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

@@ -669 +669 @@
                 if isinstance(md.calving,calvinglevermann):
                         md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node')
+                if isinstance(md.calving,calvingpi):
+                        md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node')
+                if not numpy.any(numpy.isnan(md.calving.meltingrate)):
+                        md.calving.meltingrate=project3d(md,'vector',md.calving.meltingrate,'type','node')
 
                 # Hydrologydc variables