Changeset 4702
- Timestamp:
- 07/21/10 15:35:18 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 3 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r4656 r4702 565 565 ./modules/InputExtrudex/InputExtrudex.cpp\ 566 566 ./modules/InputExtrudex/InputExtrudex.h\ 567 ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.cpp\ 568 ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.h\ 567 569 ./modules/OutputRiftsx/OutputRiftsx.h\ 568 570 ./modules/OutputRiftsx/OutputRiftsx.cpp\ … … 1117 1119 ./modules/InputExtrudex/InputExtrudex.cpp\ 1118 1120 ./modules/InputExtrudex/InputExtrudex.h\ 1121 ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.cpp\ 1122 ./modules/MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.h\ 1119 1123 ./modules/OutputRiftsx/OutputRiftsx.h\ 1120 1124 ./modules/OutputRiftsx/OutputRiftsx.cpp\ -
issm/trunk/src/c/modules/modules.h
r4656 r4702 46 46 #include "./InputUpdateFromVectorx/InputUpdateFromVectorx.h" 47 47 #include "./MassFluxx/MassFluxx.h" 48 #include "./MaterialUpdateFromTemperaturex/MaterialUpdateFromTemperaturex.h" 48 49 #include "./MaxAbsVxx/MaxAbsVxx.h" 49 50 #include "./MaxAbsVyx/MaxAbsVyx.h" -
issm/trunk/src/c/objects/Elements/Beam.h
r4575 r4702 85 85 void InputControlConstrain(int control_type,double cm_min, double cm_max); 86 86 void InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums); 87 void 87 void InputDepthAverageAtBase(int enum_type,int average_enum_type){ISSMERROR("not implemented yet");} 88 88 void InputDuplicate(int original_enum,int new_enum); 89 89 void InputScale(int enum_type,double scale_factor); 90 90 void InputToResult(int enum_type,int step,double time); 91 double MassFlux(double* segment); 91 void MaterialUpdateFromTemperature(void){ISSMERROR("not implemented yet");}; 92 double MassFlux(double* segment); 92 93 void MaxAbsVx(double* pmaxabsvx, bool process_units); 93 94 void MaxAbsVy(double* pmaxabsvy, bool process_units); -
issm/trunk/src/c/objects/Elements/Element.h
r4575 r4702 54 54 virtual void UpdateGeometry(void)=0; 55 55 virtual void InputToResult(int enum_type,int step,double time)=0; 56 virtual void MaterialUpdateFromTemperature(void)=0; 56 57 virtual void ProcessResultsUnits(void)=0; 57 58 virtual void MinVel(double* pminvel, bool process_units)=0; -
issm/trunk/src/c/objects/Elements/Penta.cpp
r4685 r4702 1243 1243 double Penta::MassFlux( double* segment){ 1244 1244 ISSMERROR(" not supported yet!"); 1245 } 1246 /*}}}*/ 1247 /*FUNCTION Penta::MaterialUpdateFromTemperature{{{1*/ 1248 void Penta::MaterialUpdateFromTemperature(void){ 1249 1250 /*Intermediaries*/ 1251 double Taverage; 1252 double B; 1253 1254 /*inputs: */ 1255 bool collapse; 1256 Input *TempInput = NULL; 1257 Input *RheologyBInput = NULL; 1258 1259 /*retrieve inputs :*/ 1260 inputs->GetParameterValue(&collapse,CollapseEnum); 1261 1262 if (collapse){ 1263 /*find temperature average*/ 1264 this->inputs->GetParameterAverage(&Taverage,TemperatureAverageEnum); 1265 } 1266 else{ 1267 /*find 3d temperature*/ 1268 this->inputs->GetParameterAverage(&Taverage,TemperatureEnum); 1269 } 1270 1271 /*Get B from T using Paterson*/ 1272 B=Paterson(Taverage); 1273 1274 /*Add input to Matice*/ 1275 this->matice->inputs->AddInput(new DoubleInput(RheologyBEnum,B)); 1276 1245 1277 } 1246 1278 /*}}}*/ -
issm/trunk/src/c/objects/Elements/Penta.h
r4652 r4702 92 92 void InputScale(int enum_type,double scale_factor); 93 93 void InputToResult(int enum_type,int step,double time); 94 void MaterialUpdateFromTemperature(void); 94 95 double MassFlux(double* segment); 95 96 void MaxAbsVx(double* pmaxabsvx, bool process_units); -
issm/trunk/src/c/objects/Elements/Sing.h
r4575 r4702 89 89 void InputScale(int enum_type,double scale_factor); 90 90 void InputToResult(int enum_type,int step,double time); 91 void MaterialUpdateFromTemperature(void){ISSMERROR("not implemented yet");}; 91 92 double MassFlux(double* segment); 92 93 void MaxAbsVx(double* pmaxabsvx, bool process_units); -
issm/trunk/src/c/objects/Elements/Tria.h
r4698 r4702 89 89 void InputScale(int enum_type,double scale_factor); 90 90 void InputToResult(int enum_type,int step,double time); 91 void MaterialUpdateFromTemperature(void){ISSMERROR("not implemented yet");}; 91 92 double MassFlux(double* segment); 92 93 void MaxAbsVx(double* pmaxabsvx, bool process_units); -
issm/trunk/src/c/objects/Inputs/BeamVertexInput.h
r4698 r4702 41 41 Input* SpawnBeamInput(int* indices); 42 42 Input* SpawnTriaInput(int* indices); 43 Input* SpawnProcessedInput(double (*f)(double)){ISSMERROR("not implemented yet");}; 43 44 Input* PointwiseDivide(Input* inputB){ISSMERROR("not implemented yet");}; 44 45 ElementResult* SpawnResult(int step, double time); -
issm/trunk/src/c/objects/Inputs/BoolInput.h
r4698 r4702 41 41 Input* SpawnBeamInput(int* indices); 42 42 Input* SpawnTriaInput(int* indices); 43 Input* SpawnProcessedInput(double (*f)(double)){ISSMERROR("not implemented yet");}; 43 44 Input* PointwiseDivide(Input* inputB){ISSMERROR("not implemented yet");}; 44 45 ElementResult* SpawnResult(int step, double time); -
issm/trunk/src/c/objects/Inputs/DoubleInput.h
r4698 r4702 40 40 Input* SpawnBeamInput(int* indices); 41 41 Input* SpawnTriaInput(int* indices); 42 Input* SpawnProcessedInput(double (*f)(double)){ISSMERROR("not implemented yet");}; 42 43 Input* PointwiseDivide(Input* inputB){ISSMERROR("not implemented yet");}; 43 44 ElementResult* SpawnResult(int step, double time); -
issm/trunk/src/c/objects/Inputs/Input.h
r4698 r4702 45 45 virtual Input* SpawnBeamInput(int* indices)=0; 46 46 virtual Input* SpawnTriaInput(int* indices)=0; 47 virtual Input* SpawnProcessedInput(double (*f)(double))=0; 47 48 virtual Input* PointwiseDivide(Input* inputB)=0; 48 49 virtual ElementResult* SpawnResult(int step, double time)=0; -
issm/trunk/src/c/objects/Inputs/IntInput.h
r4698 r4702 41 41 Input* SpawnBeamInput(int* indices); 42 42 Input* SpawnTriaInput(int* indices); 43 Input* SpawnProcessedInput(double (*f)(double)){ISSMERROR("not implemented yet");}; 43 44 Input* PointwiseDivide(Input* inputB){ISSMERROR("not implemented yet");}; 44 45 ElementResult* SpawnResult(int step, double time); -
issm/trunk/src/c/objects/Inputs/PentaVertexInput.h
r4698 r4702 40 40 Input* SpawnBeamInput(int* indices); 41 41 Input* SpawnTriaInput(int* indices); 42 Input* SpawnProcessedInput(double (*f)(double)){ISSMERROR("not implemented yet");}; 42 43 Input* PointwiseDivide(Input* inputB); 43 44 ElementResult* SpawnResult(int step, double time); -
issm/trunk/src/c/objects/Inputs/SingVertexInput.h
r4698 r4702 40 40 Input* SpawnBeamInput(int* indices); 41 41 Input* SpawnTriaInput(int* indices); 42 Input* SpawnProcessedInput(double (*f)(double)){ISSMERROR("not implemented yet");}; 42 43 Input* PointwiseDivide(Input* inputB){ISSMERROR("not implemented yet");}; 43 44 ElementResult* SpawnResult(int step, double time); -
issm/trunk/src/c/objects/Inputs/TriaVertexInput.h
r4698 r4702 41 41 Input* SpawnBeamInput(int* indices); 42 42 Input* SpawnTriaInput(int* indices); 43 Input* SpawnProcessedInput(double (*f)(double)){ISSMERROR("not implemented yet");}; 43 44 Input* PointwiseDivide(Input* inputB){ISSMERROR("not implemented yet");}; 44 45 ElementResult* SpawnResult(int step, double time);
Note:
See TracChangeset
for help on using the changeset viewer.