Changeset 3717
- Timestamp:
- 05/11/10 11:37:02 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 41 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/CostFunctionx/CostFunctionx.cpp
r3673 r3717 31 31 32 32 /*add surface area to elements :*/ 33 elements-> AddInput(S,SurfaceAreaEnum);33 elements->UpdateInputsFromVector(&S,SurfaceAreaEnum,ConstantEnum); 34 34 35 35 /*Compute gradients: */ -
issm/trunk/src/c/DataSet/DataSet.cpp
r3702 r3717 1413 1413 } 1414 1414 /*}}}*/ 1415 /*FUNCTION DataSet::AddInput{{{1*/1416 void DataSet::AddInput(double value, int enum_type){1417 1418 vector<Object*>::iterator object;1419 Element* element=NULL;1420 1421 for ( object=objects.begin() ; object < objects.end(); object++ ){1422 1423 if(EnumIsElement((*object)->Enum())){1424 1425 element=(Element*)(*object);1426 element->AddInput(value,enum_type);1427 }1428 else ISSMERROR("%s%i%s"," object with id: ",(*object)->Id()," is not an element, in a function that deals only with elements!");1429 }1430 }1431 /*}}}*/1432 1415 /*FUNCTION DataSet::UpdateVertexPositions{{{1*/ 1433 1416 void DataSet::UpdateVertexPositions(double* thickness,double* bed){ -
issm/trunk/src/c/DataSet/DataSet.h
r3699 r3717 73 73 void UpdateInputsFromVector(double* vector,int name, int type); 74 74 void UpdateInputsFromSolution(double* solution,int analysis_type,int sub_analysis_type); 75 void AddInput(double value, int enum_type);76 75 void PenaltyCreateKMatrix(Mat Kgg,double kmax,int analysis_type,int sub_analysis_type); 77 76 void PenaltyCreatePVector(Vec pg,double kmax,int analysis_type,int sub_analysis_type); -
issm/trunk/src/c/Dux/Dux.cpp
r3673 r3717 33 33 34 34 /*add surface area to elements :*/ 35 elements-> AddInput(S,SurfaceAreaEnum);35 elements->UpdateInputsFromVector(&S,SurfaceAreaEnum,ConstantEnum); 36 36 37 37 /*Get size of matrix: */ -
issm/trunk/src/c/Misfitx/Misfitx.cpp
r3673 r3717 31 31 32 32 /*add surface area to elements :*/ 33 elements-> AddInput(S,SurfaceAreaEnum);33 elements->UpdateInputsFromVector(&S,SurfaceAreaEnum,ConstantEnum); 34 34 35 35 -
issm/trunk/src/c/PenaltyConstraintsx/RiftConstraints.cpp
r3673 r3717 308 308 309 309 /*feed max_penetration to inputs: */ 310 loads-> AddInput(max_penetration,MaxPenetrationEnum);310 loads->UpdateInputsFromVector(&max_penetration,MaxPenetrationEnum,ConstantEnum); 311 311 } 312 312 -
issm/trunk/src/c/Qmux/DakotaResponses.cpp
r3703 r3717 230 230 Vec u_g=NULL; 231 231 double* u_g_double=NULL; 232 double* vx=NULL; 233 double* vy=NULL; 234 double* vz=NULL; 232 235 double* fit=NULL; 233 236 234 237 /*retrieve active fem model: */ 235 238 model->FindParam(&isstokes,IsStokesEnum); 236 model->FindParam(&ismacayealpattyn,IsMac ayealPattynEnum);239 model->FindParam(&ismacayealpattyn,IsMacAyealPattynEnum); 237 240 model->FindParam(&ishutter,IsHutterEnum); 238 241 … … 258 261 if(!found)ISSMERROR(" could not find velocity to compute misfit"); 259 262 260 SplitSolutionVector(&vx,&vy,&vz,u_g,numberofnodes *numberofdofspernode);263 SplitSolutionVector(&vx,&vy,&vz,u_g,numberofnodes,numberofdofspernode); 261 264 262 265 /*Add to inputs: */ 263 femmodel->elements-> AddInput(vx,VxEnum);264 femmodel->elements-> AddInput(vy,VyEnum);265 femmodel->elements-> AddInput(vz,VzEnum);266 femmodel->elements-> AddInput(fit[0],FitEnum);266 femmodel->elements->UpdateInputsFromVector(vx,VxEnum,VertexEnum); 267 femmodel->elements->UpdateInputsFromVector(vy,VyEnum,VertexEnum); 268 femmodel->elements->UpdateInputsFromVector(vz,VzEnum,VertexEnum); 269 femmodel->elements->UpdateInputsFromVector(fit[0],FitEnum,ConstantEnum); 267 270 268 271 /*Compute misfit: */ … … 300 303 /*retrieve active fem model: */ 301 304 model->FindParam(&isstokes,IsStokesEnum); 302 model->FindParam(&ismacayealpattyn,IsMac ayealPattynEnum);305 model->FindParam(&ismacayealpattyn,IsMacAyealPattynEnum); 303 306 model->FindParam(&ishutter,IsHutterEnum); 304 307 -
issm/trunk/src/c/objects/Elements/Beam.cpp
r3707 r3717 749 749 } 750 750 /*}}}1*/ 751 751 /*FUNCTION Beam::UpdateInputsFromVector(double* vector, int name, int type);{{{1*/ 752 void Beam::UpdateInputsFromVector(double* vector, int name, int type){ 753 ISSMERROR(" not supported yet!"); 754 } 755 /*}}}*/ 756 -
issm/trunk/src/c/objects/Elements/Beam.h
r3703 r3717 53 53 Object* copy(); 54 54 void SetClone(int* minranks); 55 void UpdateInputsFromVector(double* vector, int name, int type) {ISSMERROR("Not implemented yet!");}55 void UpdateInputsFromVector(double* vector, int name, int type); 56 56 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 57 57 … … 89 89 void GetJacobianDeterminant(double* pJdet,double* z_list, double gauss_coord); 90 90 double MassFlux(double* segment,double* ug); 91 void AddInput(double value, int enum_type){ISSMERROR("not supporte yet!");}92 91 /*}}}*/ 93 92 -
issm/trunk/src/c/objects/Elements/Element.h
r3703 r3717 45 45 virtual void ComputeStrainRate(Vec eps, int analysis_type,int sub_analysis_type)=0; 46 46 virtual double MassFlux(double* segment,double* ug)=0; 47 virtual void AddInput(double value, int enum_type)=0;48 47 49 48 /*Implementation: */ -
issm/trunk/src/c/objects/Elements/Penta.cpp
r3715 r3717 4458 4458 } 4459 4459 /*}}}*/ 4460 /*FUNCTION Penta::UpdateInputsFromVector(double* vector, int name, int type);{{{1*/ 4461 void Penta::UpdateInputsFromVector(double* vector, int name, int type){ 4462 ISSMERROR(" not supported yet!"); 4463 } 4464 /*}}}*/ -
issm/trunk/src/c/objects/Elements/Penta.h
r3715 r3717 141 141 void UpdateInputsFromSolutionBalancedvelocities( double* solution,int analysis_type,int sub_analysis_type); 142 142 void UpdateInputsFromVector(double* vector, int name, int type); 143 void AddInput(double value, int enum_type){ISSMERROR("not supported yet!");}144 143 145 144 /*}}}*/ -
issm/trunk/src/c/objects/Elements/Sing.cpp
r3707 r3717 544 544 } 545 545 /*}}}1*/ 546 /*FUNCTION Sing::UpdateInputsFromVector(double* vector, int name, int type);{{{1*/ 547 void Sing::UpdateInputsFromVector(double* vector, int name, int type){ 548 ISSMERROR(" not supported yet!"); 549 } 550 /*}}}*/ -
issm/trunk/src/c/objects/Elements/Sing.h
r3703 r3717 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 55 void UpdateInputsFromVector(double* vector, int name, int type); 56 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 57 57 58 58 /*}}}*/ … … 84 84 double CostFunction(int,int); 85 85 double MassFlux(double* segment,double* ug); 86 void AddInput(double value, int enum_type){ISSMERROR("not supporte yet!");}87 86 /*}}}*/ 88 87 -
issm/trunk/src/c/objects/Elements/Tria.cpp
r3715 r3717 5149 5149 } 5150 5150 /*}}}*/ 5151 /*FUNCTION Tria::UpdateInputsFromVector(double* vector, int name, int type);{{{1*/ 5152 void Tria::UpdateInputsFromVector(double* vector, int name, int type){ 5153 ISSMERROR(" not supported yet!"); 5154 } 5155 /*}}}*/ -
issm/trunk/src/c/objects/Elements/Tria.h
r3703 r3717 50 50 int MyRank(); 51 51 void SetClone(int* minranks); 52 void UpdateInputsFromVector(double* vector, int name, int type) {ISSMERROR("Not implemented yet!");}52 void UpdateInputsFromVector(double* vector, int name, int type); 53 53 void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type); 54 54 … … 127 127 void UpdateInputsFromSolutionBalancedthickness2( double* solution,int analysis_type,int sub_analysis_type); 128 128 void UpdateInputsFromSolutionBalancedvelocities( double* solution,int analysis_type,int sub_analysis_type); 129 void AddInput(double value, int enum_type){ISSMERROR("not supporte yet!");}130 129 131 130 /*}}}*/ -
issm/trunk/src/c/parallel/ControlInitialization.cpp
r3709 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void ControlInitialization(Model* model, ParameterInputs* inputs){ … … 54 54 model->FindParam(&dim,DimEnum); 55 55 model->FindParam(&ishutter,IsHutterEnum); 56 model->FindParam(&ismacayealpattyn,IsMac ayealPattynEnum);56 model->FindParam(&ismacayealpattyn,IsMacAyealPattynEnum); 57 57 model->FindParam(&isstokes,IsStokesEnum); 58 58 model->FindParam(&numberofnodes,NumberOfNodesEnum); -
issm/trunk/src/c/parallel/ControlRestart.cpp
r3709 r3717 5 5 6 6 #include "./parallel.h" 7 #include "../ issm.h"7 #include "../modules.h" 8 8 9 9 void ControlRestart(Model* model,double* param_g){ -
issm/trunk/src/c/parallel/ProcessResults.cpp
r3703 r3717 115 115 model->FindParam(&ishutter,IsHutterEnum); 116 116 model->FindParam(&isstokes,IsStokesEnum); 117 model->FindParam(&ismacayealpattyn,IsMac ayealPattynEnum);117 model->FindParam(&ismacayealpattyn,IsMacAyealPattynEnum); 118 118 119 119 /*Recover femmodels first: */ -
issm/trunk/src/c/parallel/control_core.cpp
r3709 r3717 4 4 5 5 #include "./parallel.h" 6 #include "../ issm.h"6 #include "../modules.h" 7 7 8 8 void control_core(DataSet* results,Model* model, ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/convergence.cpp
r3703 r3717 4 4 5 5 #include "../objects/objects.h" 6 #include "../ issm.h"6 #include "../modules.h" 7 7 8 8 void convergence(int* pconverged, Mat Kff,Vec pf,Vec uf,Vec old_uf,Parameters* parameters){ -
issm/trunk/src/c/parallel/diagnostic_core.cpp
r3703 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void diagnostic_core(DataSet* results,Model* model){ … … 62 62 model->FindParam(&dim,DimEnum); 63 63 model->FindParam(&ishutter,IsHutterEnum); 64 model->FindParam(&ismacayealpattyn,IsMac ayealPattynEnum);64 model->FindParam(&ismacayealpattyn,IsMacAyealPattynEnum); 65 65 model->FindParam(&numberofnodes,NumberOfNodesEnum); 66 66 model->FindParam(&isstokes,IsStokesEnum); -
issm/trunk/src/c/parallel/diagnostic_core_linear.cpp
r3709 r3717 6 6 #include "../objects/objects.h" 7 7 #include "../EnumDefinitions/EnumDefinitions.h" 8 #include "../ issm.h"8 #include "../modules.h" 9 9 10 10 void diagnostic_core_linear(Vec* pug,FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ -
issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp
r3709 r3717 6 6 #include "../objects/objects.h" 7 7 #include "../EnumDefinitions/EnumDefinitions.h" 8 #include "../ issm.h"8 #include "../modules.h" 9 9 #include "./parallel.h" 10 10 -
issm/trunk/src/c/parallel/gradjcompute_core.cpp
r3709 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/objectivefunctionC.cpp
r3709 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/prognostic.cpp
r3709 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/prognostic2.cpp
r3709 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/prognostic2_core.cpp
r3709 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void prognostic2_core(DataSet* results,Model* model,ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/prognostic_core.cpp
r3709 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void prognostic_core(DataSet* results,Model* model,ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/slopecompute.cpp
r3709 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/slopecompute_core.cpp
r3709 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void slopecompute_core(DataSet* results,Model* model,ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/steadystate.cpp
r3710 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/steadystate_core.cpp
r3709 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void steadystate_core(DataSet* results,Model* model, ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/thermal.cpp
r3709 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/thermal_core.cpp
r3709 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void thermal_core(DataSet* results,Model* model, ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp
r3709 r3717 6 6 #include "../objects/objects.h" 7 7 #include "../EnumDefinitions/EnumDefinitions.h" 8 #include "../ issm.h"8 #include "../modules.h" 9 9 10 10 void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){ -
issm/trunk/src/c/parallel/transient.cpp
r3709 r3717 3 3 */ 4 4 5 #include "../ issm.h"5 #include "../modules.h" 6 6 #include "./parallel.h" 7 7 -
issm/trunk/src/c/parallel/transient_core.cpp
r3710 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void transient_core(DataSet* results,Model* model, ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/transient_core_2d.cpp
r3709 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void transient_core_2d(DataSet* results,Model* model, ParameterInputs* inputs){ -
issm/trunk/src/c/parallel/transient_core_3d.cpp
r3710 r3717 8 8 #include "../EnumDefinitions/EnumDefinitions.h" 9 9 #include "./parallel.h" 10 #include "../ issm.h"10 #include "../modules.h" 11 11 12 12 void transient_core_3d(DataSet* results,Model* model, ParameterInputs* inputs){
Note:
See TracChangeset
for help on using the changeset viewer.