Changeset 17051

Timestamp:

12/23/13 13:40:17 (11 years ago)

Author:

Eric.Larour

Message:

CHG: make coefficient a forcing.

Location:

issm/trunk-jpl/src/m/classes

Files:

• friction.m (modified) (2 diffs)
• friction.py (modified) (1 diff)

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

@@ -26 +26 @@
                         %Early return
                         if ~ismember(StressbalanceAnalysisEnum(),analyses) & ~ismember(ThermalAnalysisEnum(),analyses), return; end
-
-                        md = checkfield(md,'fieldname','friction.coefficient','NaN',1,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1);
                         md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements 1]);
                         md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements 1]);
@@ -38 +37 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1);
+                        yts=365.0*24.0*3600.0;
+
+                        WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
+                        %WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','p','format','DoubleMat','mattype',2);
                         WriteData(fid,'object',obj,'fieldname','q','format','DoubleMat','mattype',2);
+                        
+
                 end % }}}
         end

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

@@ -38 +38 @@
                         return md
 
-                md = checkfield(md,'fieldname','friction.coefficient','NaN',1,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'fieldname','friction.coefficient','forcing',1,'NaN',1)
                 md = checkfield(md,'fieldname','friction.q','NaN',1,'size',[md.mesh.numberofelements])
                 md = checkfield(md,'fieldname','friction.p','NaN',1,'size',[md.mesh.numberofelements])