Changeset 27626

Timestamp:

03/01/23 07:51:05 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: make AD work with Tikhonov and schoof

File:

• issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp

@@ -116 +116 @@
 IssmDouble Cfdragcoeffabsgrad::Cfdragcoeffabsgrad_Calculation(Element* element, int weights_enum){/*{{{*/
 
-        int        domaintype,numcomponents;
+        int        domaintype,numcomponents,frictionlaw;
         IssmDouble Jelem=0.;
         IssmDouble Jdet;
@@ -145 +145 @@
         /*Get input if it already exists*/
         DatasetInput *datasetinput = basalelement->GetDatasetInput(definitionenum);  _assert_(datasetinput);
-        Input        *drag_input   = basalelement->GetInput(FrictionCoefficientEnum); _assert_(drag_input);
+        Input        *drag_input   = NULL;
+
+        /* get the friction law: if 2-Weertman, 11-Schoof or 14-RegularizedCoulomb, which has a different names of C */
+        element->FindParam(&frictionlaw, FrictionLawEnum);
+        switch(frictionlaw) {
+                case 2:
+                case 11:
+                case 14:
+                        drag_input = basalelement->GetInput(FrictionCEnum); _assert_(drag_input);
+                        break;
+                default:
+                        drag_input = basalelement->GetInput(FrictionCoefficientEnum); _assert_(drag_input);
+        }
+
 
         /* Start  looping on the number of gaussian points: */