Changeset 25836 for issm/trunk/src/c/analyses/BalancevelocityAnalysis.h

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses/BalancevelocityAnalysis.h (modified) (2 diffs)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

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

@@ -17 +17 @@
                 void CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr=false);
                 int  DofsPerNode(int** doflist,int domaintype,int approximation);
-                void UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type);
+                void UpdateElements(Elements* elements,Inputs* inputs,IoModel* iomodel,int analysis_counter,int analysis_type);
                 void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum);
 
@@ -27 +27 @@
                 ElementVector* CreatePVector(Element* element);
                 void           GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element);
-                void           GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index);
+                void           GradientJ(Vector<IssmDouble>* gradient,Element*  element,int control_type,int control_interp,int control_index);
                 void           InputUpdateFromSolution(IssmDouble* solution,Element* element);
                 void           UpdateConstraints(FemModel* femmodel);

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post