Changeset 14769 for issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h

Timestamp:

04/26/13 15:33:39 (12 years ago)

Author:

bdef

Message:

NEW: split HydrologyDC in 2 sub analyses, and added penalties for the sediment layer

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h ¶

@@ -24 +24 @@
 void  CreateParametersControl(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type);
 void  CreateParametersDakota(Parameters** pparameters,IoModel* iomodel,char* rootpath,int solution_type,int analysis_type);
-void  CreateParametersHydrology(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type);
+void  CreateParametersHydrologyShreve(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type);
+void  CreateParametersHydrologyDCInefficient(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type);
+void  CreateParametersHydrologyDCEfficient(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type);
 void  UpdateElementsAndMaterialsControl(Elements* elements,Materials* materials, IoModel* iomodel);
 
@@ -79 +81 @@
 void    UpdateElementsEnthalpy(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
 
-/*hydrology:*/
-void    CreateNodesHydrology(Nodes** pnodes,IoModel* iomodel);
-void    CreateConstraintsHydrology(Constraints** pconstraints,IoModel* iomodel);
-void  CreateLoadsHydrology(Loads** ploads, IoModel* iomodel);
-void    UpdateElementsHydrology(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
+/*hydrology Shreve:*/
+void    CreateNodesHydrologyShreve(Nodes** pnodes,IoModel* iomodel);
+void    CreateConstraintsHydrologyShreve(Constraints** pconstraints,IoModel* iomodel);
+void  CreateLoadsHydrologyShreve(Loads** ploads, IoModel* iomodel);
+void    UpdateElementsHydrologyShreve(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
+
+/*hydrology DC:*/
+void    CreateNodesHydrologyDCInefficient(Nodes** pnodes,IoModel* iomodel);
+void    CreateConstraintsHydrologyDCInefficient(Constraints** pconstraints,IoModel* iomodel);
+void  CreateLoadsHydrologyDCInefficient(Loads** ploads, IoModel* iomodel);
+void    UpdateElementsHydrologyDCInefficient(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
+void    CreateNodesHydrologyDCEfficient(Nodes** pnodes,IoModel* iomodel);
+void    CreateConstraintsHydrologyDCEfficient(Constraints** pconstraints,IoModel* iomodel);
+void  CreateLoadsHydrologyDCEfficient(Loads** ploads, IoModel* iomodel);
+void    UpdateElementsHydrologyDCEfficient(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
 
 /*melting:*/