Changeset 24335 for issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h

Timestamp:

11/15/19 16:28:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Inputs2, TODO: still AMR, GEMB and DC do not work, and need to delete current Inputs

File:

• issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h

@@ -9 +9 @@
 #include "./Analysis.h"
 class Node;
-class Input;
+class Input2;
 class HydrologyDCInefficientAnalysis: public Analysis{
 
@@ -16 +16 @@
                 int  DofsPerNode(int** doflist,int domaintype,int approximation);
                 void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum);
-                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 CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr=false);
                 void CreateConstraints(Constraints* constraints,IoModel* iomodel);
@@ -34 +34 @@
                 /*Intermediaries*/
                 void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss);
-                IssmDouble SedimentStoring(Element* element, Gauss* gauss, Input* sed_head_input, Input* base_input);
-                IssmDouble SedimentTransmitivity(Element* element,Gauss* gauss,Input* sed_head_input, Input* base_input,Input* SedTrans_input);
+                IssmDouble SedimentStoring(Element* element, Gauss* gauss, Input2* sed_head_input, Input2* base_input);
+                IssmDouble SedimentTransmitivity(Element* element,Gauss* gauss,Input2* sed_head_input, Input2* base_input,Input2* SedTrans_input);
                 void GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode);
                 IssmDouble GetHydrologyKMatrixTransfer(Element* element);
-                IssmDouble GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_head_input);
+                IssmDouble GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input2* epl_head_input);
                 void ElementizeEplMask(FemModel* femmodel);
                 void HydrologyIDSGetMask(Vector<IssmDouble>* vec_mask, Element* element);