Changeset 24686 for issm/trunk/src/c/analyses/ExtrapolationAnalysis.h

Timestamp:

04/01/20 21:54:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24684

Location:

issm/trunk

Files:

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

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

@@ -17 +17 @@
         void CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr=false);
         int  DofsPerNode(int** doflist,int domaintype,int approximation);
-        void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
+        void UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type);
         void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum);
 
@@ -26 +26 @@
         ElementMatrix* CreateKMatrix(Element* element);
         ElementVector* CreatePVector(Element* element);
-        void           GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss, int dim);
-        void           GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss, int dim);
         void           GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element);
         void           GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index);