Changeset 3703

Timestamp:

05/11/10 08:28:39 (15 years ago)

Author:

Eric.Larour

Message:

Big commit

Location:

issm/trunk/src/c

Files:

• ComputeBasalStressx/ComputeBasalStressx.cpp (modified) (1 diff)
• ComputePressurex/ComputePressurex.cpp (modified) (1 diff)
• ComputeStrainRatex/ComputeStrainRatex.cpp (modified) (1 diff)
• Dofx/Dofx.cpp (modified) (1 diff)
• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp (modified) (1 diff)
• ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp (modified) (1 diff)
• ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp (modified) (1 diff)
• ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp (modified) (1 diff)
• ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp (modified) (1 diff)
• ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp (modified) (1 diff)
• ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp (modified) (1 diff)
• ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp (modified) (1 diff)
• ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp (modified) (1 diff)
• ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (modified) (1 diff)
• ModelProcessorx/Melting/CreateConstraintsMelting.cpp (modified) (1 diff)
• ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp (modified) (1 diff)
• ModelProcessorx/Melting/CreateLoadsMelting.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp (modified) (1 diff)
• ModelProcessorx/Qmu/CreateParametersQmu.cpp (modified) (1 diff)
• ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp (modified) (1 diff)
• ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp (modified) (1 diff)
• ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp (modified) (1 diff)
• ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (modified) (1 diff)
• ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp (modified) (1 diff)
• ModelProcessorx/Thermal/CreateLoadsThermal.cpp (modified) (1 diff)
• PenaltyConstraintsx/PenaltyConstraintsx.cpp (modified) (1 diff)
• ProcessParamsx/ProcessParamsx.cpp (modified) (1 diff)
• Qmux/DakotaResponses.cpp (modified) (5 diffs)
• Qmux/SpawnCoreParallel.cpp (modified) (2 diffs)
• UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp (modified) (2 diffs)
• UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h (modified) (1 diff)
• UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp (modified) (2 diffs)
• UpdateInputsFromVectorx/UpdateInputsFromVectorx.h (modified) (1 diff)
• objects/Constraints/Rgb.h (modified) (1 diff)
• objects/Constraints/Spc.h (modified) (1 diff)
• objects/DofVec.h (modified) (2 diffs)
• objects/Elements/Beam.cpp (modified) (1 diff)
• objects/Elements/Beam.h (modified) (2 diffs)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Sing.h (modified) (1 diff)
• objects/Elements/Tria.h (modified) (2 diffs)
• objects/FemModel.cpp (modified) (1 diff)
• objects/FemModel.h (modified) (1 diff)
• objects/Inputs/BeamVertexInput.h (modified) (1 diff)
• objects/Inputs/BoolInput.h (modified) (1 diff)
• objects/Inputs/DoubleInput.h (modified) (1 diff)
• objects/Inputs/IntInput.h (modified) (1 diff)
• objects/Inputs/PentaVertexInput.h (modified) (1 diff)
• objects/Inputs/SingVertexInput.h (modified) (1 diff)
• objects/Inputs/TriaVertexInput.h (modified) (1 diff)
• objects/IoModel.cpp (modified) (2 diffs)
• objects/IoModel.h (modified) (1 diff)
• objects/Loads/Icefront.h (modified) (1 diff)
• objects/Loads/Numericalflux.h (modified) (1 diff)
• objects/Loads/Pengrid.h (modified) (1 diff)
• objects/Loads/Penpair.h (modified) (1 diff)
• objects/Loads/Riftfront.h (modified) (1 diff)
• objects/Materials/Material.h (modified) (1 diff)
• objects/Materials/Matice.h (modified) (1 diff)
• objects/Materials/Matpar.h (modified) (1 diff)
• objects/Model.cpp (modified) (1 diff)
• objects/Model.h (modified) (1 diff)
• objects/Node.h (modified) (2 diffs)
• objects/Object.h (modified) (1 diff)
• objects/Params/BoolParam.h (modified) (1 diff)
• objects/Params/DoubleMatParam.h (modified) (1 diff)
• objects/Params/DoubleParam.h (modified) (1 diff)
• objects/Params/DoubleVecParam.h (modified) (1 diff)
• objects/Params/IntParam.h (modified) (1 diff)
• objects/Params/Param.h (modified) (1 diff)
• objects/Params/PetscMatParam.h (modified) (1 diff)
• objects/Params/PetscVecParam.h (modified) (1 diff)
• objects/Params/StringArrayParam.h (modified) (1 diff)
• objects/Params/StringParam.h (modified) (1 diff)
• objects/Result.h (modified) (2 diffs)
• objects/SolPar.h (modified) (1 diff)
• objects/Vertex.h (modified) (2 diffs)
• parallel/ProcessResults.cpp (modified) (17 diffs)
• parallel/convergence.cpp (modified) (1 diff)
• parallel/diagnostic_core.cpp (modified) (1 diff)
• parallel/steadystate.cpp (modified) (1 diff)

issm/trunk/src/c/ComputeBasalStressx/ComputeBasalStressx.cpp

@@ -22 +22 @@
 
         /*Recover numberofelements: */
-        found= parameters->FindParam(&numberofelements,"numberofelements");
+        found= parameters->FindParam(&numberofelements,NumberOfElementsEnum);
         if (!found) ISSMERROR("numberofelements not provided in parameters");
 

issm/trunk/src/c/ComputePressurex/ComputePressurex.cpp

@@ -22 +22 @@
 
         /*Recover numberofnodes: */
-    parameters->FindParam(&numberofnodes,"numberofnodes");
+    parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
 
         /*Allocate p_g on numberofnodes (only 1 dof): */

issm/trunk/src/c/ComputeStrainRatex/ComputeStrainRatex.cpp

@@ -22 +22 @@
 
         /*Recover numberofelements: */
-        parameters->FindParam(&numberofelements,"numberofelements");
+        parameters->FindParam(&numberofelements,NumberOfElementsEnum);
 
         /*Allocate eps on numberofelements (only 1 dof): */

issm/trunk/src/c/Dofx/Dofx.cpp

@@ -36 +36 @@
 
         /*First, recover number of vertices and nodes from parameters: */
-        found=parameters->FindParam(&numberofvertices,"numberofvertices");
+        found=parameters->FindParam(&numberofvertices,NumberOfVerticesEnum);
         if(!found)ISSMERROR(" could not find numberofvertices in parameters");
         
-        found=parameters->FindParam(&numberofnodes,"numberofnodes");
+        found=parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
         if(!found)ISSMERROR(" could not find numberofnodes in parameters");
 
         /*Recover number of dofs per node: */
-        found=parameters->FindParam(&numberofdofspernode,"numberofdofspernode");
+        found=parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum);
         if(!found)ISSMERROR(" could not find numberofdofspernode in parameters");
 

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -222 +222 @@
         IsStokesEnum,
         VerboseEnum,
-        EpsRes,
-        EpsRel,
-        EpsAbs,
+        EpsResEnum,
+        EpsRelEnum,
+        EpsAbsEnum,
         EpsCmEnum,
         MaxNonlinearIterationsEnum,

issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp

@@ -24 +24 @@
 
         /*Initioalize intermediary*/
-        found=parameters->FindParam(&numberofvertices,"numberofvertices");
+        found=parameters->FindParam(&numberofvertices,NumberOfVerticesEnum);
         connectivity=NewVec(numberofvertices);
         fieldsum    =NewVec(numberofvertices);

issm/trunk/src/c/Makefile.am

@@ -121 +121 @@
                                         ./objects/NodeSets.cpp\
                                         ./objects/NodeSets.h\
+                                        ./DataSet/DataSet.h\
                                         ./DataSet/DataSet.cpp\
-                                        ./DataSet/DataSet.h\
+                                        ./DataSet/Parameters.cpp\
+                                        ./DataSet/Inputs.cpp\
                                         ./shared/shared.h\
                                         ./shared/Alloc/alloc.h\
@@ -544 +546 @@
                                         ./objects/NodeSets.cpp\
                                         ./objects/NodeSets.h\
+                                        ./DataSet/DataSet.h\
                                         ./DataSet/DataSet.cpp\
-                                        ./DataSet/DataSet.h\
+                                        ./DataSet/Parameters.cpp\
+                                        ./DataSet/Inputs.cpp\
                                         ./shared/shared.h\
                                         ./shared/Threads/issm_threads.h\

issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp

@@ -4 +4 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp

@@ -8 +8 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
+#include "../../io/io.h"
 #include "../ModelProcessorx.h"
 

issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp

@@ -3 +3 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -9 +9 @@
 #include "../shared/shared.h"
 #include "../MeshPartitionx/MeshPartitionx.h"
+#include "../io/io.h"
 
 void CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Melting/CreateConstraintsMelting.cpp

@@ -4 +4 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../include/typedefs.h"

issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

@@ -6 +6 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../io/io.h"
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp

@@ -8 +8 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
+#include "../../io/io.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
 #include "../../include/typedefs.h"

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp

@@ -7 +7 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"
+#include "../../io/io.h"
 #include "../../shared/shared.h"
 #include "../../include/macros.h"

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp

@@ -6 +6 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"
+#include "../../io/io.h"
 #include "../../shared/shared.h"
 #include "../../include/macros.h"

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp

@@ -5 +5 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp

