Changeset 25974

Timestamp:

02/03/21 20:06:06 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving coefficient to C

Location:

issm/trunk-jpl/src

Files:

• c/analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• m/classes/frictioncoulomb2.m (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -918 +918 @@
                 case 13:
                         iomodel->FindConstant(&FrictionCoupling,"md.friction.coupling");
-                        iomodel->FetchDataToInput(inputs,elements,"md.friction.coefficient",FrictionCEnum);
+                        iomodel->FetchDataToInput(inputs,elements,"md.friction.C",FrictionCEnum);
                         iomodel->FetchDataToInput(inputs,elements,"md.friction.m",FrictionMEnum);
                         if(FrictionCoupling==3){

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

@@ -6 +6 @@
 classdef frictioncoulomb2
         properties (SetAccess=public) 
-                coefficient              = NaN;
+                C                        = NaN;
                 m                        = NaN;
                 coupling                 = 0;
@@ -14 +14 @@
         methods
                 function self = extrude(self,md) % {{{
-                        self.coefficient=project3d(md,'vector',self.coefficient,'type','node','layer',1);
+                        self.C=project3d(md,'vector',self.C,'type','node','layer',1);
                         self.m=project3d(md,'vector',self.m,'type','element');
                         switch self.coupling
@@ -43 +43 @@
                         %Early return
                         if ~ismember('StressbalanceAnalysis',analyses) & ~ismember('ThermalAnalysis',analyses), return; end
-                        md = checkfield(md,'fieldname','friction.coefficient','timeseries',1,'NaN',1,'Inf',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]);
                         md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0 1 2]);
@@ -64 +64 @@
          disp('                (C^(2/m) |u_b| + (0.5*N)^(1/m) )^m      ');
          disp(' ');
-                        fielddisplay(self,'coefficient','power law (Weertman) friction coefficient [SI]');
+                        fielddisplay(self,'C','friction coefficient [SI]');
                         fielddisplay(self,'m','m exponent (Weertman would be 1/3)');
                         fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]');
@@ -73 +73 @@
 
                         WriteData(fid,prefix,'name','md.friction.law','data',13,'format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','m','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer');