Changeset 24313 for issm/trunk/src/c/classes/Loads/Friction.h

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Loads/Friction.h (modified) (2 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

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

@@ -7 +7 @@
 
 /*Headers:*/
-/*{{{*/
 class Inputs;
-class Matpar;
 class GaussPenta;
 class GaussTria;
-/*}}}*/
 
 class Friction{
 
         public:
-                int analysis_type;
-
                 Element* element;
                 int      dim;
@@ -44 +39 @@
                 void  GetAlpha2WeertmanTemp(IssmDouble* palpha2,Gauss* gauss);
                 void  GetAlpha2PISM(IssmDouble* palpha2,Gauss* gauss);
+                void  GetAlpha2Schoof(IssmDouble* palpha2,Gauss* gauss);
+                void  GetAlpha2Tsai(IssmDouble* palpha2,Gauss* gauss);
 
                 IssmDouble EffectivePressure(Gauss* gauss);
+                IssmDouble VelMag(Gauss* gauss);
 };
 

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota