Changeset 21600

Timestamp:

03/10/17 11:27:34 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added gamma as a parameter to frictionjosh

Location:

issm/trunk-jpl/src

Files:

• c/analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• c/analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• c/classes/Loads/Friction.cpp (modified) (1 diff)
• m/classes/frictionjosh.m (modified) (5 diffs)

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

@@ -245 +245 @@
         if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
         if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
+        if(frictionlaw==9) parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
 }/*}}}*/
 

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

@@ -895 +895 @@
         if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
         if(frictionlaw==5) parameters->AddObject(iomodel->CopyConstantObject("md.friction.f",FrictionFEnum));
+        if(frictionlaw==9) parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
 
 }/*}}}*/

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -493 +493 @@
         /*Compute gamma*/
         element->parameters->FindParam(&time,TimeEnum);
-        if(time<25e3*yts){
-                gamma = 10.;
-        }
-        else{
-                gamma = 5.;
-        }
-        gamma = 5.;
+        element->parameters->FindParam(&gamma,FrictionGammaEnum);
+        //if(time<25e3*yts){
+        //      gamma = 10.;
+        //}
+        //else{
+        //      gamma = 5.;
+        //}
+        //gamma = 5.;
 
         /*Compute scaling parameter*/

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

@@ -8 +8 @@
                 coefficient = NaN;
                 pressure_adjusted_temperature = NaN;
+                gamma      = 0.;
         end
         methods
@@ -26 +27 @@
                 function self = setdefaultparameters(self) % {{{
 
+                        %Default gamma: 1
+                        self.gamma = 1.;
+
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -34 +38 @@
                         md = checkfield(md,'fieldname','friction.coefficient','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','friction.pressure_adjusted_temperature','NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','friction.gamma','numel',1,'NaN',1,'Inf',1,'>',0.);
 
                         %Check that temperature is provided
@@ -42 +47 @@
                         fielddisplay(self,'coefficient','friction coefficient [SI]');
                         fielddisplay(self,'pressure_adjusted_temperature','friction pressure_adjusted_temperature (T - Tpmp) [K]');
+                        fielddisplay(self,'gamma','(T - Tpmp)/gamma [K]');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -48 +54 @@
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','pressure_adjusted_temperature','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','gamma','format','Double');
                 end % }}}
         end