Changeset 18955

Timestamp:

12/09/14 00:53:09 (10 years ago)

Author:

jbondzio

Message:

CHG: Allow transient forcing of calvingrate and meltingrate in md.calving

Location:

issm/trunk-jpl/src/m/classes

Files:

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

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

@@ -60 +60 @@
                         %Early return
                         if (solution~=TransientSolutionEnum() | md.transient.iscalving==0), return; end
-                        md = checkfield(md,'fieldname','calving.calvingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0);
-                        md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices 1],'>=',0);
+                        md = checkfield(md,'fieldname','calving.calvingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1);
+                        md = checkfield(md,'fieldname','calving.meltingrate(1:md.mesh.numberofvertices,:)','>=',0,'forcing',1,'NaN',1);
                 end % }}}
                 function disp(obj) % {{{

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

@@ -38 +38 @@
                         return md
 
-                md = checkfield(md,'fieldname','calving.calvingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0)
-                md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0)
+                md = checkfield(md,'fieldname','calving.calvingrate[1:md.mesh.numberofvertices,:]','>=',0,'forcing',1,'NaN',1);
+                md = checkfield(md,'fieldname','calving.meltingrate[1:md.mesh.numberofvertices,:]','>=',0,'forcing',1,'NaN',1);
+
                 return md
         # }}}