@@ -8 +8 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
+#include "../../io/io.h"
 #include "../../include/macros.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp

@@ -4 +4 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp

@@ -4 +4 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp

@@ -3 +3 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

@@ -4 +4 @@
 
 #include "../../DataSet/DataSet.h"
+#include "../../io/io.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp

@@ -5 +5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

@@ -4 +4 @@
 #include "../../DataSet/DataSet.h"
 #include "../../toolkits/toolkits.h"
+#include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"

issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp

@@ -25 +25 @@
 
         /*recover parameters: */
-        parameters->FindParam(&min_mechanical_constraints,"min_mechanical_constraints");
+        parameters->FindParam(&min_mechanical_constraints,MinMechanicalConstraintsEnum);
 
         /*First, get nodes and loads configured: */

issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp

@@ -32 +32 @@
 
         /*Some parameters needed: */
-        parameters->FindParam(&numberofvertices,"numberofvertices");
+        parameters->FindParam(&numberofvertices,NumberOfVerticesEnum);
 
         /*serialize partition vector: */

issm/trunk/src/c/Qmux/DakotaResponses.cpp

@@ -25 +25 @@
 
         /*some data needed across the responses: */
-        model->FindParam(&numberofnodes,"numberofnodes");
+        model->FindParam(&numberofnodes,NumberOfNodesEnum);
 
 
@@ -233 +233 @@
 
                         /*retrieve active fem model: */
-                        model->FindParam(&isstokes,"isstokes");
-                        model->FindParam(&ismacayealpattyn,"ismacayealpattyn");
-                        model->FindParam(&ishutter,"ishutter");
+                        model->FindParam(&isstokes,IsStokesEnum);
+                        model->FindParam(&ismacayealpattyn,IsMacayealPattynEnum);
+                        model->FindParam(&ishutter,IsHutterEnum);
 
                         if(isstokes){
@@ -249 +249 @@
 
                         /*Recover some parameters: */
-                        femmodel->parameters->FindParam(&numberofdofspernode,"numberofdofspernode");
-                        femmodel->parameters->FindParam(&numberofnodes,"numberofnodes");
-                        femmodel->parameters->FindParam(&fit,NULL,NULL,"fit");
+                        femmodel->parameters->FindParam(&numberofdofspernode,NumberOfDofsPernodeEnum);
+                        femmodel->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
+                        femmodel->parameters->FindParam(&fit,NULL,NULL,FitEnum);
 
                         /*Recover velocity: */
@@ -299 +299 @@
                 
                         /*retrieve active fem model: */
-                        model->FindParam(&isstokes,"isstokes");
-                        model->FindParam(&ismacayealpattyn,"ismacayealpattyn");
-                        model->FindParam(&ishutter,"ishutter");
+                        model->FindParam(&isstokes,IsStokesEnum);
+                        model->FindParam(&ismacayealpattyn,IsMacayealPattynEnum);
+                        model->FindParam(&ishutter,IsHutterEnum);
 
                         if(isstokes){
@@ -314 +314 @@
 
                         /*retrieve qmu_mass_flux_segments: */
-                        param=(Param*)femmodel->parameters->FindParamObject("qmu_mass_flux_segments");
+                        param=(Param*)femmodel->parameters->FindParamObject(QmuMassFluxSegmentsEnum);
                         if(!param)ISSMERROR(" could not find qmu_mass_flux_segments to compute mass_flux");
                         

issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp

@@ -57 +57 @@
         
         /*some parameters needed: */
-        model->FindParam(&verbose,"verbose");
+        model->FindParam(&verbose,VerboseEnum);
                 
         /*First off, recover the response descriptors for the response functions: */
-        param=(Param*)model->GetFormulation(DiagnosticAnalysisEnum,HorizAnalysisEnum)->parameters->FindParamObject("responsedescriptors");
+        param=(Param*)model->GetFormulation(DiagnosticAnalysisEnum,HorizAnalysisEnum)->parameters->FindParamObject(ResponseDescriptorsEnum);
         if(!param)ISSMERROR(" could not find response descriptors!");
 
@@ -66 +66 @@
 
         /*Recover partitioning for dakota: */
-        model->FindParam(&qmu_npart,"qmu_npart");
-        model->FindParam(&qmu_part,NULL,NULL,"qmu_part");
+        model->FindParam(&qmu_npart,QmuNpartEnum);
+        model->FindParam(&qmu_part,NULL,NULL,QmuPartEnum);
 
         /*broadcast variables: only cpu 0 has correct values*/

issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp

@@ -9 +9 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 
-int UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){
+void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){
 
-        int noerr=1;
-        int i;
+        double* serial_solution=NULL;
 
-        int  found=0;
-        extern int num_procs;
-        extern int my_rank;
-        double* serial_solution=NULL;
+        /*Serialize solution, so that elements can index into it on every CPU: */
+        VecToMPISerial(&serial_solution,solution);
 
         /*First, get elements and loads configured: */
@@ -25 +22 @@
         parameters->Configure(elements,loads, nodes,vertices, materials,parameters);
 
-        /*Serialize solution, so that elements can index into it on every CPU: */
-        VecToMPISerial(&serial_solution,solution);
-
-        /*Update elements, nodes, loads and materials from inputs: */
+        
+        /*Elements drive the update: */
         elements->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        nodes->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        vertices->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        loads->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        materials->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
-        parameters->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);
 
         /*Free ressources:*/
         xfree((void**)&serial_solution);
 
-        return noerr;
-
 }

issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h

@@ -10 +10 @@
 
 /* local prototypes: */
-int             UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type);
+void            UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type);
 
 #endif  /* _UPDATEINPUTSXX_H */

issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp

@@ -9 +9 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 
-int UpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){
+void UpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){
 
         /*First, get elements and loads configured: */
@@ -18 +18 @@
 
         /*Update elements, nodes, loads and materials from inputs: */
-        elements->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type);
-        nodes->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type);
-        vertices->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type);
-        loads->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type);
-        materials->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type);
-        parameters->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type);
-
-        return noerr;
+        elements->UpdateInputsFromVector(vector,NameEnum,TypeEnum);
+        nodes->UpdateInputsFromVector(vector,NameEnum,TypeEnum);
+        vertices->UpdateInputsFromVector(vector,NameEnum,TypeEnum);
+        loads->UpdateInputsFromVector(vector,NameEnum,TypeEnum);
+        materials->UpdateInputsFromVector(vector,NameEnum,TypeEnum);
+        parameters->UpdateInputsFromVector(vector,NameEnum,TypeEnum);
 
 }

issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.h

@@ -10 +10 @@
 
 /* local prototypes: */
-int             UpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,double* vector, int NameEnum,int TypeEnum);
+void    UpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials,  Parameters* parameters,double* vector, int NameEnum,int TypeEnum);
 
 #endif  /* _UPDATEINPUTSXX_H */

issm/trunk/src/c/objects/Constraints/Rgb.h

@@ -34 +34 @@
                 int    Id(); 
                 int    MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*non virtual: */

issm/trunk/src/c/objects/Constraints/Spc.h

@@ -39 +39 @@
                 double GetValue();
                 Object* copy();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
 };

issm/trunk/src/c/objects/DofVec.h

@@ -47 +47 @@
                 int   MyRank();
                 int   Size();
-        
-
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
                 Object* copy();
 
@@ -62 +62 @@
                 
                 double* GetValuesFromIndex(int index_size,int* index);
-                
+                                
 
 };

issm/trunk/src/c/objects/Elements/Beam.cpp

@@ -139 +139 @@
                 nodeinputs[0]=iomodel->weights[index];
                 nodeinputs[1]=iomodel->weights[(int)(iomodel->uppernodes[index]-1)];
-                this->inputs->AddInput(new BeamVertexInput(WeightszEnum,nodeinputs));
+                this->inputs->AddInput(new BeamVertexInput(WeightsEnum,nodeinputs));
         }       
         if (iomodel->gridonbed) this->inputs->AddInput(new BoolInput(ElementOnBedEnum,(IssmBool)iomodel->gridonbed[index]));

issm/trunk/src/c/objects/Elements/Beam.h

@@ -53 +53 @@
                 Object* copy();
                 void  SetClone(int* minranks);
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
+
 
                 /*}}}*/
@@ -58 +61 @@
                 void  CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type);
                 void  CreatePVector(Vec pg,  int analysis_type,int sub_analysis_type);
-                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
                 void  GetDofList(int* doflist,int* pnumberofdofs);
                 void  GetDofList1(int* doflist);

issm/trunk/src/c/objects/Elements/Element.h

@@ -28 +28 @@
                 virtual void   CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type)=0;
                 virtual void   CreatePVector(Vec pg,  int analysis_type,int sub_analysis_type)=0;
-                virtual void   UpdateInputsFromSolutionFromSolution(double* solution, int analysis_type, int sub_analysis_type)=0;
                 virtual void   GetNodes(void** nodes)=0;
                 virtual void*  GetMatPar()=0;

issm/trunk/src/c/objects/Elements/Penta.h

@@ -140 +140 @@
                 void  UpdateInputsFromSolutionBalancedthickness2( double* solution,int analysis_type,int sub_analysis_type);
                 void  UpdateInputsFromSolutionBalancedvelocities( double* solution,int analysis_type,int sub_analysis_type);
+                void  UpdateInputsFromVector(double* vector, int name, int type);
                 void AddInput(double value, int enum_type){ISSMERROR("not supporte yet!");}
 

issm/trunk/src/c/objects/Elements/Sing.h

@@ -53 +53 @@
                 void  SetClone(int* minranks);
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
+
                 /*}}}*/
                 /*numerics: {{{1*/
                 void  CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type);
                 void  CreatePVector(Vec pg,  int analysis_type,int sub_analysis_type);
-                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
-                void  GetDofList(int* doflist,int* pnumberofdofs);
+                                void  GetDofList(int* doflist,int* pnumberofdofs);
                 void  GetDofList1(int* doflist);
                 void  CreateKMatrixDiagnosticHutter(Mat Kgg,int analysis_type,int sub_analysis_type);

issm/trunk/src/c/objects/Elements/Tria.h

@@ -50 +50 @@
                 int   MyRank();
                 void  SetClone(int* minranks);
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
+
                 /*}}}*/
                 /*FUNCTION element numerical routines {{{1*/
@@ -117 +120 @@
                 /*updates:*/
                 void  UpdateFromDakota(void* inputs);
-                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
                 void  UpdateInputsFromSolutionDiagnosticHoriz( double* solution,int analysis_type,int sub_analysis_type);
                 void  UpdateInputsFromSolutionSlopeCompute( double* solution,int analysis_type,int sub_analysis_type);

issm/trunk/src/c/objects/FemModel.cpp

@@ -305 +305 @@
 }
 /*}}}*/
+/*FUNCTION FemModel::UpdateInputsFromVector(double* vector, int name, int type){{{1*/
+void FemModel::UpdateInputsFromVector(double* vector, int name, int type){
+
+        elements->UpdateInputsFromVector(vector,name,type);
+        nodes->UpdateInputsFromVector(vector,name,type);
+        vertices->UpdateInputsFromVector(vector,name,type);
+        loads->UpdateInputsFromVector(vector,name,type);
+        materials->UpdateInputsFromVector(vector,name,type);
+        parameters->UpdateInputsFromVector(vector,name,type);
+
+}
+/*}}}*/
+/*FUNCTION FemModel::UpdateInputsFromSolution(double* vector, int name, int type){{{1*/
+void FemModel::UpdateInputsFromSolution(double* vector, int name, int type){
+
+        elements->UpdateInputsFromSolution(vector,name,type);
+        nodes->UpdateInputsFromSolution(vector,name,type);
+        vertices->UpdateInputsFromSolution(vector,name,type);
+        loads->UpdateInputsFromSolution(vector,name,type);
+        materials->UpdateInputsFromSolution(vector,name,type);
+        parameters->UpdateInputsFromSolution(vector,name,type);
+
+}
+/*}}}*/

issm/trunk/src/c/objects/FemModel.h

@@ -79 +79 @@
                 Mat      get_Gmn(void);
 
+                void    UpdateInputsFromVector(double* vector, int name, int type);
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
+
 };
 

issm/trunk/src/c/objects/Inputs/BeamVertexInput.h

@@ -38 +38 @@
                 Object* copy();
                 int   EnumType();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Inputs/BoolInput.h

@@ -38 +38 @@
                 Object* copy();
                 int   EnumType();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Inputs/DoubleInput.h

@@ -38 +38 @@
                 Object* copy();
                 int   EnumType();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Inputs/IntInput.h

@@ -38 +38 @@
                 Object* copy();
                 int   EnumType();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Inputs/PentaVertexInput.h

@@ -37 +37 @@
                 Object* copy();
                 int   EnumType();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Inputs/SingVertexInput.h

@@ -37 +37 @@
                 Object* copy();
                 int   EnumType();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Inputs/TriaVertexInput.h

@@ -37 +37 @@
                 Object* copy();
                 int   EnumType();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/IoModel.cpp

@@ -60 +60 @@
         xfree((void**)&this->vx_obs);
         xfree((void**)&this->vy_obs);
+        xfree((void**)&this->vz_obs);
         xfree((void**)&this->vx);
         xfree((void**)&this->vy);
@@ -254 +255 @@
         this->vx_obs=NULL;
         this->vy_obs=NULL;
+        this->vz_obs=NULL;
         this->vx=NULL;
         this->vy=NULL;

issm/trunk/src/c/objects/IoModel.h

@@ -61 +61 @@
                 double*  vx_obs;
                 double*  vy_obs;
+                double*  vz_obs;
 
                 /*qmu: */

issm/trunk/src/c/objects/Loads/Icefront.h

@@ -50 +50 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Loads/Numericalflux.h

@@ -45 +45 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Numerics: {{{1*/

issm/trunk/src/c/objects/Loads/Pengrid.h

@@ -51 +51 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*FUNCTION element numerical routines {{{1*/

issm/trunk/src/c/objects/Loads/Penpair.h

@@ -43 +43 @@
                 void  PenaltyCreatePVector(Vec pg,double kmax,int analysis_type,int sub_analysis_type);
                 Object* copy();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
 };

issm/trunk/src/c/objects/Loads/Riftfront.h

@@ -60 +60 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
                 /*}}}*/

issm/trunk/src/c/objects/Materials/Material.h

@@ -26 +26 @@
                 virtual void  Demarshall(char** pmarshalled_dataset)=0;
                 virtual void  UpdateFromInputs(void* inputs)=0;
+                virtual void  UpdateInputsFromVector(double* vector, int name, int type)=0;
+                virtual void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type)=0;
+
                 int           Enum();
                 

issm/trunk/src/c/objects/Materials/Matice.h

@@ -45 +45 @@
                 double GetB();
                 double GetN();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
 };

issm/trunk/src/c/objects/Materials/Matpar.h

@@ -57 +57 @@
                 double GetMeltingPoint();
                 Object* copy();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
 
 };

issm/trunk/src/c/objects/Model.cpp

@@ -454 +454 @@
 }
 /*}}}1*/
+/*FUNCTION Model::UpdateInputsFromVector(double* vector,int name, int type);{{{1*/
+void  Model::UpdateInputsFromVector(double* vector,int name, int type){
+
+        int i;
+        FemModel* femmodel=NULL;
+
+        for(i=0;i<this->femmodels->Size();i++){
+                femmodel=(FemModel*)this->femmodels->GetObjectByOffset(i);
+                femmodel->UpdateInputsFromVector(vector,name,type);
+        }
+
+}
+/*}}}1*/
+/*FUNCTION Model::UpdateInputsFromSolution(double* vector,int analysis_type, int sub_analysis_type);{{{1*/
+void  Model::UpdateInputsFromSolution(double* vector,int analysis_type, int sub_analysis_type){
+
+        int i;
+        FemModel* femmodel=NULL;
+
+        for(i=0;i<this->femmodels->Size();i++){
+                femmodel=(FemModel*)this->femmodels->GetObjectByOffset(i);
+                femmodel->UpdateInputsFromSolution(vector,analysis_type,sub_analysis_type);
+        }
+
+}
+/*}}}1*/

issm/trunk/src/c/objects/Model.h

@@ -53 +53 @@
                 FemModel* GetFormulation(int analysis_type);
 
+                void    UpdateInputsFromVector(double* vector, int name, int type);
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);
+
                 FemModel* GetActiveFormulation();
                 void* SetActiveFormulation(FemModel* femmodel);

issm/trunk/src/c/objects/Node.h

@@ -10 +10 @@
 #include "./Object.h"
 #include "./DofObject.h"
+#include "../shared/shared.h"
 class  Inputs;
 class  Hook;
@@ -50 +51 @@
                 int   MyRank(void);
                 void  SetVertexDof(int in_dof);
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*FUNCTION numerical routines {{{1*/

issm/trunk/src/c/objects/Object.h

@@ -25 +25 @@
                 virtual int   Enum()=0;
                 virtual Object* copy()=0;
-                
+                virtual void  UpdateInputsFromVector(double* vector, int name, int type)=0;
+                virtual void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type)=0;
         
 };

issm/trunk/src/c/objects/Params/BoolParam.h

@@ -39 +39 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/DoubleMatParam.h

@@ -41 +41 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/DoubleParam.h

@@ -39 +39 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/DoubleVecParam.h

@@ -40 +40 @@
                 int   MarshallSize();
                 int   MyRank();
+                void  UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/IntParam.h

@@ -39 +39 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/Param.h

@@ -32 +32 @@
                 virtual char* GetParameterName(void)=0;
                 virtual void  SetMatlabField(mxArray* dataref)=0;
+
                 /*}}}*/
 

issm/trunk/src/c/objects/Params/PetscMatParam.h

@@ -39 +39 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/PetscVecParam.h

@@ -39 +39 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/StringArrayParam.h

@@ -41 +41 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Params/StringParam.h

@@ -39 +39 @@
                 int   MarshallSize();
                 int   MyRank();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
+
                 /*}}}*/
                 /*Param methods: {{{1*/

issm/trunk/src/c/objects/Result.h

@@ -43 +43 @@
                 int   Enum();
                 Object* copy();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
 
                 double GetTime();
@@ -52 +54 @@
                 char*  GetFieldName();
 
+        
 };
 

issm/trunk/src/c/objects/SolPar.h

@@ -39 +39 @@
                 int   Enum();
                 Object* copy();
+                void    UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
 
                 /*functionality: */
                 void  Configure(void* parameters,int analysis_type,int sub_analysis_type);
-                
+
+                        
 };
 #endif  /* _SOLPAR_H */

issm/trunk/src/c/objects/Vertex.h

@@ -11 +11 @@
 #include "./DofObject.h"
 class IoModel;
+#include "../shared/Exceptions/exceptions.h"
+#include "../include/macros.h"
+
 /*}}}*/
+
 
 class Vertex: public Object,public DofObject{
@@ -46 +50 @@
                 void  UpdateFromDakota(void* vinputs);
                 void  UpdatePosition(double* thickness,double* bed);
+                void  UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void  UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");}
 
 

issm/trunk/src/c/parallel/ProcessResults.cpp

@@ -112 +112 @@
         
         /*some flags needed: */
-        model->FindParam(&dim,"dim");
-        model->FindParam(&ishutter,"ishutter");
-        model->FindParam(&isstokes,"isstokes");
-        model->FindParam(&ismacayealpattyn,"ismacayealpattyn");
+        model->FindParam(&dim,DimEnum);
+        model->FindParam(&ishutter,IsHutterEnum);
+        model->FindParam(&isstokes,IsStokesEnum);
+        model->FindParam(&ismacayealpattyn,IsMacayealPattynEnum);
 
         /*Recover femmodels first: */
@@ -158 +158 @@
                                 /*ok, 2 dofs, on number of nodes: */
                                 if(ismacayealpattyn){
-                                        fem_dh->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                        fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                         VecToMPISerial(&partition,fem_dh->partition->vector);
-                                        fem_dh->parameters->FindParam(&yts,"yts");
+                                        fem_dh->parameters->FindParam(&yts,YtsEnum);
                                 }
                                 else{
-                                        fem_dhu->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                        fem_dhu->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                         VecToMPISerial(&partition,fem_dhu->partition->vector);
-                                        fem_dhu->parameters->FindParam(&yts,"yts");
+                                        fem_dhu->parameters->FindParam(&yts,YtsEnum);
                                 }
                                 vx=(double*)xmalloc(numberofnodes*sizeof(double));
@@ -184 +184 @@
                                         /*ok, 3 dofs, on number of nodes: */
                                         if(ismacayealpattyn){
-                                                fem_dh->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                                fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                                 VecToMPISerial(&partition,fem_dh->partition->vector);
-                                                fem_dh->parameters->FindParam(&yts,"yts");
+                                                fem_dh->parameters->FindParam(&yts,YtsEnum);
                                         }
                                         else{
-                                                fem_dhu->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                                fem_dhu->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                                 VecToMPISerial(&partition,fem_dhu->partition->vector);
-                                                fem_dhu->parameters->FindParam(&yts,"yts");
+                                                fem_dhu->parameters->FindParam(&yts,YtsEnum);
                                         }
                                         vx=(double*)xmalloc(numberofnodes*sizeof(double));
@@ -207 +207 @@
                                 else{
                                         /* 4 dofs on number of nodes. discard pressure: */
-                                        fem_ds->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                        fem_ds->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                         VecToMPISerial(&partition,fem_ds->partition->vector);
-                                        fem_ds->parameters->FindParam(&yts,"yts");
+                                        fem_ds->parameters->FindParam(&yts,YtsEnum);
                                         vx=(double*)xmalloc(numberofnodes*sizeof(double));
                                         vy=(double*)xmalloc(numberofnodes*sizeof(double));
@@ -252 +252 @@
                         if(!isstokes){
                                 if(ismacayealpattyn){
-                                        fem_dh->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                        fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                         VecToMPISerial(&partition,fem_dh->partition->vector);
                                 }
                                 else{
-                                        fem_dhu->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                        fem_dhu->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                         VecToMPISerial(&partition,fem_dhu->partition->vector);
                                 }
                         }
                         else{
-                                fem_ds->parameters->FindParam(&numberofnodes,"numberofnodes");
+                                fem_ds->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                                 VecToMPISerial(&partition,fem_ds->partition->vector);
                         }
@@ -285 +285 @@
                         result->GetField(&t_g);
                         VecToMPISerial(&t_g_serial,t_g);
-                        fem_t->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_t->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_t->partition->vector);
 
@@ -309 +309 @@
                         result->GetField(&grad_g);
                         VecToMPISerial(&grad_g_serial,grad_g);
-                        fem_c->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_c->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_c->partition->vector);
 
@@ -332 +332 @@
                         result->GetField(&m_g);
                         VecToMPISerial(&m_g_serial,m_g);
-                        fem_t->parameters->FindParam(&numberofnodes,"numberofnodes");
-                        fem_t->parameters->FindParam(&yts,"yts");
+                        fem_t->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
+                        fem_t->parameters->FindParam(&yts,YtsEnum);
                         VecToMPISerial(&partition,fem_t->partition->vector);
 
@@ -356 +356 @@
                         result->GetField(&h_g);
                         VecToMPISerial(&h_g_serial,h_g);
-                        fem_p->parameters->FindParam(&numberofvertices,"numberofvertices");
+                        fem_p->parameters->FindParam(&numberofvertices,NumberOfVerticesEnum);
                         VecToMPISerial(&partition,fem_p->partition->vector);
 
@@ -379 +379 @@
                         result->GetField(&v_g);
                         VecToMPISerial(&v_g_serial,v_g);
-                        fem_p->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_p->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_p->partition->vector);
 
@@ -402 +402 @@
                         result->GetField(&s_g);
                         VecToMPISerial(&s_g_serial,s_g);
-                        fem_p->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_p->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_p->partition->vector);
 
@@ -425 +425 @@
                         result->GetField(&sx_g);
                         VecToMPISerial(&sx_g_serial,sx_g);
-                        fem_sl->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_sl->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_sl->partition->vector);
 
@@ -448 +448 @@
                         result->GetField(&sy_g);
                         VecToMPISerial(&sy_g_serial,sy_g);
-                        fem_sl->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_sl->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_sl->partition->vector);
 
@@ -471 +471 @@
                         result->GetField(&b_g);
                         VecToMPISerial(&b_g_serial,b_g);
-                        fem_p->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_p->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_p->partition->vector);
 
@@ -493 +493 @@
                         /*easy, param_g is of size numberofnodes, on 1 dof, just repartition: */
                         result->GetField(&param_g);
-                        fem_dh->parameters->FindParam(&numberofnodes,"numberofnodes");
+                        fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum);
                         VecToMPISerial(&partition,fem_dh->partition->vector);
 
@@ -513 +513 @@
                 else if(strcmp(result->GetFieldName(),"riftproperties")==0){
                         result->GetField(&riftproperties);
-                        fem_dh->parameters->FindParam(&numrifts,"numrifts");
+                        fem_dh->parameters->FindParam(&numrifts,NumRiftsEnum);
                         VecToMPISerial(&riftproperties_serial,riftproperties);
                         
@@ -524 +524 @@
                 else if(strcmp(result->GetFieldName(),"sigma_zz")==0){
                         /*easy, param_g is of size numberofelements, on 1 dof, just repartition: */
-                        fem_ds->parameters->FindParam(&numberofelements,"numberofelements");
+                        fem_ds->parameters->FindParam(&numberofelements,NumberOfElementsEnum);
                         result->GetField(&sigma_zz);
                         VecToMPISerial(&sigma_zz_serial,sigma_zz);

issm/trunk/src/c/parallel/convergence.cpp

@@ -31 +31 @@
 
         /*get convergence options*/
-        parameters->FindParam(&eps_res,"eps_res");
-        parameters->FindParam(&eps_rel,"eps_rel");
-        parameters->FindParam(&eps_abs,"eps_abs");
-        parameters->FindParam(&yts,"yts");
-        parameters->FindParam(&verbose,"verbose");
+        parameters->FindParam(&eps_res,EpsResEnum);
+        parameters->FindParam(&eps_rel,EpsRelEnum);
+        parameters->FindParam(&eps_abs,EpsAbsEnum);
+        parameters->FindParam(&yts,YtsEnum);
+        parameters->FindParam(&verbose,VerboseEnum);
 
         /*Display solver caracteristics*/

issm/trunk/src/c/parallel/diagnostic_core.cpp

@@ -83 +83 @@
         //for qmu analysis, be sure the velocity input we are starting from  is the one in the parameters: */
         if(qmu_analysis){
-                model->FindParam(&vx,VxEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputs(vx,VxEnum,VertexEnum);
-                model->FindParam(&vy,VyEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputs(vy,VyEnum,VertexEnum);
-                model->FindParam(&vz,VzEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputs(vz,VzEnum,VertexEnum);
+                model->FindParam(&vx,VxEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
+                model->FindParam(&vy,VyEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
+                model->FindParam(&vz,VzEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vz,VzEnum,VertexEnum);
         }
 

issm/trunk/src/c/parallel/steadystate.cpp

@@ -99 +99 @@
 
         /*recover parameters: */
-        model->FindParam(&waitonlock,"waitonlock");
-        model->FindParam(&control_analysis,"control_analysis");
-        model->FindParam(&qmu_analysis,"qmu_analysis");
+        model->FindParam(&waitonlock,WaitOnLockEnum);
+        model->FindParam(&control_analysis,ControlAnalysisEnum);
+        model->FindParam(&qmu_analysis,QmuAnalysisEnum);
 
         _printf_("initialize inputs:\n");