Changeset 18804

Timestamp:

11/18/14 11:25:37 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding new sliding law for Kevin, Temperature dependent

Location:

issm/trunk-jpl/src

Files:

• c/analyses/EnthalpyAnalysis.cpp (modified) (2 diffs)
• c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• c/analyses/ThermalAnalysis.cpp (modified) (2 diffs)
• c/classes/Loads/Friction.cpp (modified) (4 diffs)
• c/classes/Loads/Friction.h (modified) (1 diff)
• m/classes/frictionweertmantemp.m (added)

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

@@ -30 +30 @@
         int frictionlaw;
         iomodel->Constant(&frictionlaw,FrictionLawEnum);
-        if(frictionlaw==4) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
+        if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
 }/*}}}*/
 void EnthalpyAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
@@ -120 +120 @@
                         iomodel->FetchDataToInput(elements,FrictionWaterLayerEnum);
                         break;
+                case 6:
+                        iomodel->FetchDataToInput(elements,FrictionCEnum);
+                        iomodel->FetchDataToInput(elements,FrictionMEnum);
+                        iomodel->FetchDataToInput(elements,PressureEnum);
+                        iomodel->FetchDataToInput(elements,TemperatureEnum);
+                        break;
                 default:
                         _error_("not supported");

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

@@ -133 +133 @@
         int frictionlaw;
         iomodel->Constant(&frictionlaw,FrictionLawEnum);
-        if(frictionlaw==4) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
+        if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
 
 }/*}}}*/
@@ -285 +285 @@
                         iomodel->FetchDataToInput(elements,FrictionQEnum);
                         iomodel->FetchDataToInput(elements,FrictionWaterLayerEnum);
+                        break;
+                case 6:
+                        iomodel->FetchDataToInput(elements,FrictionCEnum);
+                        iomodel->FetchDataToInput(elements,FrictionMEnum);
+                        iomodel->FetchDataToInput(elements,PressureEnum);
+                        iomodel->FetchDataToInput(elements,TemperatureEnum);
                         break;
                 default:

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

@@ -28 +28 @@
         iomodel->DeleteData(&requestedoutputs,numoutputs,ThermalRequestedOutputsEnum);
 
+        /*Deal with friction parameters*/
+        int frictionlaw;
+        iomodel->Constant(&frictionlaw,FrictionLawEnum);
+        if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
 }/*}}}*/
 void ThermalAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
@@ -108 +112 @@
                         iomodel->FetchDataToInput(elements,FrictionWaterLayerEnum);
                         break;
+                case 6:
+                        iomodel->FetchDataToInput(elements,FrictionCEnum);
+                        iomodel->FetchDataToInput(elements,FrictionMEnum);
+                        iomodel->FetchDataToInput(elements,PressureEnum);
+                        iomodel->FetchDataToInput(elements,TemperatureEnum);
+                        break;
                 default:
                         _error_("not supported");

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

@@ -57 +57 @@
                 case 5:
                         GetAlpha2WaterLayer(palpha2,gauss);
+                        break;
+                case 6:
+                        GetAlpha2WeertmanTemp(palpha2,gauss);
                         break;
           default:
@@ -233 +236 @@
         /*Here, we want to parameterize the friction as a function of temperature
          *
-         * alpha2 = alpha2_viscous * f(T)
+         * alpha2 = alpha2_viscous * 1/f(T)
          *
          * where f(T) = exp((T-Tpmp)/gamma)
@@ -252 +255 @@
         /*Compute scaling parameter*/
         element->parameters->FindParam(&gamma,FrictionGammaEnum);
-        alpha2 = alpha2*exp((T-Tpmp)/gamma);
+        alpha2 = alpha2 / exp((T-Tpmp)/gamma);
 
         /*Assign output pointers:*/
@@ -318 +321 @@
         *palpha2=alpha2;
 }/*}}}*/
+void Friction::GetAlpha2WeertmanTemp(IssmDouble* palpha2, Gauss* gauss){/*{{{*/
+        /*Here, we want to parameterize the friction as a function of temperature
+         *
+         * alpha2 = alpha2_weertman * 1/f(T)
+         *
+         * where f(T) = exp((T-Tpmp)/gamma)
+         */
+
+        /*Intermediaries: */
+        IssmDouble  f,T,pressure,Tpmp,gamma;
+        IssmDouble  alpha2;
+
+        /*Get viscous part*/
+        this->GetAlpha2Weertman(&alpha2,gauss);
+
+        /*Get pressure melting point (Tpmp) for local pressure and get current temperature*/
+        element->GetInputValue(&T,gauss,TemperatureEnum);
+        element->GetInputValue(&pressure,gauss,PressureEnum);
+        Tpmp = element->TMeltingPoint(pressure);
+
+        /*Compute scaling parameter*/
+        element->parameters->FindParam(&gamma,FrictionGammaEnum);
+        alpha2 = alpha2 / exp((T-Tpmp)/gamma);
+
+        /*Assign output pointers:*/
+        *palpha2=alpha2;
+}/*}}}*/
 void Friction::GetAlphaComplement(IssmDouble* palpha_complement, Gauss* gauss){/*{{{*/
 

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

@@ -35 +35 @@
                 void  GetAlpha2Temp(IssmDouble* palpha2,Gauss* gauss);
                 void  GetAlpha2WaterLayer(IssmDouble* palpha2,Gauss* gauss);
+                void  GetAlpha2WeertmanTemp(IssmDouble* palpha2,Gauss* gauss);
                 void  GetAlphaComplement(IssmDouble* alpha_complement,Gauss* gauss);
 };