Changeset 16238
- Timestamp:
- 09/23/13 13:54:04 (11 years ago)
- Location:
- issm/trunk-jpl/src/c/classes
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/Elements/Element.h
r16208 r16238 74 74 virtual void GetVectorFromInputs(Vector<IssmDouble>* vector, int name_enum)=0; 75 75 virtual void GetVectorFromResults(Vector<IssmDouble>* vector,int id,int enum_in,int interp)=0; 76 virtual void InputArtificialNoise(int enum_type,IssmDouble min,IssmDouble max)=0;77 76 virtual IssmDouble TimeAdapt()=0; 78 77 virtual void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm)=0; -
issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
r16233 r16238 1856 1856 int Penta::Id(void){ 1857 1857 return id; 1858 }1859 /*}}}*/1860 /*FUNCTION Penta::InputArtificialNoise{{{*/1861 void Penta::InputArtificialNoise(int enum_type,IssmDouble min,IssmDouble max){1862 1863 Input* input=NULL;1864 1865 /*Make a copy of the original input: */1866 input=(Input*)this->inputs->GetInput(enum_type);1867 if(!input)_error_("could not find old input with enum: " << EnumToStringx(enum_type));1868 1869 /*ArtificialNoise: */1870 input->ArtificialNoise(min,max);1871 1858 } 1872 1859 /*}}}*/ -
issm/trunk-jpl/src/c/classes/Elements/Penta.h
r16233 r16238 93 93 94 94 int Sid(); 95 void InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max);96 95 void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); 97 96 void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum=MeshElementsEnum); -
issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
r16221 r16238 1399 1399 return sid; 1400 1400 1401 }1402 /*}}}*/1403 /*FUNCTION Tria::InputArtificialNoise{{{*/1404 void Tria::InputArtificialNoise(int enum_type,IssmDouble min,IssmDouble max){1405 1406 Input* input=NULL;1407 1408 /*Make a copy of the original input: */1409 input=(Input*)this->inputs->GetInput(enum_type);1410 if(!input)_error_("could not find old input with enum: " << EnumToStringx(enum_type));1411 1412 /*ArtificialNoise: */1413 input->ArtificialNoise(min,max);1414 1401 } 1415 1402 /*}}}*/ -
issm/trunk-jpl/src/c/classes/Elements/Tria.h
r16221 r16238 90 90 void GetVectorFromInputs(Vector<IssmDouble>* vector, int name_enum); 91 91 void GetVectorFromResults(Vector<IssmDouble>* vector,int offset,int enum_in,int interp); 92 void InputArtificialNoise(int enum_type,IssmDouble min, IssmDouble max);93 92 void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); 94 93 void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum=MeshElementsEnum); -
issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h
r16188 r16238 74 74 void Set(IssmDouble setvalue){_error_("Set not implemented yet");}; 75 75 void Scale(IssmDouble scale_factor); 76 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};77 76 void AXPY(Input* xinput,IssmDouble scalar); 78 77 void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("Constrain not implemented for booleans");}; -
issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h
r16188 r16238 74 74 void Set(IssmDouble setvalue){_error_("Set not implemented yet");}; 75 75 void Scale(IssmDouble scale_factor){_error_("not implemented yet");}; 76 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};77 76 void AXPY(Input* xinput,IssmDouble scalar); 78 77 void Constrain(void); -
issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h
r16188 r16238 68 68 void Set(IssmDouble setvalue){_error_("Set not implemented yet");}; 69 69 void Scale(IssmDouble scale_factor){_error_("not implemented yet");}; 70 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};71 70 void AXPY(Input* xinput,IssmDouble scalar){_error_("not implemented yet");}; 72 71 void Constrain(void){_error_("not implemented yet");}; -
issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h
r16188 r16238 68 68 void Set(IssmDouble setvalue){_error_("Set not implemented yet");}; 69 69 void Scale(IssmDouble scale_factor); 70 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};71 70 void AXPY(Input* xinput,IssmDouble scalar); 72 71 void Constrain(IssmDouble cm_min, IssmDouble cm_max); -
issm/trunk-jpl/src/c/classes/Inputs/Input.h
r16188 r16238 58 58 virtual void Set(IssmDouble setvalue)=0; 59 59 virtual void Scale(IssmDouble scale_factor)=0; 60 virtual void ArtificialNoise(IssmDouble min,IssmDouble max)=0;61 60 virtual void AXPY(Input* xinput,IssmDouble scalar)=0; 62 61 virtual void Constrain(IssmDouble cm_min, IssmDouble cm_max)=0; -
issm/trunk-jpl/src/c/classes/Inputs/IntInput.h
r16188 r16238 70 70 void Set(IssmDouble setvalue){_error_("Set not implemented yet");}; 71 71 void Scale(IssmDouble scale_factor); 72 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};73 72 void AXPY(Input* xinput,IssmDouble scalar); 74 73 void Constrain(IssmDouble cm_min, IssmDouble cm_max); -
issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h
r16188 r16238 70 70 void Set(IssmDouble setvalue){_error_("Set not implemented yet");}; 71 71 void Scale(IssmDouble scale_factor); 72 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};73 72 void AXPY(Input* xinput,IssmDouble scalar); 74 73 void Constrain(IssmDouble cm_min, IssmDouble cm_max); -
issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h
r16188 r16238 73 73 void Set(IssmDouble setvalue){_error_("Set not implemented yet");}; 74 74 void Scale(IssmDouble scale_factor){_error_("not implemented yet");}; 75 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};76 75 void AXPY(Input* xforcing,IssmDouble scalar){_error_("not implemented yet");}; 77 76 void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("not implemented yet");}; -
issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp
r16188 r16238 328 328 } 329 329 /*}}}*/ 330 /*FUNCTION TriaInput::ArtificialNoise{{{*/331 void TriaInput::ArtificialNoise(IssmDouble min,IssmDouble max){332 333 int i;334 const int numnodes=this->NumberofNodes();335 IssmDouble noise;336 337 /*Compute random number between bounds:338 * rand() outputs an integer in [0 RAND_MAX]339 * (IssmDouble)rand()/RAND_MAX is in [0 1]340 */341 noise=min+(max-min)*(IssmDouble)rand()/RAND_MAX;342 343 for(i=0;i<numnodes;i++)values[i]=values[i]+noise;344 }345 /*}}}*/346 330 /*FUNCTION TriaInput::AXPY{{{*/ 347 331 void TriaInput::AXPY(Input* xinput,IssmDouble scalar){ -
issm/trunk-jpl/src/c/classes/Inputs/TriaInput.h
r16188 r16238 70 70 void Set(IssmDouble setvalue); 71 71 void Scale(IssmDouble scale_factor); 72 void ArtificialNoise(IssmDouble min,IssmDouble max);73 72 void AXPY(Input* xinput,IssmDouble scalar); 74 73 void Constrain(IssmDouble cm_min, IssmDouble cm_max);
Note:
See TracChangeset
for help on using the changeset viewer.