Changeset 25201 for issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp

Timestamp:

07/03/20 06:23:13 (5 years ago)

Author:

Cheng Gong

Message:

NEW: add an inversion of the friciton coefficient in Schoof's friction law.
In order to reuse the default code of the Budd's law, the coefficient C in Schoof's law is changed to C=sqrt(C_old).
The name of the control_parameter in Schoof's law is called 'FrictionC'.

File:

• issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp (modified) (6 diffs)

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

@@ -1103 +1103 @@
         if(control_type!=MaterialsRheologyBbarEnum && 
                 control_type!=FrictionCoefficientEnum   &&
+                control_type!=FrictionCEnum   &&
                 control_type!=FrictionAsEnum   && 
                 control_type!=DamageDbarEnum            &&
@@ -1126 +1127 @@
         switch(control_type){
                 case FrictionCoefficientEnum:
+                case FrictionCEnum:
                         switch(approximation){
                                 case SSAApproximationEnum: GradientJDragSSA(element,gradient,control_index); break;
@@ -1652 +1654 @@
         /*Intermediaries*/
         int      domaintype,dim;
+        int frictionlaw;
         Element* basalelement;
 
@@ -1690 +1693 @@
         basalelement->GetVerticesCoordinates(&xyz_list);
         basalelement->GradientIndexing(&vertexpidlist[0],control_index);
-        Input2* dragcoefficient_input = basalelement->GetInput2(FrictionCoefficientEnum);                _assert_(dragcoefficient_input);
+
+        /* get the friction law: if 11-Schoof, use a special name for the coefficient*/
+        element->FindParam(&frictionlaw, FrictionLawEnum);
+        Input2* dragcoefficient_input;
+        switch(frictionlaw) {
+                case 11:
+                        dragcoefficient_input = basalelement->GetInput2(FrictionCEnum); _assert_(dragcoefficient_input);
+                        break;
+                default:
+                        dragcoefficient_input = basalelement->GetInput2(FrictionCoefficientEnum); _assert_(dragcoefficient_input);
+        }
+
         DatasetInput2* weights_input         = basalelement->GetDatasetInput2(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input);
 
@@ -1939 +1953 @@
         /*Fetch number of vertices for this finite element*/
         int numvertices = basalelement->GetNumberOfVertices();
+        int frictionlaw;
 
         /*Initialize some vectors*/
@@ -1955 +1970 @@
         Input2* adjointx_input  = basalelement->GetInput2(AdjointxEnum);             _assert_(adjointx_input);
         Input2* adjointy_input  = basalelement->GetInput2(AdjointyEnum);             _assert_(adjointy_input);
-        Input2* dragcoeff_input = basalelement->GetInput2(FrictionCoefficientEnum);  _assert_(dragcoeff_input);
+
+        /* get the friction law: 1- Budd, 11-Schoof*/
+        element->FindParam(&frictionlaw, FrictionLawEnum);
+        Input2* dragcoeff_input;
+        switch(frictionlaw) {
+                case 1:
+                        dragcoeff_input = basalelement->GetInput2(FrictionCoefficientEnum); _assert_(dragcoeff_input);
+                        break;
+                case 11:
+                        dragcoeff_input = basalelement->GetInput2(FrictionCEnum); _assert_(dragcoeff_input);
+                        break;
+                default:
+                        _error_("Friction law "<< frictionlaw <<" not supported in the inversion.");
+        }
 
         /* Start  looping on the number of gaussian points: */