Changeset 20500 for issm/trunk/src/m/classes/frictionweertmantemp.m

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/frictionweertmantemp.m (modified) (1 diff)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

issm/trunk/src/m/classes/frictionweertmantemp.m

@@ -26 +26 @@
                         %Early return
                         if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
-                        md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1);
-                        md = checkfield(md,'fieldname','friction.m','NaN',1,'size',[md.mesh.numberofelements 1]);
+                        md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','friction.m','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
                 end % }}}
                 function disp(self) % {{{

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad