Changeset 3703
- Timestamp:
- 05/11/10 08:28:39 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 104 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/ComputeBasalStressx/ComputeBasalStressx.cpp
r3673 r3703 22 22 23 23 /*Recover numberofelements: */ 24 found= parameters->FindParam(&numberofelements, "numberofelements");24 found= parameters->FindParam(&numberofelements,NumberOfElementsEnum); 25 25 if (!found) ISSMERROR("numberofelements not provided in parameters"); 26 26 -
issm/trunk/src/c/ComputePressurex/ComputePressurex.cpp
r3673 r3703 22 22 23 23 /*Recover numberofnodes: */ 24 parameters->FindParam(&numberofnodes, "numberofnodes");24 parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 25 25 26 26 /*Allocate p_g on numberofnodes (only 1 dof): */ -
issm/trunk/src/c/ComputeStrainRatex/ComputeStrainRatex.cpp
r3673 r3703 22 22 23 23 /*Recover numberofelements: */ 24 parameters->FindParam(&numberofelements, "numberofelements");24 parameters->FindParam(&numberofelements,NumberOfElementsEnum); 25 25 26 26 /*Allocate eps on numberofelements (only 1 dof): */ -
issm/trunk/src/c/Dofx/Dofx.cpp
r3673 r3703 36 36 37 37 /*First, recover number of vertices and nodes from parameters: */ 38 found=parameters->FindParam(&numberofvertices, "numberofvertices");38 found=parameters->FindParam(&numberofvertices,NumberOfVerticesEnum); 39 39 if(!found)ISSMERROR(" could not find numberofvertices in parameters"); 40 40 41 found=parameters->FindParam(&numberofnodes, "numberofnodes");41 found=parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 42 42 if(!found)ISSMERROR(" could not find numberofnodes in parameters"); 43 43 44 44 /*Recover number of dofs per node: */ 45 found=parameters->FindParam(&numberofdofspernode, "numberofdofspernode");45 found=parameters->FindParam(&numberofdofspernode,NumberOfDofsPerNodeEnum); 46 46 if(!found)ISSMERROR(" could not find numberofdofspernode in parameters"); 47 47 -
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r3701 r3703 222 222 IsStokesEnum, 223 223 VerboseEnum, 224 EpsRes ,225 EpsRel ,226 EpsAbs ,224 EpsResEnum, 225 EpsRelEnum, 226 EpsAbsEnum, 227 227 EpsCmEnum, 228 228 MaxNonlinearIterationsEnum, -
issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp
r3673 r3703 24 24 25 25 /*Initioalize intermediary*/ 26 found=parameters->FindParam(&numberofvertices, "numberofvertices");26 found=parameters->FindParam(&numberofvertices,NumberOfVerticesEnum); 27 27 connectivity=NewVec(numberofvertices); 28 28 fieldsum =NewVec(numberofvertices); -
issm/trunk/src/c/Makefile.am
r3701 r3703 121 121 ./objects/NodeSets.cpp\ 122 122 ./objects/NodeSets.h\ 123 ./DataSet/DataSet.h\ 123 124 ./DataSet/DataSet.cpp\ 124 ./DataSet/DataSet.h\ 125 ./DataSet/Parameters.cpp\ 126 ./DataSet/Inputs.cpp\ 125 127 ./shared/shared.h\ 126 128 ./shared/Alloc/alloc.h\ … … 544 546 ./objects/NodeSets.cpp\ 545 547 ./objects/NodeSets.h\ 548 ./DataSet/DataSet.h\ 546 549 ./DataSet/DataSet.cpp\ 547 ./DataSet/DataSet.h\ 550 ./DataSet/Parameters.cpp\ 551 ./DataSet/Inputs.cpp\ 548 552 ./shared/shared.h\ 549 553 ./shared/Threads/issm_threads.h\ -
issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp
r3633 r3703 4 4 5 5 #include "../../DataSet/DataSet.h" 6 #include "../../io/io.h" 6 7 #include "../../toolkits/toolkits.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp
r3698 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp
r3633 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp
r3633 r3703 8 8 #include "../../objects/objects.h" 9 9 #include "../../shared/shared.h" 10 #include "../../io/io.h" 10 11 #include "../ModelProcessorx.h" 11 12 -
issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp
r3698 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp
r3673 r3703 3 3 4 4 #include "../../DataSet/DataSet.h" 5 #include "../../io/io.h" 5 6 #include "../../toolkits/toolkits.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp
r3633 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp
r3696 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp
r3633 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp
r3697 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp
r3697 r3703 9 9 #include "../shared/shared.h" 10 10 #include "../MeshPartitionx/MeshPartitionx.h" 11 #include "../io/io.h" 11 12 12 13 void CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ -
issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp
r3633 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp
r3692 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp
r3633 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp
r3633 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp
r3673 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp
r3633 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp
r3633 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp
r3692 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp
r3679 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp
r3633 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp
r3692 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp
r3633 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Melting/CreateConstraintsMelting.cpp
r3633 r3703 4 4 5 5 #include "../../DataSet/DataSet.h" 6 #include "../../io/io.h" 6 7 #include "../../toolkits/toolkits.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp
r3673 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../include/typedefs.h" -
issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp
r3679 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp
r3633 r3703 6 6 #include "../../toolkits/toolkits.h" 7 7 #include "../../EnumDefinitions/EnumDefinitions.h" 8 #include "../../io/io.h" 8 9 #include "../../objects/objects.h" 9 10 #include "../../shared/shared.h" -
issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp
r3696 r3703 8 8 #include "../../objects/objects.h" 9 9 #include "../../shared/shared.h" 10 #include "../../io/io.h" 10 11 #include "../../MeshPartitionx/MeshPartitionx.h" 11 12 #include "../../include/typedefs.h" -
issm/trunk/src/c/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp
r3633 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp
r3633 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp
r3696 r3703 7 7 #include "../../EnumDefinitions/EnumDefinitions.h" 8 8 #include "../../objects/objects.h" 9 #include "../../io/io.h" 9 10 #include "../../shared/shared.h" 10 11 #include "../../include/macros.h" -
issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp
r3646 r3703 6 6 #include "../../EnumDefinitions/EnumDefinitions.h" 7 7 #include "../../objects/objects.h" 8 #include "../../io/io.h" 8 9 #include "../../shared/shared.h" 9 10 #include "../../include/macros.h" -
issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp
r3697 r3703 5 5 6 6 #include "../../DataSet/DataSet.h" 7 #include "../../io/io.h" 7 8 #include "../../toolkits/toolkits.h" 8 9 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp
r3697 r3703 8 8 #include "../../objects/objects.h" 9 9 #include "../../shared/shared.h" 10 #include "../../io/io.h" 10 11 #include "../../include/macros.h" 11 12 #include "../../MeshPartitionx/MeshPartitionx.h" -
issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp
r3633 r3703 4 4 5 5 #include "../../DataSet/DataSet.h" 6 #include "../../io/io.h" 6 7 #include "../../toolkits/toolkits.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp
r3633 r3703 4 4 5 5 #include "../../DataSet/DataSet.h" 6 #include "../../io/io.h" 6 7 #include "../../toolkits/toolkits.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp
r3633 r3703 3 3 4 4 #include "../../DataSet/DataSet.h" 5 #include "../../io/io.h" 5 6 #include "../../toolkits/toolkits.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp
r3633 r3703 4 4 5 5 #include "../../DataSet/DataSet.h" 6 #include "../../io/io.h" 6 7 #include "../../toolkits/toolkits.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" -
issm/trunk/src/c/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp
r3696 r3703 5 5 #include "../../DataSet/DataSet.h" 6 6 #include "../../toolkits/toolkits.h" 7 #include "../../io/io.h" 7 8 #include "../../EnumDefinitions/EnumDefinitions.h" 8 9 #include "../../objects/objects.h" -
issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp
r3679 r3703 4 4 #include "../../DataSet/DataSet.h" 5 5 #include "../../toolkits/toolkits.h" 6 #include "../../io/io.h" 6 7 #include "../../EnumDefinitions/EnumDefinitions.h" 7 8 #include "../../objects/objects.h" -
issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp
r3673 r3703 25 25 26 26 /*recover parameters: */ 27 parameters->FindParam(&min_mechanical_constraints, "min_mechanical_constraints");27 parameters->FindParam(&min_mechanical_constraints,MinMechanicalConstraintsEnum); 28 28 29 29 /*First, get nodes and loads configured: */ -
issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp
r3673 r3703 32 32 33 33 /*Some parameters needed: */ 34 parameters->FindParam(&numberofvertices, "numberofvertices");34 parameters->FindParam(&numberofvertices,NumberOfVerticesEnum); 35 35 36 36 /*serialize partition vector: */ -
issm/trunk/src/c/Qmux/DakotaResponses.cpp
r3673 r3703 25 25 26 26 /*some data needed across the responses: */ 27 model->FindParam(&numberofnodes, "numberofnodes");27 model->FindParam(&numberofnodes,NumberOfNodesEnum); 28 28 29 29 … … 233 233 234 234 /*retrieve active fem model: */ 235 model->FindParam(&isstokes, "isstokes");236 model->FindParam(&ismacayealpattyn, "ismacayealpattyn");237 model->FindParam(&ishutter, "ishutter");235 model->FindParam(&isstokes,IsStokesEnum); 236 model->FindParam(&ismacayealpattyn,IsMacayealPattynEnum); 237 model->FindParam(&ishutter,IsHutterEnum); 238 238 239 239 if(isstokes){ … … 249 249 250 250 /*Recover some parameters: */ 251 femmodel->parameters->FindParam(&numberofdofspernode, "numberofdofspernode");252 femmodel->parameters->FindParam(&numberofnodes, "numberofnodes");253 femmodel->parameters->FindParam(&fit,NULL,NULL, "fit");251 femmodel->parameters->FindParam(&numberofdofspernode,NumberOfDofsPernodeEnum); 252 femmodel->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 253 femmodel->parameters->FindParam(&fit,NULL,NULL,FitEnum); 254 254 255 255 /*Recover velocity: */ … … 299 299 300 300 /*retrieve active fem model: */ 301 model->FindParam(&isstokes, "isstokes");302 model->FindParam(&ismacayealpattyn, "ismacayealpattyn");303 model->FindParam(&ishutter, "ishutter");301 model->FindParam(&isstokes,IsStokesEnum); 302 model->FindParam(&ismacayealpattyn,IsMacayealPattynEnum); 303 model->FindParam(&ishutter,IsHutterEnum); 304 304 305 305 if(isstokes){ … … 314 314 315 315 /*retrieve qmu_mass_flux_segments: */ 316 param=(Param*)femmodel->parameters->FindParamObject( "qmu_mass_flux_segments");316 param=(Param*)femmodel->parameters->FindParamObject(QmuMassFluxSegmentsEnum); 317 317 if(!param)ISSMERROR(" could not find qmu_mass_flux_segments to compute mass_flux"); 318 318 -
issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp
r3673 r3703 57 57 58 58 /*some parameters needed: */ 59 model->FindParam(&verbose, "verbose");59 model->FindParam(&verbose,VerboseEnum); 60 60 61 61 /*First off, recover the response descriptors for the response functions: */ 62 param=(Param*)model->GetFormulation(DiagnosticAnalysisEnum,HorizAnalysisEnum)->parameters->FindParamObject( "responsedescriptors");62 param=(Param*)model->GetFormulation(DiagnosticAnalysisEnum,HorizAnalysisEnum)->parameters->FindParamObject(ResponseDescriptorsEnum); 63 63 if(!param)ISSMERROR(" could not find response descriptors!"); 64 64 … … 66 66 67 67 /*Recover partitioning for dakota: */ 68 model->FindParam(&qmu_npart, "qmu_npart");69 model->FindParam(&qmu_part,NULL,NULL, "qmu_part");68 model->FindParam(&qmu_npart,QmuNpartEnum); 69 model->FindParam(&qmu_part,NULL,NULL,QmuPartEnum); 70 70 71 71 /*broadcast variables: only cpu 0 has correct values*/ -
issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp
r3699 r3703 9 9 #include "../EnumDefinitions/EnumDefinitions.h" 10 10 11 intUpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){11 void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type){ 12 12 13 int noerr=1; 14 int i; 13 double* serial_solution=NULL; 15 14 16 int found=0; 17 extern int num_procs; 18 extern int my_rank; 19 double* serial_solution=NULL; 15 /*Serialize solution, so that elements can index into it on every CPU: */ 16 VecToMPISerial(&serial_solution,solution); 20 17 21 18 /*First, get elements and loads configured: */ … … 25 22 parameters->Configure(elements,loads, nodes,vertices, materials,parameters); 26 23 27 /*Serialize solution, so that elements can index into it on every CPU: */ 28 VecToMPISerial(&serial_solution,solution); 29 30 /*Update elements, nodes, loads and materials from inputs: */ 24 25 /*Elements drive the update: */ 31 26 elements->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type); 32 nodes->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);33 vertices->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);34 loads->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);35 materials->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);36 parameters->UpdateInputsFromSolution(serial_solution,analysis_type,sub_analysis_type);37 27 38 28 /*Free ressources:*/ 39 29 xfree((void**)&serial_solution); 40 30 41 return noerr;42 43 31 } -
issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h
r3699 r3703 10 10 11 11 /* local prototypes: */ 12 intUpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type);12 void UpdateInputsFromSolutionx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters,Vec solution, int analysis_type, int sub_analysis_type); 13 13 14 14 #endif /* _UPDATEINPUTSXX_H */ -
issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp
r3699 r3703 9 9 #include "../EnumDefinitions/EnumDefinitions.h" 10 10 11 intUpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){11 void UpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices, DataSet* loads, DataSet* materials, Parameters* parameters,double* vector, int NameEnum, int TypeEnum){ 12 12 13 13 /*First, get elements and loads configured: */ … … 18 18 19 19 /*Update elements, nodes, loads and materials from inputs: */ 20 elements->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type); 21 nodes->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type); 22 vertices->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type); 23 loads->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type); 24 materials->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type); 25 parameters->UpdateInputsFromVector(serial_solution,analysis_type,sub_analysis_type); 26 27 return noerr; 20 elements->UpdateInputsFromVector(vector,NameEnum,TypeEnum); 21 nodes->UpdateInputsFromVector(vector,NameEnum,TypeEnum); 22 vertices->UpdateInputsFromVector(vector,NameEnum,TypeEnum); 23 loads->UpdateInputsFromVector(vector,NameEnum,TypeEnum); 24 materials->UpdateInputsFromVector(vector,NameEnum,TypeEnum); 25 parameters->UpdateInputsFromVector(vector,NameEnum,TypeEnum); 28 26 29 27 } -
issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.h
r3699 r3703 10 10 11 11 /* local prototypes: */ 12 intUpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters,double* vector, int NameEnum,int TypeEnum);12 void UpdateInputsFromVectorx( DataSet* elements,DataSet* nodes, DataSet* vertices,DataSet* loads, DataSet* materials, Parameters* parameters,double* vector, int NameEnum,int TypeEnum); 13 13 14 14 #endif /* _UPDATEINPUTSXX_H */ -
issm/trunk/src/c/objects/Constraints/Rgb.h
r3683 r3703 34 34 int Id(); 35 35 int MyRank(); 36 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 37 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 38 36 39 37 40 /*non virtual: */ -
issm/trunk/src/c/objects/Constraints/Spc.h
r3683 r3703 39 39 double GetValue(); 40 40 Object* copy(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 43 41 44 42 45 }; -
issm/trunk/src/c/objects/DofVec.h
r3673 r3703 47 47 int MyRank(); 48 48 int Size(); 49 50 49 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 50 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 51 51 Object* copy(); 52 52 … … 62 62 63 63 double* GetValuesFromIndex(int index_size,int* index); 64 64 65 65 66 66 }; -
issm/trunk/src/c/objects/Elements/Beam.cpp
r3699 r3703 139 139 nodeinputs[0]=iomodel->weights[index]; 140 140 nodeinputs[1]=iomodel->weights[(int)(iomodel->uppernodes[index]-1)]; 141 this->inputs->AddInput(new BeamVertexInput(Weights zEnum,nodeinputs));141 this->inputs->AddInput(new BeamVertexInput(WeightsEnum,nodeinputs)); 142 142 } 143 143 if (iomodel->gridonbed) this->inputs->AddInput(new BoolInput(ElementOnBedEnum,(IssmBool)iomodel->gridonbed[index])); -
issm/trunk/src/c/objects/Elements/Beam.h
r3699 r3703 53 53 Object* copy(); 54 54 void SetClone(int* minranks); 55 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 56 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 57 55 58 56 59 /*}}}*/ … … 58 61 void CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type); 59 62 void CreatePVector(Vec pg, int analysis_type,int sub_analysis_type); 60 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);61 63 void GetDofList(int* doflist,int* pnumberofdofs); 62 64 void GetDofList1(int* doflist); -
issm/trunk/src/c/objects/Elements/Element.h
r3699 r3703 28 28 virtual void CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type)=0; 29 29 virtual void CreatePVector(Vec pg, int analysis_type,int sub_analysis_type)=0; 30 virtual void UpdateInputsFromSolutionFromSolution(double* solution, int analysis_type, int sub_analysis_type)=0;31 30 virtual void GetNodes(void** nodes)=0; 32 31 virtual void* GetMatPar()=0; -
issm/trunk/src/c/objects/Elements/Penta.h
r3699 r3703 140 140 void UpdateInputsFromSolutionBalancedthickness2( double* solution,int analysis_type,int sub_analysis_type); 141 141 void UpdateInputsFromSolutionBalancedvelocities( double* solution,int analysis_type,int sub_analysis_type); 142 void UpdateInputsFromVector(double* vector, int name, int type); 142 143 void AddInput(double value, int enum_type){ISSMERROR("not supporte yet!");} 143 144 -
issm/trunk/src/c/objects/Elements/Sing.h
r3699 r3703 53 53 void SetClone(int* minranks); 54 54 int MyRank(); 55 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 56 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 57 55 58 /*}}}*/ 56 59 /*numerics: {{{1*/ 57 60 void CreateKMatrix(Mat Kgg,int analysis_type,int sub_analysis_type); 58 61 void CreatePVector(Vec pg, int analysis_type,int sub_analysis_type); 59 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 60 void GetDofList(int* doflist,int* pnumberofdofs); 62 void GetDofList(int* doflist,int* pnumberofdofs); 61 63 void GetDofList1(int* doflist); 62 64 void CreateKMatrixDiagnosticHutter(Mat Kgg,int analysis_type,int sub_analysis_type); -
issm/trunk/src/c/objects/Elements/Tria.h
r3699 r3703 50 50 int MyRank(); 51 51 void SetClone(int* minranks); 52 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 53 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 54 52 55 /*}}}*/ 53 56 /*FUNCTION element numerical routines {{{1*/ … … 117 120 /*updates:*/ 118 121 void UpdateFromDakota(void* inputs); 119 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type);120 122 void UpdateInputsFromSolutionDiagnosticHoriz( double* solution,int analysis_type,int sub_analysis_type); 121 123 void UpdateInputsFromSolutionSlopeCompute( double* solution,int analysis_type,int sub_analysis_type); -
issm/trunk/src/c/objects/FemModel.cpp
r3681 r3703 305 305 } 306 306 /*}}}*/ 307 /*FUNCTION FemModel::UpdateInputsFromVector(double* vector, int name, int type){{{1*/ 308 void FemModel::UpdateInputsFromVector(double* vector, int name, int type){ 309 310 elements->UpdateInputsFromVector(vector,name,type); 311 nodes->UpdateInputsFromVector(vector,name,type); 312 vertices->UpdateInputsFromVector(vector,name,type); 313 loads->UpdateInputsFromVector(vector,name,type); 314 materials->UpdateInputsFromVector(vector,name,type); 315 parameters->UpdateInputsFromVector(vector,name,type); 316 317 } 318 /*}}}*/ 319 /*FUNCTION FemModel::UpdateInputsFromSolution(double* vector, int name, int type){{{1*/ 320 void FemModel::UpdateInputsFromSolution(double* vector, int name, int type){ 321 322 elements->UpdateInputsFromSolution(vector,name,type); 323 nodes->UpdateInputsFromSolution(vector,name,type); 324 vertices->UpdateInputsFromSolution(vector,name,type); 325 loads->UpdateInputsFromSolution(vector,name,type); 326 materials->UpdateInputsFromSolution(vector,name,type); 327 parameters->UpdateInputsFromSolution(vector,name,type); 328 329 } 330 /*}}}*/ -
issm/trunk/src/c/objects/FemModel.h
r3699 r3703 79 79 Mat get_Gmn(void); 80 80 81 void UpdateInputsFromVector(double* vector, int name, int type); 82 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 83 81 84 }; 82 85 -
issm/trunk/src/c/objects/Inputs/BeamVertexInput.h
r3683 r3703 38 38 Object* copy(); 39 39 int EnumType(); 40 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 41 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 42 40 43 41 44 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/BoolInput.h
r3683 r3703 38 38 Object* copy(); 39 39 int EnumType(); 40 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 41 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 42 40 43 41 44 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/DoubleInput.h
r3683 r3703 38 38 Object* copy(); 39 39 int EnumType(); 40 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 41 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 42 40 43 41 44 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/IntInput.h
r3683 r3703 38 38 Object* copy(); 39 39 int EnumType(); 40 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 41 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 42 40 43 41 44 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/PentaVertexInput.h
r3683 r3703 37 37 Object* copy(); 38 38 int EnumType(); 39 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 40 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 41 39 42 40 43 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/SingVertexInput.h
r3683 r3703 37 37 Object* copy(); 38 38 int EnumType(); 39 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 40 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 41 39 42 40 43 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/TriaVertexInput.h
r3683 r3703 37 37 Object* copy(); 38 38 int EnumType(); 39 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 40 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 41 39 42 40 43 /*}}}*/ -
issm/trunk/src/c/objects/IoModel.cpp
r3682 r3703 60 60 xfree((void**)&this->vx_obs); 61 61 xfree((void**)&this->vy_obs); 62 xfree((void**)&this->vz_obs); 62 63 xfree((void**)&this->vx); 63 64 xfree((void**)&this->vy); … … 254 255 this->vx_obs=NULL; 255 256 this->vy_obs=NULL; 257 this->vz_obs=NULL; 256 258 this->vx=NULL; 257 259 this->vy=NULL; -
issm/trunk/src/c/objects/IoModel.h
r3682 r3703 61 61 double* vx_obs; 62 62 double* vy_obs; 63 double* vz_obs; 63 64 64 65 /*qmu: */ -
issm/trunk/src/c/objects/Loads/Icefront.h
r3683 r3703 50 50 int MarshallSize(); 51 51 int MyRank(); 52 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 53 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 54 52 55 53 56 /*}}}*/ -
issm/trunk/src/c/objects/Loads/Numericalflux.h
r3683 r3703 45 45 int MarshallSize(); 46 46 int MyRank(); 47 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 48 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 49 47 50 /*}}}*/ 48 51 /*Numerics: {{{1*/ -
issm/trunk/src/c/objects/Loads/Pengrid.h
r3683 r3703 51 51 int MarshallSize(); 52 52 int MyRank(); 53 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 54 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 55 53 56 /*}}}*/ 54 57 /*FUNCTION element numerical routines {{{1*/ -
issm/trunk/src/c/objects/Loads/Penpair.h
r3683 r3703 43 43 void PenaltyCreatePVector(Vec pg,double kmax,int analysis_type,int sub_analysis_type); 44 44 Object* copy(); 45 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 46 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 47 45 48 46 49 }; -
issm/trunk/src/c/objects/Loads/Riftfront.h
r3683 r3703 60 60 int MarshallSize(); 61 61 int MyRank(); 62 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 63 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 64 62 65 63 66 /*}}}*/ -
issm/trunk/src/c/objects/Materials/Material.h
r3683 r3703 26 26 virtual void Demarshall(char** pmarshalled_dataset)=0; 27 27 virtual void UpdateFromInputs(void* inputs)=0; 28 virtual void UpdateInputsFromVector(double* vector, int name, int type)=0; 29 virtual void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type)=0; 30 28 31 int Enum(); 29 32 -
issm/trunk/src/c/objects/Materials/Matice.h
r3683 r3703 45 45 double GetB(); 46 46 double GetN(); 47 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 48 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 49 47 50 48 51 }; -
issm/trunk/src/c/objects/Materials/Matpar.h
r3683 r3703 57 57 double GetMeltingPoint(); 58 58 Object* copy(); 59 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 60 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 61 59 62 60 63 }; -
issm/trunk/src/c/objects/Model.cpp
r3681 r3703 454 454 } 455 455 /*}}}1*/ 456 /*FUNCTION Model::UpdateInputsFromVector(double* vector,int name, int type);{{{1*/ 457 void Model::UpdateInputsFromVector(double* vector,int name, int type){ 458 459 int i; 460 FemModel* femmodel=NULL; 461 462 for(i=0;i<this->femmodels->Size();i++){ 463 femmodel=(FemModel*)this->femmodels->GetObjectByOffset(i); 464 femmodel->UpdateInputsFromVector(vector,name,type); 465 } 466 467 } 468 /*}}}1*/ 469 /*FUNCTION Model::UpdateInputsFromSolution(double* vector,int analysis_type, int sub_analysis_type);{{{1*/ 470 void Model::UpdateInputsFromSolution(double* vector,int analysis_type, int sub_analysis_type){ 471 472 int i; 473 FemModel* femmodel=NULL; 474 475 for(i=0;i<this->femmodels->Size();i++){ 476 femmodel=(FemModel*)this->femmodels->GetObjectByOffset(i); 477 femmodel->UpdateInputsFromSolution(vector,analysis_type,sub_analysis_type); 478 } 479 480 } 481 /*}}}1*/ -
issm/trunk/src/c/objects/Model.h
r3673 r3703 53 53 FemModel* GetFormulation(int analysis_type); 54 54 55 void UpdateInputsFromVector(double* vector, int name, int type); 56 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 57 55 58 FemModel* GetActiveFormulation(); 56 59 void* SetActiveFormulation(FemModel* femmodel); -
issm/trunk/src/c/objects/Node.h
r3681 r3703 10 10 #include "./Object.h" 11 11 #include "./DofObject.h" 12 #include "../shared/shared.h" 12 13 class Inputs; 13 14 class Hook; … … 50 51 int MyRank(void); 51 52 void SetVertexDof(int in_dof); 53 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 54 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 55 52 56 /*}}}*/ 53 57 /*FUNCTION numerical routines {{{1*/ -
issm/trunk/src/c/objects/Object.h
r3673 r3703 25 25 virtual int Enum()=0; 26 26 virtual Object* copy()=0; 27 27 virtual void UpdateInputsFromVector(double* vector, int name, int type)=0; 28 virtual void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type)=0; 28 29 29 30 }; -
issm/trunk/src/c/objects/Params/BoolParam.h
r3683 r3703 39 39 int MarshallSize(); 40 40 int MyRank(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 43 41 44 /*}}}*/ 42 45 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/DoubleMatParam.h
r3683 r3703 41 41 int MarshallSize(); 42 42 int MyRank(); 43 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 44 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 45 43 46 /*}}}*/ 44 47 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/DoubleParam.h
r3683 r3703 39 39 int MarshallSize(); 40 40 int MyRank(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 43 41 44 /*}}}*/ 42 45 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/DoubleVecParam.h
r3683 r3703 40 40 int MarshallSize(); 41 41 int MyRank(); 42 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 43 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 42 44 /*}}}*/ 43 45 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/IntParam.h
r3683 r3703 39 39 int MarshallSize(); 40 40 int MyRank(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 43 41 44 /*}}}*/ 42 45 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/Param.h
r3683 r3703 32 32 virtual char* GetParameterName(void)=0; 33 33 virtual void SetMatlabField(mxArray* dataref)=0; 34 34 35 /*}}}*/ 35 36 -
issm/trunk/src/c/objects/Params/PetscMatParam.h
r3683 r3703 39 39 int MarshallSize(); 40 40 int MyRank(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 43 41 44 /*}}}*/ 42 45 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/PetscVecParam.h
r3683 r3703 39 39 int MarshallSize(); 40 40 int MyRank(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 43 41 44 /*}}}*/ 42 45 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/StringArrayParam.h
r3683 r3703 41 41 int MarshallSize(); 42 42 int MyRank(); 43 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 44 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 45 43 46 /*}}}*/ 44 47 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Params/StringParam.h
r3683 r3703 39 39 int MarshallSize(); 40 40 int MyRank(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 43 41 44 /*}}}*/ 42 45 /*Param methods: {{{1*/ -
issm/trunk/src/c/objects/Result.h
r3673 r3703 43 43 int Enum(); 44 44 Object* copy(); 45 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 46 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 45 47 46 48 double GetTime(); … … 52 54 char* GetFieldName(); 53 55 56 54 57 }; 55 58 -
issm/trunk/src/c/objects/SolPar.h
r3673 r3703 39 39 int Enum(); 40 40 Object* copy(); 41 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 42 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 41 43 42 44 /*functionality: */ 43 45 void Configure(void* parameters,int analysis_type,int sub_analysis_type); 44 46 47 45 48 }; 46 49 #endif /* _SOLPAR_H */ -
issm/trunk/src/c/objects/Vertex.h
r3681 r3703 11 11 #include "./DofObject.h" 12 12 class IoModel; 13 #include "../shared/Exceptions/exceptions.h" 14 #include "../include/macros.h" 15 13 16 /*}}}*/ 17 14 18 15 19 class Vertex: public Object,public DofObject{ … … 46 50 void UpdateFromDakota(void* vinputs); 47 51 void UpdatePosition(double* thickness,double* bed); 52 void UpdateInputsFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");} 53 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} 48 54 49 55 -
issm/trunk/src/c/parallel/ProcessResults.cpp
r3588 r3703 112 112 113 113 /*some flags needed: */ 114 model->FindParam(&dim, "dim");115 model->FindParam(&ishutter, "ishutter");116 model->FindParam(&isstokes, "isstokes");117 model->FindParam(&ismacayealpattyn, "ismacayealpattyn");114 model->FindParam(&dim,DimEnum); 115 model->FindParam(&ishutter,IsHutterEnum); 116 model->FindParam(&isstokes,IsStokesEnum); 117 model->FindParam(&ismacayealpattyn,IsMacayealPattynEnum); 118 118 119 119 /*Recover femmodels first: */ … … 158 158 /*ok, 2 dofs, on number of nodes: */ 159 159 if(ismacayealpattyn){ 160 fem_dh->parameters->FindParam(&numberofnodes, "numberofnodes");160 fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 161 161 VecToMPISerial(&partition,fem_dh->partition->vector); 162 fem_dh->parameters->FindParam(&yts, "yts");162 fem_dh->parameters->FindParam(&yts,YtsEnum); 163 163 } 164 164 else{ 165 fem_dhu->parameters->FindParam(&numberofnodes, "numberofnodes");165 fem_dhu->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 166 166 VecToMPISerial(&partition,fem_dhu->partition->vector); 167 fem_dhu->parameters->FindParam(&yts, "yts");167 fem_dhu->parameters->FindParam(&yts,YtsEnum); 168 168 } 169 169 vx=(double*)xmalloc(numberofnodes*sizeof(double)); … … 184 184 /*ok, 3 dofs, on number of nodes: */ 185 185 if(ismacayealpattyn){ 186 fem_dh->parameters->FindParam(&numberofnodes, "numberofnodes");186 fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 187 187 VecToMPISerial(&partition,fem_dh->partition->vector); 188 fem_dh->parameters->FindParam(&yts, "yts");188 fem_dh->parameters->FindParam(&yts,YtsEnum); 189 189 } 190 190 else{ 191 fem_dhu->parameters->FindParam(&numberofnodes, "numberofnodes");191 fem_dhu->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 192 192 VecToMPISerial(&partition,fem_dhu->partition->vector); 193 fem_dhu->parameters->FindParam(&yts, "yts");193 fem_dhu->parameters->FindParam(&yts,YtsEnum); 194 194 } 195 195 vx=(double*)xmalloc(numberofnodes*sizeof(double)); … … 207 207 else{ 208 208 /* 4 dofs on number of nodes. discard pressure: */ 209 fem_ds->parameters->FindParam(&numberofnodes, "numberofnodes");209 fem_ds->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 210 210 VecToMPISerial(&partition,fem_ds->partition->vector); 211 fem_ds->parameters->FindParam(&yts, "yts");211 fem_ds->parameters->FindParam(&yts,YtsEnum); 212 212 vx=(double*)xmalloc(numberofnodes*sizeof(double)); 213 213 vy=(double*)xmalloc(numberofnodes*sizeof(double)); … … 252 252 if(!isstokes){ 253 253 if(ismacayealpattyn){ 254 fem_dh->parameters->FindParam(&numberofnodes, "numberofnodes");254 fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 255 255 VecToMPISerial(&partition,fem_dh->partition->vector); 256 256 } 257 257 else{ 258 fem_dhu->parameters->FindParam(&numberofnodes, "numberofnodes");258 fem_dhu->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 259 259 VecToMPISerial(&partition,fem_dhu->partition->vector); 260 260 } 261 261 } 262 262 else{ 263 fem_ds->parameters->FindParam(&numberofnodes, "numberofnodes");263 fem_ds->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 264 264 VecToMPISerial(&partition,fem_ds->partition->vector); 265 265 } … … 285 285 result->GetField(&t_g); 286 286 VecToMPISerial(&t_g_serial,t_g); 287 fem_t->parameters->FindParam(&numberofnodes, "numberofnodes");287 fem_t->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 288 288 VecToMPISerial(&partition,fem_t->partition->vector); 289 289 … … 309 309 result->GetField(&grad_g); 310 310 VecToMPISerial(&grad_g_serial,grad_g); 311 fem_c->parameters->FindParam(&numberofnodes, "numberofnodes");311 fem_c->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 312 312 VecToMPISerial(&partition,fem_c->partition->vector); 313 313 … … 332 332 result->GetField(&m_g); 333 333 VecToMPISerial(&m_g_serial,m_g); 334 fem_t->parameters->FindParam(&numberofnodes, "numberofnodes");335 fem_t->parameters->FindParam(&yts, "yts");334 fem_t->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 335 fem_t->parameters->FindParam(&yts,YtsEnum); 336 336 VecToMPISerial(&partition,fem_t->partition->vector); 337 337 … … 356 356 result->GetField(&h_g); 357 357 VecToMPISerial(&h_g_serial,h_g); 358 fem_p->parameters->FindParam(&numberofvertices, "numberofvertices");358 fem_p->parameters->FindParam(&numberofvertices,NumberOfVerticesEnum); 359 359 VecToMPISerial(&partition,fem_p->partition->vector); 360 360 … … 379 379 result->GetField(&v_g); 380 380 VecToMPISerial(&v_g_serial,v_g); 381 fem_p->parameters->FindParam(&numberofnodes, "numberofnodes");381 fem_p->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 382 382 VecToMPISerial(&partition,fem_p->partition->vector); 383 383 … … 402 402 result->GetField(&s_g); 403 403 VecToMPISerial(&s_g_serial,s_g); 404 fem_p->parameters->FindParam(&numberofnodes, "numberofnodes");404 fem_p->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 405 405 VecToMPISerial(&partition,fem_p->partition->vector); 406 406 … … 425 425 result->GetField(&sx_g); 426 426 VecToMPISerial(&sx_g_serial,sx_g); 427 fem_sl->parameters->FindParam(&numberofnodes, "numberofnodes");427 fem_sl->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 428 428 VecToMPISerial(&partition,fem_sl->partition->vector); 429 429 … … 448 448 result->GetField(&sy_g); 449 449 VecToMPISerial(&sy_g_serial,sy_g); 450 fem_sl->parameters->FindParam(&numberofnodes, "numberofnodes");450 fem_sl->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 451 451 VecToMPISerial(&partition,fem_sl->partition->vector); 452 452 … … 471 471 result->GetField(&b_g); 472 472 VecToMPISerial(&b_g_serial,b_g); 473 fem_p->parameters->FindParam(&numberofnodes, "numberofnodes");473 fem_p->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 474 474 VecToMPISerial(&partition,fem_p->partition->vector); 475 475 … … 493 493 /*easy, param_g is of size numberofnodes, on 1 dof, just repartition: */ 494 494 result->GetField(¶m_g); 495 fem_dh->parameters->FindParam(&numberofnodes, "numberofnodes");495 fem_dh->parameters->FindParam(&numberofnodes,NumberOfNodesEnum); 496 496 VecToMPISerial(&partition,fem_dh->partition->vector); 497 497 … … 513 513 else if(strcmp(result->GetFieldName(),"riftproperties")==0){ 514 514 result->GetField(&riftproperties); 515 fem_dh->parameters->FindParam(&numrifts, "numrifts");515 fem_dh->parameters->FindParam(&numrifts,NumRiftsEnum); 516 516 VecToMPISerial(&riftproperties_serial,riftproperties); 517 517 … … 524 524 else if(strcmp(result->GetFieldName(),"sigma_zz")==0){ 525 525 /*easy, param_g is of size numberofelements, on 1 dof, just repartition: */ 526 fem_ds->parameters->FindParam(&numberofelements, "numberofelements");526 fem_ds->parameters->FindParam(&numberofelements,NumberOfElementsEnum); 527 527 result->GetField(&sigma_zz); 528 528 VecToMPISerial(&sigma_zz_serial,sigma_zz); -
issm/trunk/src/c/parallel/convergence.cpp
r3673 r3703 31 31 32 32 /*get convergence options*/ 33 parameters->FindParam(&eps_res, "eps_res");34 parameters->FindParam(&eps_rel, "eps_rel");35 parameters->FindParam(&eps_abs, "eps_abs");36 parameters->FindParam(&yts, "yts");37 parameters->FindParam(&verbose, "verbose");33 parameters->FindParam(&eps_res,EpsResEnum); 34 parameters->FindParam(&eps_rel,EpsRelEnum); 35 parameters->FindParam(&eps_abs,EpsAbsEnum); 36 parameters->FindParam(&yts,YtsEnum); 37 parameters->FindParam(&verbose,VerboseEnum); 38 38 39 39 /*Display solver caracteristics*/ -
issm/trunk/src/c/parallel/diagnostic_core.cpp
r3699 r3703 83 83 //for qmu analysis, be sure the velocity input we are starting from is the one in the parameters: */ 84 84 if(qmu_analysis){ 85 model->FindParam(&vx,VxEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputs (vx,VxEnum,VertexEnum);86 model->FindParam(&vy,VyEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputs (vy,VyEnum,VertexEnum);87 model->FindParam(&vz,VzEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputs (vz,VzEnum,VertexEnum);85 model->FindParam(&vx,VxEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vx,VxEnum,VertexEnum); 86 model->FindParam(&vy,VyEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vy,VyEnum,VertexEnum); 87 model->FindParam(&vz,VzEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vz,VzEnum,VertexEnum); 88 88 } 89 89 -
issm/trunk/src/c/parallel/steadystate.cpp
r3567 r3703 99 99 100 100 /*recover parameters: */ 101 model->FindParam(&waitonlock, "waitonlock");102 model->FindParam(&control_analysis, "control_analysis");103 model->FindParam(&qmu_analysis, "qmu_analysis");101 model->FindParam(&waitonlock,WaitOnLockEnum); 102 model->FindParam(&control_analysis,ControlAnalysisEnum); 103 model->FindParam(&qmu_analysis,QmuAnalysisEnum); 104 104 105 105 _printf_("initialize inputs:\n");
Note:
See TracChangeset
for help on using the changeset viewer.