Changeset 18301 for issm/trunk/src/c/analyses/DamageEvolutionAnalysis.h

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/analyses/DamageEvolutionAnalysis.h (modified) (1 diff)

issm/trunk/src/c/analyses/DamageEvolutionAnalysis.h

@@ -29 +29 @@
                 void GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss);
                 void GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element);
+                void GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index);
                 void InputUpdateFromSolution(IssmDouble* solution,Element* element);
                 void UpdateConstraints(FemModel* femmodel);
 
                 /*Intermediaries*/
-                void CreateDamageFInput(Element* element);
+                void CreateDamageFInputPralong(Element* element);
+                void CreateDamageFInputExp(Element* element);
 };
 #endif