Changeset 10135
- Timestamp:
- 10/07/11 08:25:24 (13 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 36 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Container/Inputs.cpp
r9883 r10135 43 43 44 44 /*Object management*/ 45 /*FUNCTION Inputs::Get ParameterValue(bool* pvalue,int enum-type){{{1*/46 void Inputs::Get ParameterValue(bool* pvalue,int enum_type){45 /*FUNCTION Inputs::GetInputValue(bool* pvalue,int enum-type){{{1*/ 46 void Inputs::GetInputValue(bool* pvalue,int enum_type){ 47 47 48 48 vector<Object*>::iterator object; … … 67 67 68 68 /*Ok, we have an input if we made it here, request the input to return the value: */ 69 input->Get ParameterValue(pvalue);70 71 } 72 /*}}}*/ 73 /*FUNCTION Inputs::Get ParameterValue(int* pvalue,int enum-type){{{1*/74 void Inputs::Get ParameterValue(int* pvalue,int enum_type){69 input->GetInputValue(pvalue); 70 71 } 72 /*}}}*/ 73 /*FUNCTION Inputs::GetInputValue(int* pvalue,int enum-type){{{1*/ 74 void Inputs::GetInputValue(int* pvalue,int enum_type){ 75 75 76 76 vector<Object*>::iterator object; … … 95 95 96 96 /*Ok, we have an input if we made it here, request the input to return the value: */ 97 input->Get ParameterValue(pvalue);98 99 } 100 /*}}}*/ 101 /*FUNCTION Inputs::Get ParameterValue(double* pvalue,int enum-type){{{1*/102 void Inputs::Get ParameterValue(double* pvalue,int enum_type){97 input->GetInputValue(pvalue); 98 99 } 100 /*}}}*/ 101 /*FUNCTION Inputs::GetInputValue(double* pvalue,int enum-type){{{1*/ 102 void Inputs::GetInputValue(double* pvalue,int enum_type){ 103 103 104 104 vector<Object*>::iterator object; … … 123 123 124 124 /*Ok, we have an input if we made it here, request the input to return the value: */ 125 input->Get ParameterValue(pvalue);126 127 } 128 /*}}}*/ 129 /*FUNCTION Inputs::Get ParameterAverage{{{1*/130 void Inputs::Get ParameterAverage(double* pvalue,int enum_type){125 input->GetInputValue(pvalue); 126 127 } 128 /*}}}*/ 129 /*FUNCTION Inputs::GetInputAverage{{{1*/ 130 void Inputs::GetInputAverage(double* pvalue,int enum_type){ 131 131 132 132 vector<Object*>::iterator object; … … 151 151 152 152 /*Ok, we have an input if we made it here, request the input to return the value: */ 153 input->Get ParameterAverage(pvalue);153 input->GetInputAverage(pvalue); 154 154 155 155 } -
issm/trunk/src/c/Container/Inputs.h
r9734 r10135 44 44 double MinAbs(int enumtype); 45 45 46 void Get ParameterAverage(double* pvalue, int enum_type);47 void Get ParameterValue(bool* pvalue,int enum_type);48 void Get ParameterValue(int* pvalue,int enum_type);49 void Get ParameterValue(double* pvalue,int enum_type);46 void GetInputAverage(double* pvalue, int enum_type); 47 void GetInputValue(bool* pvalue,int enum_type); 48 void GetInputValue(int* pvalue,int enum_type); 49 void GetInputValue(double* pvalue,int enum_type); 50 50 51 51 void Configure(Parameters* parameters); -
issm/trunk/src/c/objects/Elements/Element.h
r9880 r10135 37 37 virtual bool IsNodeOnShelfFromFlags(double* flags)=0; 38 38 virtual bool IsOnBed()=0; 39 virtual void Get ParameterListOnVertices(double* pvalue,int enumtype)=0;40 virtual void Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue)=0;41 virtual void Get ParameterValue(double* pvalue,Node* node,int enumtype)=0;39 virtual void GetInputListOnVertices(double* pvalue,int enumtype)=0; 40 virtual void GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue)=0; 41 virtual void GetInputValue(double* pvalue,Node* node,int enumtype)=0; 42 42 43 43 virtual double SurfaceArea(void)=0; -
issm/trunk/src/c/objects/Elements/Penta.cpp
r9883 r10135 383 383 384 384 friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); 385 vx_input->Get ParameterValue(&vx,gauss);386 vy_input->Get ParameterValue(&vy,gauss);385 vx_input->GetInputValue(&vx,gauss); 386 vy_input->GetInputValue(&vy,gauss); 387 387 basalfriction[count]=alpha2*(pow(vx,2.0)+pow(vy,2.0)); 388 388 count++; … … 421 421 /*retrive parameters: */ 422 422 parameters->FindParam(&analysis_type,AnalysisTypeEnum); 423 inputs->Get ParameterValue(&approximation,ApproximationEnum);423 inputs->GetInputValue(&approximation,ApproximationEnum); 424 424 425 425 /*Check analysis_types*/ … … 459 459 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); 460 460 matice->GetViscosity3dStokes(&viscosity,&epsilon[0]); 461 pressure_input->Get ParameterValue(&pressure,gauss);461 pressure_input->GetInputValue(&pressure,gauss); 462 462 463 463 /*Compute Stress*/ … … 869 869 } 870 870 /*}}}*/ 871 /*FUNCTION Penta::Get ParameterListOnVertices(double* pvalue,int enumtype) {{{1*/872 void Penta::Get ParameterListOnVertices(double* pvalue,int enumtype){871 /*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype) {{{1*/ 872 void Penta::GetInputListOnVertices(double* pvalue,int enumtype){ 873 873 874 874 /*Intermediaries*/ … … 887 887 for (int iv=0;iv<NUMVERTICES;iv++){ 888 888 gauss->GaussVertex(iv); 889 input->Get ParameterValue(&pvalue[iv],gauss);889 input->GetInputValue(&pvalue[iv],gauss); 890 890 } 891 891 … … 894 894 } 895 895 /*}}}*/ 896 /*FUNCTION Penta::Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/897 void Penta::Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue){896 /*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/ 897 void Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue){ 898 898 899 899 /*Intermediaries*/ … … 912 912 for (int iv=0;iv<NUMVERTICES;iv++){ 913 913 gauss->GaussVertex(iv); 914 input->Get ParameterValue(&pvalue[iv],gauss);914 input->GetInputValue(&pvalue[iv],gauss); 915 915 } 916 916 } … … 923 923 } 924 924 /*}}}*/ 925 /*FUNCTION Penta::Get ParameterValue(double* pvalue,Node* node,int enumtype) {{{1*/926 void Penta::Get ParameterValue(double* pvalue,Node* node,int enumtype){925 /*FUNCTION Penta::GetInputValue(double* pvalue,Node* node,int enumtype) {{{1*/ 926 void Penta::GetInputValue(double* pvalue,Node* node,int enumtype){ 927 927 928 928 Input* input=inputs->GetInput(enumtype); … … 932 932 gauss->GaussVertex(this->GetNodeIndex(node)); 933 933 934 input->Get ParameterValue(pvalue,gauss);934 input->GetInputValue(pvalue,gauss); 935 935 delete gauss; 936 936 } … … 995 995 case DiagnosticHorizAnalysisEnum: 996 996 int approximation; 997 inputs->Get ParameterValue(&approximation,ApproximationEnum);997 inputs->GetInputValue(&approximation,ApproximationEnum); 998 998 if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){ 999 999 GetSolutionFromInputsDiagnosticStokes(solution); … … 1155 1155 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); 1156 1156 for(i=0;i<NUMVERTICES;i++) z_list[i]=xyz_list[i][2]; 1157 PentaRef::Get ParameterValue(&z,z_list,gauss);1157 PentaRef::GetInputValue(&z,z_list,gauss); 1158 1158 1159 1159 return z; … … 1694 1694 case AdjointHorizAnalysisEnum: 1695 1695 int approximation; 1696 inputs->Get ParameterValue(&approximation,ApproximationEnum);1696 inputs->GetInputValue(&approximation,ApproximationEnum); 1697 1697 if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){ 1698 1698 InputUpdateFromSolutionAdjointStokes( solution); … … 1932 1932 1933 1933 bool onbed; 1934 inputs->Get ParameterValue(&onbed,MeshElementonbedEnum);1934 inputs->GetInputValue(&onbed,MeshElementonbedEnum); 1935 1935 return onbed; 1936 1936 } … … 1970 1970 1971 1971 bool onshelf; 1972 inputs->Get ParameterValue(&onshelf,MaskElementonfloatingiceEnum);1972 inputs->GetInputValue(&onshelf,MaskElementonfloatingiceEnum); 1973 1973 return onshelf; 1974 1974 } … … 2008 2008 2009 2009 bool onsurface; 2010 inputs->Get ParameterValue(&onsurface,MeshElementonsurfaceEnum);2010 inputs->GetInputValue(&onsurface,MeshElementonsurfaceEnum); 2011 2011 return onsurface; 2012 2012 } … … 2016 2016 2017 2017 bool onwater; 2018 inputs->Get ParameterValue(&onwater,MaskElementonwaterEnum);2018 inputs->GetInputValue(&onwater,MaskElementonwaterEnum); 2019 2019 return onwater; 2020 2020 } … … 2345 2345 2346 2346 /*retrieve inputs :*/ 2347 inputs->Get ParameterValue(&approximation,ApproximationEnum);2347 inputs->GetInputValue(&approximation,ApproximationEnum); 2348 2348 2349 2349 /*If on water, return 0: */ … … 2648 2648 gauss->GaussVertex(iv); 2649 2649 2650 thickness_input->Get ParameterValue(&thickness,gauss);2650 thickness_input->GetInputValue(&thickness,gauss); 2651 2651 2652 2652 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); … … 2738 2738 /*ok, we are good. retrieve value of input at vertex :*/ 2739 2739 gauss=new GaussPenta(); gauss->GaussVertex(i); 2740 data->Get ParameterValue(&value,gauss);2740 data->GetInputValue(&value,gauss); 2741 2741 found=1; 2742 2742 break; … … 2983 2983 GetBConduct(&B_conduct[0][0],&xyz_list[0][0],gauss); 2984 2984 2985 enthalpy_input->Get ParameterValue(&enthalpy, gauss);2986 pressure_input->Get ParameterValue(&pressure, gauss);2985 enthalpy_input->GetInputValue(&enthalpy, gauss); 2986 pressure_input->GetInputValue(&pressure, gauss); 2987 2987 kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure); 2988 2988 D_scalar_conduct=gauss->weight*Jdet*kappa; … … 3003 3003 GetBprimeAdvec(&Bprime_advec[0][0],&xyz_list[0][0],gauss); 3004 3004 3005 vx_input->Get ParameterValue(&u, gauss);3006 vy_input->Get ParameterValue(&v, gauss);3007 vz_input->Get ParameterValue(&w, gauss);3008 vxm_input->Get ParameterValue(&um,gauss);3009 vym_input->Get ParameterValue(&vm,gauss);3010 vzm_input->Get ParameterValue(&wm,gauss);3005 vx_input->GetInputValue(&u, gauss); 3006 vy_input->GetInputValue(&v, gauss); 3007 vz_input->GetInputValue(&w, gauss); 3008 vxm_input->GetInputValue(&um,gauss); 3009 vym_input->GetInputValue(&vm,gauss); 3010 vzm_input->GetInputValue(&wm,gauss); 3011 3011 3012 3012 D_scalar_advec=gauss->weight*Jdet; … … 3237 3237 GetBprimeAdvec(&Bprime_advec[0][0],&xyz_list[0][0],gauss); 3238 3238 3239 vx_input->Get ParameterValue(&u, gauss);3240 vy_input->Get ParameterValue(&v, gauss);3241 vz_input->Get ParameterValue(&w, gauss);3242 vxm_input->Get ParameterValue(&um,gauss);3243 vym_input->Get ParameterValue(&vm,gauss);3244 vzm_input->Get ParameterValue(&wm,gauss);3239 vx_input->GetInputValue(&u, gauss); 3240 vy_input->GetInputValue(&v, gauss); 3241 vz_input->GetInputValue(&w, gauss); 3242 vxm_input->GetInputValue(&um,gauss); 3243 vym_input->GetInputValue(&vm,gauss); 3244 vzm_input->GetInputValue(&wm,gauss); 3245 3245 3246 3246 D_scalar_advec=gauss->weight*Jdet; … … 3443 3443 /* Build transient now */ 3444 3444 if(dt){ 3445 temperature_input->Get ParameterValue(&temperature, gauss);3445 temperature_input->GetInputValue(&temperature, gauss); 3446 3446 scalar_transient=temperature*Jdet*gauss->weight; 3447 3447 for(i=0;i<NUMVERTICES;i++) pe->values[i]+=scalar_transient*L[i]; … … 3451 3451 GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); 3452 3452 3453 vx_input->Get ParameterValue(&u, gauss);3454 vy_input->Get ParameterValue(&v, gauss);3455 vz_input->Get ParameterValue(&w, gauss);3453 vx_input->GetInputValue(&u, gauss); 3454 vy_input->GetInputValue(&v, gauss); 3455 vz_input->GetInputValue(&w, gauss); 3456 3456 3457 3457 tau_parameter=GetStabilizationParameter(u,v,w,diameter,rho_ice,heatcapacity,thermalconductivity); … … 3512 3512 GetNodalFunctionsP1(&basis[0], gauss); 3513 3513 3514 pressure_input->Get ParameterValue(&pressure,gauss);3514 pressure_input->GetInputValue(&pressure,gauss); 3515 3515 h_pmp=matpar->PureIceEnthalpy(pressure); 3516 3516 … … 3575 3575 GetNodalFunctionsP1(&basis[0], gauss); 3576 3576 3577 geothermalflux_input->Get ParameterValue(&geothermalflux_value,gauss);3577 geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); 3578 3578 friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); 3579 vx_input->Get ParameterValue(&vx,gauss);3580 vy_input->Get ParameterValue(&vy,gauss);3579 vx_input->GetInputValue(&vx,gauss); 3580 vy_input->GetInputValue(&vy,gauss); 3581 3581 basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)); 3582 3582 … … 3674 3674 /* Build transient now */ 3675 3675 if(dt){ 3676 temperature_input->Get ParameterValue(&temperature, gauss);3676 temperature_input->GetInputValue(&temperature, gauss); 3677 3677 scalar_transient=temperature*Jdet*gauss->weight; 3678 3678 for(i=0;i<NUMVERTICES;i++) pe->values[i]+=scalar_transient*L[i]; … … 3682 3682 GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); 3683 3683 3684 vx_input->Get ParameterValue(&u, gauss);3685 vy_input->Get ParameterValue(&v, gauss);3686 vz_input->Get ParameterValue(&w, gauss);3684 vx_input->GetInputValue(&u, gauss); 3685 vy_input->GetInputValue(&v, gauss); 3686 vz_input->GetInputValue(&w, gauss); 3687 3687 3688 3688 tau_parameter=GetStabilizationParameter(u,v,w,diameter,rho_ice,heatcapacity,thermalconductivity); … … 3743 3743 GetNodalFunctionsP1(&basis[0], gauss); 3744 3744 3745 pressure_input->Get ParameterValue(&pressure,gauss);3745 pressure_input->GetInputValue(&pressure,gauss); 3746 3746 t_pmp=matpar->TMeltingPoint(pressure); 3747 3747 … … 3806 3806 GetNodalFunctionsP1(&basis[0], gauss); 3807 3807 3808 geothermalflux_input->Get ParameterValue(&geothermalflux_value,gauss);3808 geothermalflux_input->GetInputValue(&geothermalflux_value,gauss); 3809 3809 friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum); 3810 vx_input->Get ParameterValue(&vx,gauss);3811 vy_input->Get ParameterValue(&vy,gauss);3810 vx_input->GetInputValue(&vx,gauss); 3811 vy_input->GetInputValue(&vy,gauss); 3812 3812 basalfriction=alpha2*(pow(vx,2.0)+pow(vy,2.0)); 3813 3813 … … 3843 3843 /*Recover temperature*/ 3844 3844 gauss->GaussVertex(i); 3845 t_input->Get ParameterValue(&temp,gauss);3845 t_input->GetInputValue(&temp,gauss); 3846 3846 values[i]=temp; 3847 3847 } … … 3874 3874 /*Recover temperature*/ 3875 3875 gauss->GaussVertex(i); 3876 h_input->Get ParameterValue(&enthalpy,gauss);3876 h_input->GetInputValue(&enthalpy,gauss); 3877 3877 values[i]=enthalpy; 3878 3878 } … … 3916 3916 Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); 3917 3917 3918 this->inputs->Get ParameterValue(&converged,ConvergedEnum);3918 this->inputs->GetInputValue(&converged,ConvergedEnum); 3919 3919 if(converged){ 3920 3920 this->inputs->AddInput(new PentaVertexInput(TemperatureEnum,values)); … … 3933 3933 break; 3934 3934 case ArrheniusEnum: 3935 surface_input->Get ParameterAverage(&s_average);3935 surface_input->GetInputAverage(&s_average); 3936 3936 B_average=Arrhenius((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0, 3937 3937 s_average-((xyz_list[0][2]+xyz_list[1][2]+xyz_list[2][2]+xyz_list[3][2]+xyz_list[4][2]+xyz_list[5][2])/6.0), … … 3982 3982 /*Get all inputs and parameters*/ 3983 3983 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); 3984 Get ParameterListOnVertices(&pressure[0],PressureEnum);3984 GetInputListOnVertices(&pressure[0],PressureEnum); 3985 3985 Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); 3986 3986 3987 3987 3988 // this->inputs->Get ParameterValue(&converged,ConvergedEnum);3988 // this->inputs->GetInputValue(&converged,ConvergedEnum); 3989 3989 // if(converged){ 3990 3990 /*Convert enthalpy into temperature and water fraction*/ … … 4008 4008 break; 4009 4009 case ArrheniusEnum: 4010 surface_input->Get ParameterAverage(&s_average);4010 surface_input->GetInputAverage(&s_average); 4011 4011 B_average=Arrhenius((temperatures[0]+temperatures[1]+temperatures[2]+temperatures[3]+temperatures[4]+temperatures[5])/6.0, 4012 4012 s_average-((xyz_list[0][2]+xyz_list[1][2]+xyz_list[2][2]+xyz_list[3][2]+xyz_list[4][2]+xyz_list[5][2])/6.0), … … 4094 4094 4095 4095 int approximation; 4096 inputs->Get ParameterValue(&approximation,ApproximationEnum);4096 inputs->GetInputValue(&approximation,ApproximationEnum); 4097 4097 4098 4098 switch(approximation){ … … 4166 4166 4167 4167 case FrictionCoefficientEnum: 4168 inputs->Get ParameterValue(&approximation,ApproximationEnum);4168 inputs->GetInputValue(&approximation,ApproximationEnum); 4169 4169 switch(approximation){ 4170 4170 case MacAyealApproximationEnum: … … 4186 4186 4187 4187 case MaterialsRheologyBbarEnum: 4188 inputs->Get ParameterValue(&approximation,ApproximationEnum);4188 inputs->GetInputValue(&approximation,ApproximationEnum); 4189 4189 switch(approximation){ 4190 4190 case MacAyealApproximationEnum: … … 4301 4301 friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); 4302 4302 4303 dragcoefficient_input->Get ParameterValue(&drag, gauss);4304 adjointx_input->Get ParameterValue(&lambda, gauss);4305 adjointy_input->Get ParameterValue(&mu, gauss);4306 vx_input->Get ParameterValue(&vx,gauss);4307 vy_input->Get ParameterValue(&vy,gauss);4308 dragcoefficient_input->Get ParameterDerivativeValue(&dk[0],&xyz_list[0][0],gauss);4303 dragcoefficient_input->GetInputValue(&drag, gauss); 4304 adjointx_input->GetInputValue(&lambda, gauss); 4305 adjointy_input->GetInputValue(&mu, gauss); 4306 vx_input->GetInputValue(&vx,gauss); 4307 vy_input->GetInputValue(&vy,gauss); 4308 dragcoefficient_input->GetInputDerivativeValue(&dk[0],&xyz_list[0][0],gauss); 4309 4309 4310 4310 /*Build gradje_g_gaussian vector (actually -dJ/ddrag): */ … … 4372 4372 /*Recover alpha_complement and drag: */ 4373 4373 friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); 4374 drag_input->Get ParameterValue(&drag,gauss);4374 drag_input->GetInputValue(&drag,gauss); 4375 4375 4376 4376 /*recover lambda mu and xi: */ 4377 adjointx_input->Get ParameterValue(&lambda,gauss);4378 adjointy_input->Get ParameterValue(&mu ,gauss);4379 adjointz_input->Get ParameterValue(&xi ,gauss);4377 adjointx_input->GetInputValue(&lambda,gauss); 4378 adjointy_input->GetInputValue(&mu ,gauss); 4379 adjointz_input->GetInputValue(&xi ,gauss); 4380 4380 4381 4381 /*recover vx vy and vz: */ 4382 vx_input->Get ParameterValue(&vx, gauss);4383 vy_input->Get ParameterValue(&vy, gauss);4384 vz_input->Get ParameterValue(&vz, gauss);4382 vx_input->GetInputValue(&vx, gauss); 4383 vy_input->GetInputValue(&vy, gauss); 4384 vz_input->GetInputValue(&vz, gauss); 4385 4385 4386 4386 /*Get normal vector to the bed */ … … 4396 4396 4397 4397 /*Get k derivative: dk/dx */ 4398 drag_input->Get ParameterDerivativeValue(&dk[0],&xyz_list[0][0],gauss);4398 drag_input->GetInputDerivativeValue(&dk[0],&xyz_list[0][0],gauss); 4399 4399 4400 4400 /*Build gradje_g_gaussian vector (actually -dJ/ddrag): */ … … 4594 4594 4595 4595 /*retrieve inputs :*/ 4596 inputs->Get ParameterValue(&approximation,ApproximationEnum);4596 inputs->GetInputValue(&approximation,ApproximationEnum); 4597 4597 4598 4598 /*If on water, return 0: */ … … 4631 4631 4632 4632 /*retrieve inputs :*/ 4633 inputs->Get ParameterValue(&approximation,ApproximationEnum);4633 inputs->GetInputValue(&approximation,ApproximationEnum); 4634 4634 4635 4635 /*If on water, return 0: */ … … 4668 4668 4669 4669 /*retrieve inputs :*/ 4670 inputs->Get ParameterValue(&approximation,ApproximationEnum);4670 inputs->GetInputValue(&approximation,ApproximationEnum); 4671 4671 4672 4672 /*If on water, return 0: */ … … 4707 4707 4708 4708 /*retrieve inputs :*/ 4709 inputs->Get ParameterValue(&approximation,ApproximationEnum);4709 inputs->GetInputValue(&approximation,ApproximationEnum); 4710 4710 4711 4711 /*If on water, return 0: */ … … 4744 4744 4745 4745 /*retrieve inputs :*/ 4746 inputs->Get ParameterValue(&approximation,ApproximationEnum);4746 inputs->GetInputValue(&approximation,ApproximationEnum); 4747 4747 4748 4748 /*If on water, return 0: */ … … 4787 4787 4788 4788 /*retrieve inputs :*/ 4789 inputs->Get ParameterValue(&approximation,ApproximationEnum);4789 inputs->GetInputValue(&approximation,ApproximationEnum); 4790 4790 4791 4791 /*If on water, return 0: */ … … 4864 4864 4865 4865 /*retrieve inputs: */ 4866 Get ParameterListOnVertices(&thickness_init[0],ThicknessEnum);4867 Get ParameterListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum);4868 Get ParameterListOnVertices(&bed[0],BedEnum);4869 Get ParameterListOnVertices(&surface[0],SurfaceEnum);4866 GetInputListOnVertices(&thickness_init[0],ThicknessEnum); 4867 GetInputListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum); 4868 GetInputListOnVertices(&bed[0],BedEnum); 4869 GetInputListOnVertices(&surface[0],SurfaceEnum); 4870 4870 4871 4871 /*build new thickness: */ … … 4952 4952 4953 4953 int approximation; 4954 inputs->Get ParameterValue(&approximation,ApproximationEnum);4954 inputs->GetInputValue(&approximation,ApproximationEnum); 4955 4955 4956 4956 switch(approximation){ … … 4972 4972 4973 4973 /*Initialize Element vector and return if necessary*/ 4974 inputs->Get ParameterValue(&approximation,ApproximationEnum);4974 inputs->GetInputValue(&approximation,ApproximationEnum); 4975 4975 if(approximation!=StokesApproximationEnum) return NULL; 4976 4976 … … 5133 5133 // If we have a slope > 6% for this element, it means we are on a mountain. In this particular case, 5134 5134 //velocity should be = 0. To achieve this result, we set alpha2_list to a very high value: */ 5135 surface_input->Get ParameterDerivativeValue(&slope[0],&xyz_list[0][0],gauss);5135 surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); 5136 5136 slope_magnitude=sqrt(pow(slope[0],2)+pow(slope[1],2)); 5137 5137 … … 5299 5299 5300 5300 /*If on water or not Stokes, skip stiffness: */ 5301 inputs->Get ParameterValue(&approximation,ApproximationEnum);5301 inputs->GetInputValue(&approximation,ApproximationEnum); 5302 5302 if(IsOnShelf() || !IsOnBed()) return NULL; 5303 5303 ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); … … 5407 5407 5408 5408 int approximation; 5409 inputs->Get ParameterValue(&approximation,ApproximationEnum);5409 inputs->GetInputValue(&approximation,ApproximationEnum); 5410 5410 5411 5411 switch(approximation){ … … 5560 5560 /*Initialize Element matrix*/ 5561 5561 ElementMatrix* Ke=new ElementMatrix(tria->nodes,NUMVERTICES2D,this->parameters,MacAyealApproximationEnum); 5562 inputs->Get ParameterValue(&approximation,ApproximationEnum);5562 inputs->GetInputValue(&approximation,ApproximationEnum); 5563 5563 5564 5564 /*Retrieve all inputs and parameters*/ … … 5704 5704 5705 5705 /*Retrieve all inputs and parameters*/ 5706 inputs->Get ParameterValue(&approximation,ApproximationEnum);5706 inputs->GetInputValue(&approximation,ApproximationEnum); 5707 5707 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); 5708 5708 this->parameters->FindParam(&viscosity_overshoot,DiagnosticViscosityOvershootEnum); … … 5789 5789 GetL(&L[0][0], gauss,NDOF2); 5790 5790 5791 surface_input->Get ParameterDerivativeValue(&slope[0],&xyz_list[0][0],gauss);5791 surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); 5792 5792 friction->GetAlpha2(&alpha2, gauss,VxEnum,VyEnum,VzEnum); 5793 5793 slope_magnitude=sqrt(pow(slope[0],2)+pow(slope[1],2)); … … 5861 5861 5862 5862 /*If on water or not Stokes, skip stiffness: */ 5863 inputs->Get ParameterValue(&approximation,ApproximationEnum);5863 inputs->GetInputValue(&approximation,ApproximationEnum); 5864 5864 if(approximation!=StokesApproximationEnum && approximation!=MacAyealStokesApproximationEnum && approximation!=PattynStokesApproximationEnum) return NULL; 5865 5865 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum); … … 5929 5929 5930 5930 /*If on water or not Stokes, skip stiffness: */ 5931 inputs->Get ParameterValue(&approximation,ApproximationEnum);5931 inputs->GetInputValue(&approximation,ApproximationEnum); 5932 5932 if(IsOnShelf() || !IsOnBed() || (approximation!=StokesApproximationEnum && approximation!=MacAyealStokesApproximationEnum && approximation!=PattynStokesApproximationEnum)) return NULL; 5933 5933 ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum); … … 6129 6129 6130 6130 /*Initialize Element vector and return if necessary*/ 6131 inputs->Get ParameterValue(&approximation,ApproximationEnum);6131 inputs->GetInputValue(&approximation,ApproximationEnum); 6132 6132 if(approximation!=MacAyealStokesApproximationEnum) return NULL; 6133 6133 ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum); … … 6151 6151 GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); 6152 6152 6153 vzmacayeal_input->Get ParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);6153 vzmacayeal_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); 6154 6154 6155 6155 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); … … 6193 6193 /*Initialize Element vector and return if necessary*/ 6194 6194 if(!IsOnBed() || IsOnShelf()) return NULL; 6195 inputs->Get ParameterValue(&approximation,ApproximationEnum);6195 inputs->GetInputValue(&approximation,ApproximationEnum); 6196 6196 if(approximation!=MacAyealStokesApproximationEnum) return NULL; 6197 6197 ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum); … … 6220 6220 GetNodalFunctionsP1(basis, gauss); 6221 6221 6222 vzmacayeal_input->Get ParameterValue(&w, gauss);6223 vzmacayeal_input->Get ParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);6222 vzmacayeal_input->GetInputValue(&w, gauss); 6223 vzmacayeal_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); 6224 6224 6225 6225 BedNormal(&bed_normal[0],xyz_list_tria); … … 6274 6274 6275 6275 /*Initialize Element vector and return if necessary*/ 6276 inputs->Get ParameterValue(&approximation,ApproximationEnum);6276 inputs->GetInputValue(&approximation,ApproximationEnum); 6277 6277 if(approximation!=PattynStokesApproximationEnum) return NULL; 6278 6278 ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum); … … 6296 6296 GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss); 6297 6297 6298 vzpattyn_input->Get ParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);6298 vzpattyn_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); 6299 6299 6300 6300 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); … … 6338 6338 /*Initialize Element vector and return if necessary*/ 6339 6339 if(!IsOnBed() || IsOnShelf()) return NULL; 6340 inputs->Get ParameterValue(&approximation,ApproximationEnum);6340 inputs->GetInputValue(&approximation,ApproximationEnum); 6341 6341 if(approximation!=PattynStokesApproximationEnum) return NULL; 6342 6342 ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum); … … 6365 6365 GetNodalFunctionsP1(basis, gauss); 6366 6366 6367 vzpattyn_input->Get ParameterValue(&w, gauss);6368 vzpattyn_input->Get ParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);6367 vzpattyn_input->GetInputValue(&w, gauss); 6368 vzpattyn_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); 6369 6369 6370 6370 BedNormal(&bed_normal[0],xyz_list_tria); … … 6390 6390 6391 6391 int approximation; 6392 inputs->Get ParameterValue(&approximation,ApproximationEnum);6392 inputs->GetInputValue(&approximation,ApproximationEnum); 6393 6393 6394 6394 switch(approximation){ … … 6513 6513 gauss->GaussPoint(ig); 6514 6514 6515 slopex_input->Get ParameterValue(&slope[0],gauss);6516 slopey_input->Get ParameterValue(&slope[1],gauss);6517 surface_input->Get ParameterValue(&surface,gauss);6518 thickness_input->Get ParameterValue(&thickness,gauss);6515 slopex_input->GetInputValue(&slope[0],gauss); 6516 slopey_input->GetInputValue(&slope[1],gauss); 6517 surface_input->GetInputValue(&surface,gauss); 6518 thickness_input->GetInputValue(&thickness,gauss); 6519 6519 6520 6520 slope2=pow(slope[0],2)+pow(slope[1],2); 6521 6521 constant_part=-2*pow(rho_ice*gravity,n)*pow(slope2,((n-1)/2)); 6522 6522 6523 PentaRef::Get ParameterValue(&z_g,&z_list[0],gauss);6523 PentaRef::GetInputValue(&z_g,&z_list[0],gauss); 6524 6524 GetSegmentJacobianDeterminant(&Jdet,&xyz_list_segment[0][0],gauss); 6525 6525 … … 6571 6571 int i,j,ig; 6572 6572 double Jdet; 6573 double slope[3]; //do not put 2! this goes into Get ParameterDerivativeValue, which addresses slope[3] also!6573 double slope[3]; //do not put 2! this goes into GetInputDerivativeValue, which addresses slope[3] also! 6574 6574 double driving_stress_baseline,thickness; 6575 6575 double xyz_list[NUMVERTICES][3]; … … 6594 6594 GetNodalFunctionsP1(basis, gauss); 6595 6595 6596 thickness_input->Get ParameterValue(&thickness, gauss);6597 surface_input->Get ParameterDerivativeValue(&slope[0],&xyz_list[0][0],gauss);6596 thickness_input->GetInputValue(&thickness, gauss); 6597 surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); 6598 6598 6599 6599 driving_stress_baseline=matpar->GetRhoIce()*matpar->GetG(); … … 6646 6646 6647 6647 /*Initialize Element vector and return if necessary*/ 6648 inputs->Get ParameterValue(&approximation,ApproximationEnum);6648 inputs->GetInputValue(&approximation,ApproximationEnum); 6649 6649 if(approximation!=StokesApproximationEnum && approximation!=MacAyealStokesApproximationEnum && approximation!=PattynStokesApproximationEnum) return NULL; 6650 6650 ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum); … … 6718 6718 /*Initialize Element vector and return if necessary*/ 6719 6719 if(!IsOnBed() || !IsOnShelf()) return NULL; 6720 inputs->Get ParameterValue(&approximation,ApproximationEnum);6720 inputs->GetInputValue(&approximation,ApproximationEnum); 6721 6721 this->parameters->FindParam(&shelf_dampening,DiagnosticShelfDampeningEnum); 6722 6722 if(approximation!=StokesApproximationEnum && approximation!=MacAyealStokesApproximationEnum && approximation!=PattynStokesApproximationEnum) return NULL; … … 6744 6744 6745 6745 BedNormal(&bed_normal[0],xyz_list_tria); 6746 bed_input->Get ParameterValue(&bed, gauss);6746 bed_input->GetInputValue(&bed, gauss); 6747 6747 if(shelf_dampening){ //add dampening to avoid too high vertical velocities when not in hydrostatic equilibrium 6748 bed_input->Get ParameterDerivativeValue(&dz[0],&xyz_list[0][0],gauss);6749 vx_input->Get ParameterValue(&vx, gauss);6750 vy_input->Get ParameterValue(&vy, gauss);6751 vz_input->Get ParameterValue(&vz, gauss);6748 bed_input->GetInputDerivativeValue(&dz[0],&xyz_list[0][0],gauss); 6749 vx_input->GetInputValue(&vx, gauss); 6750 vy_input->GetInputValue(&vy, gauss); 6751 vz_input->GetInputValue(&vz, gauss); 6752 6752 dt=0; 6753 6753 normal_vel=bed_normal[0]*vx+bed_normal[1]*vy+bed_normal[2]*vz; … … 6800 6800 /*Retrieve all inputs and parameters*/ 6801 6801 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); 6802 inputs->Get ParameterValue(&approximation,ApproximationEnum);6802 inputs->GetInputValue(&approximation,ApproximationEnum); 6803 6803 Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); 6804 6804 Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); … … 6817 6817 GetNodalFunctionsP1(basis, gauss); 6818 6818 6819 vx_input->Get ParameterDerivativeValue(&du[0],&xyz_list[0][0],gauss);6820 vy_input->Get ParameterDerivativeValue(&dv[0],&xyz_list[0][0],gauss);6819 vx_input->GetInputDerivativeValue(&du[0],&xyz_list[0][0],gauss); 6820 vy_input->GetInputDerivativeValue(&dv[0],&xyz_list[0][0],gauss); 6821 6821 if(approximation==PattynStokesApproximationEnum || approximation==MacAyealStokesApproximationEnum){ 6822 vzstokes_input->Get ParameterDerivativeValue(&dw[0],&xyz_list[0][0],gauss);6822 vzstokes_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); 6823 6823 dwdz=dw[2]; 6824 6824 } … … 6861 6861 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); 6862 6862 for(i=0;i<NUMVERTICES2D;i++) for(j=0;j<3;j++) xyz_list_tria[i][j]=xyz_list[i][j]; 6863 inputs->Get ParameterValue(&approximation,ApproximationEnum);6863 inputs->GetInputValue(&approximation,ApproximationEnum); 6864 6864 Input* bed_input=inputs->GetInput(BedEnum); _assert_(bed_input); 6865 6865 Input* basal_melting_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); … … 6877 6877 gauss->GaussPoint(ig); 6878 6878 6879 basal_melting_input->Get ParameterValue(&basalmeltingvalue, gauss);6880 bed_input->Get ParameterDerivativeValue(&slope[0],&xyz_list[0][0],gauss);6881 vx_input->Get ParameterValue(&vx, gauss);6882 vy_input->Get ParameterValue(&vy, gauss);6879 basal_melting_input->GetInputValue(&basalmeltingvalue, gauss); 6880 bed_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); 6881 vx_input->GetInputValue(&vx, gauss); 6882 vy_input->GetInputValue(&vy, gauss); 6883 6883 if(approximation==PattynStokesApproximationEnum || approximation==MacAyealStokesApproximationEnum){ 6884 vzstokes_input->Get ParameterValue(&vz, gauss);6884 vzstokes_input->GetInputValue(&vz, gauss); 6885 6885 } 6886 6886 else vz=0; … … 6913 6913 6914 6914 /*Get approximation enum and dof list: */ 6915 inputs->Get ParameterValue(&approximation,ApproximationEnum);6915 inputs->GetInputValue(&approximation,ApproximationEnum); 6916 6916 Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); 6917 6917 Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); … … 6928 6928 /*Recover vx and vy*/ 6929 6929 gauss->GaussVertex(i); 6930 vx_input->Get ParameterValue(&vx,gauss);6931 vy_input->Get ParameterValue(&vy,gauss);6930 vx_input->GetInputValue(&vx,gauss); 6931 vy_input->GetInputValue(&vy,gauss); 6932 6932 values[i*NDOF2+0]=vx; 6933 6933 values[i*NDOF2+1]=vy; … … 6964 6964 /*Recover vx and vy*/ 6965 6965 gauss->GaussVertex(i); 6966 vx_input->Get ParameterValue(&vx,gauss);6967 vy_input->Get ParameterValue(&vy,gauss);6966 vx_input->GetInputValue(&vx,gauss); 6967 vy_input->GetInputValue(&vy,gauss); 6968 6968 values[i*NDOF2+0]=vx; 6969 6969 values[i*NDOF2+1]=vy; … … 6999 6999 /*Recover vz */ 7000 7000 gauss->GaussVertex(i); 7001 vz_input->Get ParameterValue(&vz,gauss);7001 vz_input->GetInputValue(&vz,gauss); 7002 7002 values[i]=vz; 7003 7003 } … … 7038 7038 for(i=0;i<NUMVERTICES;i++){ 7039 7039 gauss->GaussVertex(i); 7040 vx_input->Get ParameterValue(&vx,gauss);7041 vy_input->Get ParameterValue(&vy,gauss);7042 vz_input->Get ParameterValue(&vz,gauss);7043 p_input ->Get ParameterValue(&p ,gauss);7040 vx_input->GetInputValue(&vx,gauss); 7041 vy_input->GetInputValue(&vy,gauss); 7042 vz_input->GetInputValue(&vz,gauss); 7043 p_input ->GetInputValue(&p ,gauss); 7044 7044 values[i*NDOF4+0]=vx; 7045 7045 values[i*NDOF4+1]=vy; … … 7062 7062 7063 7063 /*Recover inputs*/ 7064 inputs->Get ParameterValue(&approximation,ApproximationEnum);7064 inputs->GetInputValue(&approximation,ApproximationEnum); 7065 7065 7066 7066 /*MacAyeal, everything is done by the element on bed*/ … … 7151 7151 7152 7152 /*Now compute pressure*/ 7153 Get ParameterListOnVertices(&surface[0],SurfaceEnum);7153 GetInputListOnVertices(&surface[0],SurfaceEnum); 7154 7154 for(i=0;i<NUMVERTICES;i++) pressure[i]=rho_ice*g*(surface[i]-xyz_list[i][2]); 7155 7155 … … 7250 7250 rho_ice=matpar->GetRhoIce(); 7251 7251 g=matpar->GetG(); 7252 Get ParameterListOnVertices(&surface[0],SurfaceEnum);7252 GetInputListOnVertices(&surface[0],SurfaceEnum); 7253 7253 for(i=0;i<NUMVERTICES;i++) pressure[i]=rho_ice*g*(surface[i]-xyz_list[i][2]); 7254 7254 … … 7407 7407 Input* vz_input=inputs->GetInput(VzEnum); 7408 7408 if (vz_input){ 7409 Get ParameterListOnVertices(&vz[0],VzEnum);7409 GetInputListOnVertices(&vz[0],VzEnum); 7410 7410 } 7411 7411 else{ … … 7420 7420 rho_ice=matpar->GetRhoIce(); 7421 7421 g=matpar->GetG(); 7422 Get ParameterListOnVertices(&surface[0],SurfaceEnum);7422 GetInputListOnVertices(&surface[0],SurfaceEnum); 7423 7423 for(i=0;i<NUMVERTICES;i++) pressure[i]=rho_ice*g*(surface[i]-xyz_list[i][2]); 7424 7424 … … 7588 7588 rho_ice=matpar->GetRhoIce(); 7589 7589 g=matpar->GetG(); 7590 Get ParameterListOnVertices(&surface[0],SurfaceEnum);7590 GetInputListOnVertices(&surface[0],SurfaceEnum); 7591 7591 for(i=0;i<NUMVERTICES;i++) pressure[i]=rho_ice*g*(surface[i]-xyz_list[i][2]); 7592 7592 … … 7633 7633 7634 7634 /*Get the approximation and do nothing if the element in Stokes or None*/ 7635 inputs->Get ParameterValue(&approximation,ApproximationEnum);7635 inputs->GetInputValue(&approximation,ApproximationEnum); 7636 7636 if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){ 7637 7637 return; … … 7704 7704 rho_ice=matpar->GetRhoIce(); 7705 7705 g=matpar->GetG(); 7706 Get ParameterListOnVertices(&surface[0],SurfaceEnum);7706 GetInputListOnVertices(&surface[0],SurfaceEnum); 7707 7707 for(i=0;i<NUMVERTICES;i++) pressure[i]=rho_ice*g*(surface[i]-xyz_list[i][2]); 7708 7708 } -
issm/trunk/src/c/objects/Elements/Penta.h
r9883 r10135 171 171 void GetDofList(int** pdoflist,int approximation_enum,int setenum); 172 172 void GetDofList1(int* doflist); 173 void 173 void GetSidList(int* sidlist); 174 174 int GetElementType(void); 175 void Get ParameterListOnVertices(double* pvalue,int enumtype);176 void Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue);177 void Get ParameterValue(double* pvalue,Node* node,int enumtype);175 void GetInputListOnVertices(double* pvalue,int enumtype); 176 void GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue); 177 void GetInputValue(double* pvalue,Node* node,int enumtype); 178 178 void GetPhi(double* phi, double* epsilon, double viscosity); 179 179 void GetSolutionFromInputsEnthalpy(Vec solutiong); 180 double GetStabilizationParameter(double u, double v, double w, double diameter, double rho_ice, double heatcapacity, double thermalconductivity);180 double GetStabilizationParameter(double u, double v, double w, double diameter, double rho_ice, double heatcapacity, double thermalconductivity); 181 181 void GetStrainRate3dPattyn(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input); 182 182 void GetStrainRate3d(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input, Input* vz_input); -
issm/trunk/src/c/objects/Elements/PentaRef.cpp
r9642 r10135 1301 1301 } 1302 1302 /*}}}*/ 1303 /*FUNCTION PentaRef::Get ParameterValue{{{1*/1304 void PentaRef::Get ParameterValue(double* pvalue,double* plist,GaussPenta* gauss){1303 /*FUNCTION PentaRef::GetInputValue{{{1*/ 1304 void PentaRef::GetInputValue(double* pvalue,double* plist,GaussPenta* gauss){ 1305 1305 /*P1 interpolation on Gauss point*/ 1306 1306 … … 1316 1316 } 1317 1317 /*}}}*/ 1318 /*FUNCTION PentaRef::Get ParameterDerivativeValue{{{1*/1319 void PentaRef::Get ParameterDerivativeValue(double* p, double* plist,double* xyz_list, GaussPenta* gauss){1318 /*FUNCTION PentaRef::GetInputDerivativeValue{{{1*/ 1319 void PentaRef::GetInputDerivativeValue(double* p, double* plist,double* xyz_list, GaussPenta* gauss){ 1320 1320 /*From node values of parameter p (p_list[0], p_list[1], p_list[2], p_list[3], p_list[4] and p_list[4]), return parameter derivative value at gaussian point specified by gauss_coord: 1321 1321 * dp/dx=p_list[0]*dh1/dx+p_list[1]*dh2/dx+p_list[2]*dh3/dx+p_list[3]*dh4/dx+p_list[4]*dh5/dx+p_list[5]*dh6/dx; -
issm/trunk/src/c/objects/Elements/PentaRef.h
r9642 r10135 56 56 void GetLStokesMacAyeal(double* LStokesMacAyeal, GaussPenta* gauss); 57 57 void GetLprimeStokesMacAyeal(double* LprimeStokesMacAyeal, double* xyz_list, GaussPenta* gauss); 58 void Get ParameterValue(double* pvalue,double* plist, GaussPenta* gauss);59 void Get ParameterValue(double* pvalue,double* plist,GaussTria* gauss){_error_("only PentaGauss are supported");};60 void Get ParameterDerivativeValue(double* pvalues, double* plist,double* xyz_list, GaussPenta* gauss);61 void Get ParameterDerivativeValue(double* pvalues, double* plist,double* xyz_list, GaussTria* gauss){_error_("only PentaGauss are supported");};58 void GetInputValue(double* pvalue,double* plist, GaussPenta* gauss); 59 void GetInputValue(double* pvalue,double* plist,GaussTria* gauss){_error_("only PentaGauss are supported");}; 60 void GetInputDerivativeValue(double* pvalues, double* plist,double* xyz_list, GaussPenta* gauss); 61 void GetInputDerivativeValue(double* pvalues, double* plist,double* xyz_list, GaussTria* gauss){_error_("only PentaGauss are supported");}; 62 62 63 63 }; -
issm/trunk/src/c/objects/Elements/Tria.cpp
r9883 r10135 294 294 if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); 295 295 296 Get ParameterListOnVertices(&h[0],ThicknessEnum);297 Get ParameterListOnVertices(&s[0],SurfaceEnum);298 Get ParameterListOnVertices(&b[0],BedEnum);299 Get ParameterListOnVertices(&ba[0],BathymetryEnum);296 GetInputListOnVertices(&h[0],ThicknessEnum); 297 GetInputListOnVertices(&s[0],SurfaceEnum); 298 GetInputListOnVertices(&b[0],BedEnum); 299 GetInputListOnVertices(&ba[0],BathymetryEnum); 300 300 301 301 /*material parameters: */ … … 542 542 delete gauss; 543 543 544 vxaverage_input->Get ParameterAverage(&v_gauss[0]);545 vyaverage_input->Get ParameterAverage(&v_gauss[1]);544 vxaverage_input->GetInputAverage(&v_gauss[0]); 545 vyaverage_input->GetInputAverage(&v_gauss[1]); 546 546 547 547 K[0][0]=pow(Jdettria,(double).5)/2.0*fabs(v_gauss[0]); … … 558 558 GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); 559 559 560 vxaverage_input->Get ParameterValue(&vx,gauss);561 vyaverage_input->Get ParameterValue(&vy,gauss);562 vxaverage_input->Get ParameterDerivativeValue(&dvx[0],&xyz_list[0][0],gauss);563 vyaverage_input->Get ParameterDerivativeValue(&dvy[0],&xyz_list[0][0],gauss);560 vxaverage_input->GetInputValue(&vx,gauss); 561 vyaverage_input->GetInputValue(&vy,gauss); 562 vxaverage_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); 563 vyaverage_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); 564 564 565 565 DL_scalar=gauss->weight*Jdettria; … … 650 650 gauss->GaussPoint(ig); 651 651 652 vxaverage_input->Get ParameterValue(&vx,gauss);653 vyaverage_input->Get ParameterValue(&vy,gauss);652 vxaverage_input->GetInputValue(&vx,gauss); 653 vyaverage_input->GetInputValue(&vy,gauss); 654 654 655 655 GetJacobianDeterminant2d(&Jdettria, &xyz_list[0][0],gauss); … … 832 832 GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); 833 833 834 surface_mass_balance_input->Get ParameterValue(&surface_mass_balance_g,gauss);835 basal_melting_input->Get ParameterValue(&basal_melting_g,gauss);836 thickness_input->Get ParameterValue(&thickness_g,gauss);837 if(basal_melting_correction_input) basal_melting_correction_input->Get ParameterValue(&basal_melting_correction_g,gauss);834 surface_mass_balance_input->GetInputValue(&surface_mass_balance_g,gauss); 835 basal_melting_input->GetInputValue(&basal_melting_g,gauss); 836 thickness_input->GetInputValue(&thickness_g,gauss); 837 if(basal_melting_correction_input) basal_melting_correction_input->GetInputValue(&basal_melting_correction_g,gauss); 838 838 839 839 for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(thickness_g+dt*(surface_mass_balance_g-basal_melting_g-basal_melting_correction_g))*L[i]; … … 878 878 GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); 879 879 880 surface_mass_balance_input->Get ParameterValue(&surface_mass_balance_g,gauss);881 basal_melting_input->Get ParameterValue(&basal_melting_g,gauss);882 thickness_input->Get ParameterValue(&thickness_g,gauss);880 surface_mass_balance_input->GetInputValue(&surface_mass_balance_g,gauss); 881 basal_melting_input->GetInputValue(&basal_melting_g,gauss); 882 thickness_input->GetInputValue(&thickness_g,gauss); 883 883 884 884 for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(thickness_g+dt*(surface_mass_balance_g-basal_melting_g))*L[i]; … … 928 928 GetNodalFunctions(basis, gauss); 929 929 930 slope_input->Get ParameterDerivativeValue(&slope[0],&xyz_list[0][0],gauss);930 slope_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); 931 931 932 932 if ( (analysis_type==SurfaceSlopeXAnalysisEnum) || (analysis_type==BedSlopeXAnalysisEnum)){ … … 1140 1140 } 1141 1141 /*}}}*/ 1142 /*FUNCTION Tria::Get ParameterListOnVertices(double* pvalue,int enumtype) {{{1*/1143 void Tria::Get ParameterListOnVertices(double* pvalue,int enumtype){1142 /*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype) {{{1*/ 1143 void Tria::GetInputListOnVertices(double* pvalue,int enumtype){ 1144 1144 1145 1145 /*Intermediaries*/ … … 1158 1158 for (int iv=0;iv<NUMVERTICES;iv++){ 1159 1159 gauss->GaussVertex(iv); 1160 input->Get ParameterValue(&pvalue[iv],gauss);1160 input->GetInputValue(&pvalue[iv],gauss); 1161 1161 } 1162 1162 … … 1165 1165 } 1166 1166 /*}}}*/ 1167 /*FUNCTION Tria::Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/1168 void Tria::Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue){1167 /*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/ 1168 void Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue){ 1169 1169 1170 1170 double value[NUMVERTICES]; … … 1180 1180 for (int iv=0;iv<NUMVERTICES;iv++){ 1181 1181 gauss->GaussVertex(iv); 1182 input->Get ParameterValue(&pvalue[iv],gauss);1182 input->GetInputValue(&pvalue[iv],gauss); 1183 1183 } 1184 1184 } … … 1191 1191 } 1192 1192 /*}}}*/ 1193 /*FUNCTION Tria::Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index) TO BE REMOVED{{{1*/1194 void Tria::Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index){1193 /*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index) TO BE REMOVED{{{1*/ 1194 void Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index){ 1195 1195 1196 1196 double value[NUMVERTICES]; … … 1206 1206 for (int iv=0;iv<NUMVERTICES;iv++){ 1207 1207 gauss->GaussVertex(iv); 1208 input->Get ParameterValue(&pvalue[iv],gauss,index);1208 input->GetInputValue(&pvalue[iv],gauss,index); 1209 1209 } 1210 1210 } … … 1217 1217 } 1218 1218 /*}}}*/ 1219 /*FUNCTION Tria::Get ParameterValue(double* pvalue,Node* node,int enumtype) {{{1*/1220 void Tria::Get ParameterValue(double* pvalue,Node* node,int enumtype){1219 /*FUNCTION Tria::GetInputValue(double* pvalue,Node* node,int enumtype) {{{1*/ 1220 void Tria::GetInputValue(double* pvalue,Node* node,int enumtype){ 1221 1221 1222 1222 Input* input=inputs->GetInput(enumtype); … … 1226 1226 gauss->GaussVertex(this->GetNodeIndex(node)); 1227 1227 1228 input->Get ParameterValue(pvalue,gauss);1228 input->GetInputValue(pvalue,gauss); 1229 1229 delete gauss; 1230 1230 } … … 1896 1896 1897 1897 bool onbed; 1898 inputs->Get ParameterValue(&onbed,MeshElementonbedEnum);1898 inputs->GetInputValue(&onbed,MeshElementonbedEnum); 1899 1899 return onbed; 1900 1900 } … … 1904 1904 1905 1905 bool shelf; 1906 inputs->Get ParameterValue(&shelf,MaskElementonfloatingiceEnum);1906 inputs->GetInputValue(&shelf,MaskElementonfloatingiceEnum); 1907 1907 return shelf; 1908 1908 } … … 1942 1942 1943 1943 bool water; 1944 inputs->Get ParameterValue(&water,MaskElementonwaterEnum);1944 inputs->GetInputValue(&water,MaskElementonwaterEnum); 1945 1945 return water; 1946 1946 } … … 1998 1998 if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); 1999 1999 2000 Get ParameterListOnVertices(&h[0],ThicknessEnum);2001 Get ParameterListOnVertices(&s[0],SurfaceEnum);2002 Get ParameterListOnVertices(&b[0],BedEnum);2003 Get ParameterListOnVertices(&ba[0],BathymetryEnum);2000 GetInputListOnVertices(&h[0],ThicknessEnum); 2001 GetInputListOnVertices(&s[0],SurfaceEnum); 2002 GetInputListOnVertices(&b[0],BedEnum); 2003 GetInputListOnVertices(&ba[0],BathymetryEnum); 2004 2004 for(i=0;i<3;i++){ 2005 2005 isonshelf[i]=nodes[i]->IsOnShelf(); … … 2128 2128 if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); 2129 2129 2130 Get ParameterListOnVertices(&h[0],ThicknessEnum);2131 Get ParameterListOnVertices(&s[0],SurfaceEnum);2132 Get ParameterListOnVertices(&b[0],BedEnum);2133 Get ParameterListOnVertices(&ba[0],BathymetryEnum);2130 GetInputListOnVertices(&h[0],ThicknessEnum); 2131 GetInputListOnVertices(&s[0],SurfaceEnum); 2132 GetInputListOnVertices(&b[0],BedEnum); 2133 GetInputListOnVertices(&ba[0],BathymetryEnum); 2134 2134 2135 2135 /*material parameters: */ … … 2229 2229 if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); 2230 2230 2231 Get ParameterListOnVertices(&h[0],ThicknessEnum);2232 Get ParameterListOnVertices(&s[0],SurfaceEnum);2233 Get ParameterListOnVertices(&b[0],BedEnum);2234 Get ParameterListOnVertices(&ba[0],BathymetryEnum);2231 GetInputListOnVertices(&h[0],ThicknessEnum); 2232 GetInputListOnVertices(&s[0],SurfaceEnum); 2233 GetInputListOnVertices(&b[0],BedEnum); 2234 GetInputListOnVertices(&ba[0],BathymetryEnum); 2235 2235 2236 2236 /*material parameters: */ … … 2290 2290 if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); 2291 2291 2292 Get ParameterListOnVertices(&h[0],ThicknessEnum);2293 Get ParameterListOnVertices(&s[0],SurfaceEnum);2294 Get ParameterListOnVertices(&b[0],BedEnum);2295 Get ParameterListOnVertices(&ba[0],BathymetryEnum);2292 GetInputListOnVertices(&h[0],ThicknessEnum); 2293 GetInputListOnVertices(&s[0],SurfaceEnum); 2294 GetInputListOnVertices(&b[0],BedEnum); 2295 GetInputListOnVertices(&ba[0],BathymetryEnum); 2296 2296 2297 2297 /*material parameters: */ … … 2567 2567 if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); 2568 2568 2569 Get ParameterListOnVertices(&h[0],ThicknessEnum);2570 Get ParameterListOnVertices(&s[0],SurfaceEnum);2571 Get ParameterListOnVertices(&b[0],BedEnum);2572 Get ParameterListOnVertices(&ba[0],BathymetryEnum);2569 GetInputListOnVertices(&h[0],ThicknessEnum); 2570 GetInputListOnVertices(&s[0],SurfaceEnum); 2571 GetInputListOnVertices(&b[0],BedEnum); 2572 GetInputListOnVertices(&ba[0],BathymetryEnum); 2573 2573 2574 2574 /*material parameters: */ … … 2630 2630 double ba[3]; 2631 2631 2632 Get ParameterListOnVertices(&h[0],ThicknessEnum);2633 Get ParameterListOnVertices(&s[0],SurfaceEnum);2634 Get ParameterListOnVertices(&b[0],BedEnum);2635 Get ParameterListOnVertices(&ba[0],BathymetryEnum);2632 GetInputListOnVertices(&h[0],ThicknessEnum); 2633 GetInputListOnVertices(&s[0],SurfaceEnum); 2634 GetInputListOnVertices(&b[0],BedEnum); 2635 GetInputListOnVertices(&ba[0],BathymetryEnum); 2636 2636 2637 2637 for(i=0;i<3;i++){ … … 2682 2682 Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); 2683 2683 Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); 2684 surface_input->Get ParameterAverage(&surface);2685 bed_input->Get ParameterAverage(&bed);2684 surface_input->GetInputAverage(&surface); 2685 bed_input->GetInputAverage(&bed); 2686 2686 2687 2687 /*Return: */ … … 2731 2731 Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); 2732 2732 2733 thickness_input->Get ParameterValue(&h1, gauss_1);2734 thickness_input->Get ParameterValue(&h2, gauss_2);2735 vx_input->Get ParameterValue(&vx1,gauss_1);2736 vx_input->Get ParameterValue(&vx2,gauss_2);2737 vy_input->Get ParameterValue(&vy1,gauss_1);2738 vy_input->Get ParameterValue(&vy2,gauss_2);2733 thickness_input->GetInputValue(&h1, gauss_1); 2734 thickness_input->GetInputValue(&h2, gauss_2); 2735 vx_input->GetInputValue(&vx1,gauss_1); 2736 vx_input->GetInputValue(&vx2,gauss_2); 2737 vy_input->GetInputValue(&vy1,gauss_1); 2738 vy_input->GetInputValue(&vy2,gauss_2); 2739 2739 2740 2740 mass_flux= rho_ice*length*( … … 2916 2916 /*ok, we are good. retrieve value of input at vertex :*/ 2917 2917 gauss=new GaussTria(); gauss->GaussVertex(i); 2918 data->Get ParameterValue(&value,gauss);2918 data->GetInputValue(&value,gauss); 2919 2919 found=1; 2920 2920 break; … … 2995 2995 matice->GetViscosity2d(&viscosity, &epsilon[0]); 2996 2996 matice->GetViscosity2d(&oldviscosity, &oldepsilon[0]); 2997 thickness_input->Get ParameterValue(&thickness, gauss);2997 thickness_input->GetInputValue(&thickness, gauss); 2998 2998 2999 2999 newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); … … 3056 3056 // If we have a slope > 6% for this element, it means we are on a mountain. In this particular case, 3057 3057 //velocity should be = 0. To achieve this result, we set alpha2_list to a very high value: */ 3058 surface_input->Get ParameterDerivativeValue(&slope[0],&xyz_list[0][0],gauss);3058 surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); 3059 3059 slope_magnitude=sqrt(pow(slope[0],2)+pow(slope[1],2)); 3060 3060 if(slope_magnitude>MAXSLOPE) alpha2=pow((double)10,MOUNTAINKEXPONENT); … … 3133 3133 GetNodalFunctions(basis, gauss); 3134 3134 3135 thickness_input->Get ParameterValue(&thickness,gauss);3136 surface_input->Get ParameterDerivativeValue(&slope[0],&xyz_list[0][0],gauss);3135 thickness_input->GetInputValue(&thickness,gauss); 3136 surface_input->GetInputDerivativeValue(&slope[0],&xyz_list[0][0],gauss); 3137 3137 driving_stress_baseline=matpar->GetRhoIce()*matpar->GetG()*thickness; 3138 3138 … … 3181 3181 connectivity=nodes[i]->GetConnectivity(); 3182 3182 3183 thickness_input->Get ParameterValue(&thickness,gauss);3184 slopex_input->Get ParameterValue(&slope[0],gauss);3185 slopey_input->Get ParameterValue(&slope[1],gauss);3183 thickness_input->GetInputValue(&thickness,gauss); 3184 slopex_input->GetInputValue(&slope[0],gauss); 3185 slopey_input->GetInputValue(&slope[1],gauss); 3186 3186 slope2=pow(slope[0],2)+pow(slope[1],2); 3187 3187 … … 3226 3226 3227 3227 /*Recover vx and vy*/ 3228 vx_input->Get ParameterValue(&vx,gauss);3229 vy_input->Get ParameterValue(&vy,gauss);3228 vx_input->GetInputValue(&vx,gauss); 3229 vy_input->GetInputValue(&vy,gauss); 3230 3230 values[i*NDOF2+0]=vx; 3231 3231 values[i*NDOF2+1]=vy; … … 3265 3265 3266 3266 /*Recover vx and vy*/ 3267 vx_input->Get ParameterValue(&vx,gauss);3268 vy_input->Get ParameterValue(&vy,gauss);3267 vx_input->GetInputValue(&vx,gauss); 3268 vy_input->GetInputValue(&vy,gauss); 3269 3269 values[i*NDOF2+0]=vx; 3270 3270 values[i*NDOF2+1]=vy; … … 3312 3312 3313 3313 /*Get Vz and compute vel*/ 3314 Get ParameterListOnVertices(&vz[0],VzEnum,0);3314 GetInputListOnVertices(&vz[0],VzEnum,0); 3315 3315 for(i=0;i<NUMVERTICES;i++) vel[i]=pow( pow(vx[i],2.0) + pow(vy[i],2.0) + pow(vz[i],2.0) , 0.5); 3316 3316 … … 3319 3319 rho_ice=matpar->GetRhoIce(); 3320 3320 g=matpar->GetG(); 3321 Get ParameterListOnVertices(&thickness[0],ThicknessEnum);3321 GetInputListOnVertices(&thickness[0],ThicknessEnum); 3322 3322 for(i=0;i<NUMVERTICES;i++) pressure[i]=rho_ice*g*thickness[i]; 3323 3323 … … 3394 3394 rho_ice=matpar->GetRhoIce(); 3395 3395 g=matpar->GetG(); 3396 Get ParameterListOnVertices(&thickness[0],ThicknessEnum);3396 GetInputListOnVertices(&thickness[0],ThicknessEnum); 3397 3397 for(i=0;i<NUMVERTICES;i++) pressure[i]=rho_ice*g*thickness[i]; 3398 3398 … … 3596 3596 GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss); 3597 3597 GetNodalFunctionsDerivatives(&dbasis[0][0],&xyz_list[0][0],gauss); 3598 weights_input->Get ParameterValue(&weight,gauss,weight_index);3598 weights_input->GetInputValue(&weight,gauss,weight_index); 3599 3599 3600 3600 /*Build alpha_complement_list: */ 3601 rheologyb_input->Get ParameterDerivativeValue(&dk[0],&xyz_list[0][0],gauss);3601 rheologyb_input->GetInputDerivativeValue(&dk[0],&xyz_list[0][0],gauss); 3602 3602 3603 3603 /*Build gradje_g_gaussian vector (actually -dJ/ddrag): */ … … 3642 3642 gauss->GaussPoint(ig); 3643 3643 3644 thickness_input->Get ParameterValue(&thickness,gauss);3645 rheologyb_input->Get ParameterDerivativeValue(&dB[0],&xyz_list[0][0],gauss);3646 vx_input->Get ParameterDerivativeValue(&dvx[0],&xyz_list[0][0],gauss);3647 vy_input->Get ParameterDerivativeValue(&dvy[0],&xyz_list[0][0],gauss);3648 adjointx_input->Get ParameterDerivativeValue(&dadjx[0],&xyz_list[0][0],gauss);3649 adjointy_input->Get ParameterDerivativeValue(&dadjy[0],&xyz_list[0][0],gauss);3644 thickness_input->GetInputValue(&thickness,gauss); 3645 rheologyb_input->GetInputDerivativeValue(&dB[0],&xyz_list[0][0],gauss); 3646 vx_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); 3647 vy_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); 3648 adjointx_input->GetInputDerivativeValue(&dadjx[0],&xyz_list[0][0],gauss); 3649 adjointy_input->GetInputDerivativeValue(&dadjy[0],&xyz_list[0][0],gauss); 3650 3650 3651 3651 this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); … … 3713 3713 friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); 3714 3714 3715 dragcoefficient_input->Get ParameterValue(&drag, gauss);3716 adjointx_input->Get ParameterValue(&lambda, gauss);3717 adjointy_input->Get ParameterValue(&mu, gauss);3718 vx_input->Get ParameterValue(&vx,gauss);3719 vy_input->Get ParameterValue(&vy,gauss);3720 dragcoefficient_input->Get ParameterDerivativeValue(&dk[0],&xyz_list[0][0],gauss);3715 dragcoefficient_input->GetInputValue(&drag, gauss); 3716 adjointx_input->GetInputValue(&lambda, gauss); 3717 adjointy_input->GetInputValue(&mu, gauss); 3718 vx_input->GetInputValue(&vx,gauss); 3719 vy_input->GetInputValue(&vy,gauss); 3720 dragcoefficient_input->GetInputDerivativeValue(&dk[0],&xyz_list[0][0],gauss); 3721 3721 3722 3722 /*Build gradje_g_gaussian vector (actually -dJ/ddrag): */ … … 3737 3737 // gauss->GaussVertex(iv); 3738 3738 // friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); 3739 // dragcoefficient_input->Get ParameterValue(&drag, gauss);3740 // adjointx_input->Get ParameterValue(&lambda, gauss);3741 // adjointy_input->Get ParameterValue(&mu, gauss);3742 // vx_input->Get ParameterValue(&vx,gauss);3743 // vy_input->Get ParameterValue(&vy,gauss);3739 // dragcoefficient_input->GetInputValue(&drag, gauss); 3740 // adjointx_input->GetInputValue(&lambda, gauss); 3741 // adjointy_input->GetInputValue(&mu, gauss); 3742 // vx_input->GetInputValue(&vx,gauss); 3743 // vy_input->GetInputValue(&vy,gauss); 3744 3744 // grade_g[iv]=-2*drag*alpha_complement*((lambda*vx+mu*vy)); 3745 3745 // VecSetValues(gradient,NUMVERTICES,doflist1,(const double*)grade_g,INSERT_VALUES); … … 3781 3781 GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss); 3782 3782 GetNodalFunctionsDerivatives(&dbasis[0][0],&xyz_list[0][0],gauss); 3783 weights_input->Get ParameterValue(&weight,gauss,weight_index);3783 weights_input->GetInputValue(&weight,gauss,weight_index); 3784 3784 3785 3785 /*Build alpha_complement_list: */ 3786 dragcoefficient_input->Get ParameterDerivativeValue(&dk[0],&xyz_list[0][0],gauss);3786 dragcoefficient_input->GetInputDerivativeValue(&dk[0],&xyz_list[0][0],gauss); 3787 3787 3788 3788 /*Build gradje_g_gaussian vector (actually -dJ/ddrag): */ … … 3809 3809 3810 3810 /*Compute Gradient*/ 3811 Get ParameterListOnVertices(&lambda[0],AdjointEnum);3811 GetInputListOnVertices(&lambda[0],AdjointEnum); 3812 3812 for(int i=0;i<NUMVERTICES;i++) gradient_g[i]=-lambda[i]; 3813 3813 … … 3845 3845 GetNodalFunctions(basis, gauss); 3846 3846 3847 adjoint_input->Get ParameterDerivativeValue(&Dlambda[0],&xyz_list[0][0],gauss);3848 thickness_input->Get ParameterValue(&thickness, gauss);3849 thickness_input->Get ParameterDerivativeValue(&dp[0],&xyz_list[0][0],gauss);3847 adjoint_input->GetInputDerivativeValue(&Dlambda[0],&xyz_list[0][0],gauss); 3848 thickness_input->GetInputValue(&thickness, gauss); 3849 thickness_input->GetInputDerivativeValue(&dp[0],&xyz_list[0][0],gauss); 3850 3850 3851 3851 for(i=0;i<NUMVERTICES;i++) grade_g[i]+=thickness*Dlambda[0]*Jdet*gauss->weight*basis[i]; … … 3888 3888 GetNodalFunctions(basis, gauss); 3889 3889 3890 adjoint_input->Get ParameterDerivativeValue(&Dlambda[0],&xyz_list[0][0],gauss);3891 thickness_input->Get ParameterValue(&thickness, gauss);3892 thickness_input->Get ParameterDerivativeValue(&dp[0],&xyz_list[0][0],gauss);3890 adjoint_input->GetInputDerivativeValue(&Dlambda[0],&xyz_list[0][0],gauss); 3891 thickness_input->GetInputValue(&thickness, gauss); 3892 thickness_input->GetInputDerivativeValue(&dp[0],&xyz_list[0][0],gauss); 3893 3893 3894 3894 for(i=0;i<NUMVERTICES;i++) grade_g[i]+=thickness*Dlambda[1]*Jdet*gauss->weight*basis[i]; … … 3932 3932 3933 3933 /*Get all parameters at gaussian point*/ 3934 weights_input->Get ParameterValue(&weight,gauss,weight_index);3935 rheologyb_input->Get ParameterDerivativeValue(&dp[0],&xyz_list[0][0],gauss);3934 weights_input->GetInputValue(&weight,gauss,weight_index); 3935 rheologyb_input->GetInputDerivativeValue(&dp[0],&xyz_list[0][0],gauss); 3936 3936 3937 3937 /*Tikhonov regularization: J = 1/2 ((dp/dx)^2 + (dp/dy)^2) */ … … 3963 3963 3964 3964 /*Retrieve all inputs we will be needing: */ 3965 inputs->Get ParameterValue(&S,SurfaceAreaEnum);3965 inputs->GetInputValue(&S,SurfaceAreaEnum); 3966 3966 Input* weights_input=inputs->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input); 3967 3967 Input* vx_input =inputs->GetInput(VxEnum); _assert_(vx_input); … … 3980 3980 3981 3981 /*Get all parameters at gaussian point*/ 3982 weights_input->Get ParameterValue(&weight,gauss,weight_index);3983 vx_input->Get ParameterValue(&vx,gauss);3984 vy_input->Get ParameterValue(&vy,gauss);3985 vxobs_input->Get ParameterValue(&vxobs,gauss);3986 vyobs_input->Get ParameterValue(&vyobs,gauss);3982 weights_input->GetInputValue(&weight,gauss,weight_index); 3983 vx_input->GetInputValue(&vx,gauss); 3984 vy_input->GetInputValue(&vy,gauss); 3985 vxobs_input->GetInputValue(&vxobs,gauss); 3986 vyobs_input->GetInputValue(&vyobs,gauss); 3987 3987 3988 3988 /*Compute SurfaceAverageVelMisfitEnum: … … 4043 4043 4044 4044 /*Get all parameters at gaussian point*/ 4045 weights_input->Get ParameterValue(&weight,gauss,weight_index);4046 vx_input->Get ParameterValue(&vx,gauss);4047 vy_input->Get ParameterValue(&vy,gauss);4048 vxobs_input->Get ParameterValue(&vxobs,gauss);4049 vyobs_input->Get ParameterValue(&vyobs,gauss);4045 weights_input->GetInputValue(&weight,gauss,weight_index); 4046 vx_input->GetInputValue(&vx,gauss); 4047 vy_input->GetInputValue(&vy,gauss); 4048 vxobs_input->GetInputValue(&vxobs,gauss); 4049 vyobs_input->GetInputValue(&vyobs,gauss); 4050 4050 4051 4051 /*Compute SurfaceLogVelMisfit: … … 4108 4108 4109 4109 /*Get all parameters at gaussian point*/ 4110 weights_input->Get ParameterValue(&weight,gauss,weight_index);4111 vx_input->Get ParameterValue(&vx,gauss);4112 vy_input->Get ParameterValue(&vy,gauss);4113 vxobs_input->Get ParameterValue(&vxobs,gauss);4114 vyobs_input->Get ParameterValue(&vyobs,gauss);4110 weights_input->GetInputValue(&weight,gauss,weight_index); 4111 vx_input->GetInputValue(&vx,gauss); 4112 vy_input->GetInputValue(&vy,gauss); 4113 vxobs_input->GetInputValue(&vxobs,gauss); 4114 vyobs_input->GetInputValue(&vyobs,gauss); 4115 4115 4116 4116 /*Compute SurfaceRelVelMisfit: … … 4171 4171 4172 4172 /*Get all parameters at gaussian point*/ 4173 weights_input->Get ParameterValue(&weight,gauss,weight_index);4174 vx_input->Get ParameterValue(&vx,gauss);4175 vy_input->Get ParameterValue(&vy,gauss);4176 vxobs_input->Get ParameterValue(&vxobs,gauss);4177 vyobs_input->Get ParameterValue(&vyobs,gauss);4173 weights_input->GetInputValue(&weight,gauss,weight_index); 4174 vx_input->GetInputValue(&vx,gauss); 4175 vy_input->GetInputValue(&vy,gauss); 4176 vxobs_input->GetInputValue(&vxobs,gauss); 4177 vyobs_input->GetInputValue(&vyobs,gauss); 4178 4178 4179 4179 /*Compute SurfaceAbsVelMisfitEnum: … … 4234 4234 4235 4235 /*Get all parameters at gaussian point*/ 4236 weights_input->Get ParameterValue(&weight,gauss,weight_index);4237 vx_input->Get ParameterValue(&vx,gauss);4238 vy_input->Get ParameterValue(&vy,gauss);4239 vxobs_input->Get ParameterValue(&vxobs,gauss);4240 vyobs_input->Get ParameterValue(&vyobs,gauss);4236 weights_input->GetInputValue(&weight,gauss,weight_index); 4237 vx_input->GetInputValue(&vx,gauss); 4238 vy_input->GetInputValue(&vy,gauss); 4239 vxobs_input->GetInputValue(&vxobs,gauss); 4240 vyobs_input->GetInputValue(&vyobs,gauss); 4241 4241 4242 4242 /*Compute SurfaceRelVelMisfit: … … 4293 4293 4294 4294 /*Get all parameters at gaussian point*/ 4295 weights_input->Get ParameterValue(&weight,gauss,weight_index);4296 thickness_input->Get ParameterDerivativeValue(&dp[0],&xyz_list[0][0],gauss);4295 weights_input->GetInputValue(&weight,gauss,weight_index); 4296 thickness_input->GetInputDerivativeValue(&dp[0],&xyz_list[0][0],gauss); 4297 4297 4298 4298 /*Tikhonov regularization: J = 1/2 ((dp/dx)^2 + (dp/dy)^2) */ … … 4336 4336 4337 4337 /*Get parameters at gauss point*/ 4338 thickness_input->Get ParameterValue(&thickness,gauss);4339 thickness_input->Get ParameterDerivativeValue(&dH[0],&xyz_list[0][0],gauss);4340 thicknessobs_input->Get ParameterValue(&thicknessobs,gauss);4341 weights_input->Get ParameterValue(&weight,gauss,weight_index);4338 thickness_input->GetInputValue(&thickness,gauss); 4339 thickness_input->GetInputDerivativeValue(&dH[0],&xyz_list[0][0],gauss); 4340 thicknessobs_input->GetInputValue(&thicknessobs,gauss); 4341 weights_input->GetInputValue(&weight,gauss,weight_index); 4342 4342 4343 4343 /*compute ThicknessAbsMisfit*/ … … 4389 4389 GetNodalFunctionsDerivatives(&dbasis[0][0],&xyz_list[0][0],gauss); 4390 4390 4391 thickness_input->Get ParameterValue(&thickness, gauss);4392 thickness_input->Get ParameterDerivativeValue(&dH[0],&xyz_list[0][0],gauss);4393 thicknessobs_input->Get ParameterValue(&thicknessobs, gauss);4391 thickness_input->GetInputValue(&thickness, gauss); 4392 thickness_input->GetInputDerivativeValue(&dH[0],&xyz_list[0][0],gauss); 4393 thicknessobs_input->GetInputValue(&thicknessobs, gauss); 4394 4394 4395 4395 /*Loop over all requested responses*/ … … 4397 4397 4398 4398 case ThicknessAbsMisfitEnum: 4399 weights_input->Get ParameterValue(&weight, gauss,resp);4399 weights_input->GetInputValue(&weight, gauss,resp); 4400 4400 for(i=0;i<numdof;i++) pe->values[i]+=(thicknessobs-thickness)*weight*Jdet*gauss->weight*basis[i]; 4401 4401 break; 4402 4402 case ThicknessAbsGradientEnum: 4403 weights_input->Get ParameterValue(&weight, gauss,resp);4403 weights_input->GetInputValue(&weight, gauss,resp); 4404 4404 for(i=0;i<numdof;i++) pe->values[i]+= - weight*dH[0]*dbasis[0][i]*Jdet*gauss->weight; 4405 4405 for(i=0;i<numdof;i++) pe->values[i]+= - weight*dH[1]*dbasis[1][i]*Jdet*gauss->weight; … … 4452 4452 for(resp=0;resp<num_responses;resp++){ 4453 4453 if(responses[resp]==SurfaceAverageVelMisfitEnum){ 4454 inputs->Get ParameterValue(&S,SurfaceAreaEnum); break;4454 inputs->GetInputValue(&S,SurfaceAreaEnum); break; 4455 4455 } 4456 4456 } … … 4466 4466 4467 4467 /*Get all parameters at gaussian point*/ 4468 vx_input->Get ParameterValue(&vx,gauss);4469 vy_input->Get ParameterValue(&vy,gauss);4470 vxobs_input->Get ParameterValue(&vxobs,gauss);4471 vyobs_input->Get ParameterValue(&vyobs,gauss);4468 vx_input->GetInputValue(&vx,gauss); 4469 vy_input->GetInputValue(&vy,gauss); 4470 vxobs_input->GetInputValue(&vxobs,gauss); 4471 vyobs_input->GetInputValue(&vyobs,gauss); 4472 4472 GetNodalFunctions(basis, gauss); 4473 4473 … … 4475 4475 for(resp=0;resp<num_responses;resp++){ 4476 4476 4477 weights_input->Get ParameterValue(&weight,gauss,resp);4477 weights_input->GetInputValue(&weight,gauss,resp); 4478 4478 4479 4479 switch(responses[resp]){ … … 4628 4628 for(resp=0;resp<num_responses;resp++){ 4629 4629 if(responses[resp]==SurfaceAverageVelMisfitEnum){ 4630 inputs->Get ParameterValue(&S,SurfaceAreaEnum); break;4630 inputs->GetInputValue(&S,SurfaceAreaEnum); break; 4631 4631 } 4632 4632 } … … 4642 4642 4643 4643 /*Get all parameters at gaussian point*/ 4644 vx_input->Get ParameterValue(&vx,gauss);4645 vy_input->Get ParameterValue(&vy,gauss);4646 vxobs_input->Get ParameterValue(&vxobs,gauss);4647 vyobs_input->Get ParameterValue(&vyobs,gauss);4644 vx_input->GetInputValue(&vx,gauss); 4645 vy_input->GetInputValue(&vy,gauss); 4646 vxobs_input->GetInputValue(&vxobs,gauss); 4647 vyobs_input->GetInputValue(&vyobs,gauss); 4648 4648 GetNodalFunctions(basis, gauss); 4649 4649 … … 4651 4651 for(resp=0;resp<num_responses;resp++){ 4652 4652 4653 weights_input->Get ParameterValue(&weight,gauss,resp);4653 weights_input->GetInputValue(&weight,gauss,resp); 4654 4654 4655 4655 switch(responses[resp]){ … … 4803 4803 4804 4804 /*Get all parameters at gaussian point*/ 4805 weights_input->Get ParameterValue(&weight,gauss,weight_index);4806 drag_input->Get ParameterDerivativeValue(&dp[0],&xyz_list[0][0],gauss);4805 weights_input->GetInputValue(&weight,gauss,weight_index); 4806 drag_input->GetInputDerivativeValue(&dp[0],&xyz_list[0][0],gauss); 4807 4807 4808 4808 /*Tikhonov regularization: J = 1/2 ((dp/dx)^2 + (dp/dy)^2) */ … … 4929 4929 for (int iv=0;iv<NUMVERTICES;iv++){ 4930 4930 gauss->GaussVertex(iv); 4931 surfaceslopex_input->Get ParameterValue(&dsdx,gauss);4932 surfaceslopey_input->Get ParameterValue(&dsdy,gauss);4933 bedslopex_input->Get ParameterValue(&dbdx,gauss);4934 bedslopey_input->Get ParameterValue(&dbdy,gauss);4935 watercolumn_input->Get ParameterValue(&w,gauss);4931 surfaceslopex_input->GetInputValue(&dsdx,gauss); 4932 surfaceslopey_input->GetInputValue(&dsdy,gauss); 4933 bedslopex_input->GetInputValue(&dbdx,gauss); 4934 bedslopey_input->GetInputValue(&dbdy,gauss); 4935 watercolumn_input->GetInputValue(&w,gauss); 4936 4936 4937 4937 /* Water velocity x and y components */ … … 4996 4996 GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); 4997 4997 4998 vx_input->Get ParameterValue(&vx,gauss);4999 vy_input->Get ParameterValue(&vy,gauss);5000 vx_input->Get ParameterDerivativeValue(&dvx[0],&xyz_list[0][0],gauss);5001 vy_input->Get ParameterDerivativeValue(&dvy[0],&xyz_list[0][0],gauss);4998 vx_input->GetInputValue(&vx,gauss); 4999 vy_input->GetInputValue(&vy,gauss); 5000 vx_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); 5001 vy_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); 5002 5002 5003 5003 DL_scalar=gauss->weight*Jdettria; … … 5086 5086 GetNodalFunctions(basis, gauss); 5087 5087 5088 basal_melting_input->Get ParameterValue(&basal_melting_g,gauss);5089 old_watercolumn_input->Get ParameterValue(&old_watercolumn_g,gauss);5088 basal_melting_input->GetInputValue(&basal_melting_g,gauss); 5089 old_watercolumn_input->GetInputValue(&old_watercolumn_g,gauss); 5090 5090 5091 5091 if(dt)for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(old_watercolumn_g+dt*basal_melting_g)*basis[i]; … … 5123 5123 5124 5124 /*Recover watercolumn*/ 5125 watercolumn_input->Get ParameterValue(&watercolumn,gauss);5125 watercolumn_input->GetInputValue(&watercolumn,gauss); 5126 5126 values[i]=watercolumn; 5127 5127 } … … 5196 5196 5197 5197 /*retrieve inputs: */ 5198 Get ParameterListOnVertices(&thickness_init[0],ThicknessEnum);5199 Get ParameterListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum);5200 Get ParameterListOnVertices(&bed[0],BedEnum);5201 Get ParameterListOnVertices(&surface[0],SurfaceEnum);5198 GetInputListOnVertices(&thickness_init[0],ThicknessEnum); 5199 GetInputListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum); 5200 GetInputListOnVertices(&bed[0],BedEnum); 5201 GetInputListOnVertices(&surface[0],SurfaceEnum); 5202 5202 5203 5203 /*build new thickness: */ … … 5342 5342 // delete gauss; 5343 5343 5344 // vxaverage_input->Get ParameterAverage(&vx);5345 // vyaverage_input->Get ParameterAverage(&vy);5344 // vxaverage_input->GetInputAverage(&vx); 5345 // vyaverage_input->GetInputAverage(&vy); 5346 5346 // K[0][0]=pow(Jdettria,(double).5)/2.0*fabs(vx); 5347 5347 // K[1][1]=pow(Jdettria,(double).5)/2.0*fabs(vy); … … 5358 5358 GetBprimePrognostic(&Bprime[0][0], &xyz_list[0][0], gauss); 5359 5359 5360 vxaverage_input->Get ParameterValue(&vx,gauss);5361 vyaverage_input->Get ParameterValue(&vy,gauss);5362 vxaverage_input->Get ParameterDerivativeValue(&dvx[0],&xyz_list[0][0],gauss);5363 vyaverage_input->Get ParameterDerivativeValue(&dvy[0],&xyz_list[0][0],gauss);5360 vxaverage_input->GetInputValue(&vx,gauss); 5361 vyaverage_input->GetInputValue(&vy,gauss); 5362 vxaverage_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); 5363 vyaverage_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); 5364 5364 5365 5365 dvxdx=dvx[0]; … … 5445 5445 GetBprimePrognostic(&B[0][0], &xyz_list[0][0], gauss); 5446 5446 5447 vx_input->Get ParameterValue(&vx,gauss);5448 vy_input->Get ParameterValue(&vy,gauss);5447 vx_input->GetInputValue(&vx,gauss); 5448 vy_input->GetInputValue(&vy,gauss); 5449 5449 5450 5450 DL_scalar=-gauss->weight*Jdettria; … … 5505 5505 gauss->GaussPoint(ig); 5506 5506 5507 surface_mass_balance_input->Get ParameterValue(&surface_mass_balance_g,gauss);5508 basal_melting_input->Get ParameterValue(&basal_melting_g,gauss);5509 dhdt_input->Get ParameterValue(&dhdt_g,gauss);5507 surface_mass_balance_input->GetInputValue(&surface_mass_balance_g,gauss); 5508 basal_melting_input->GetInputValue(&basal_melting_g,gauss); 5509 dhdt_input->GetInputValue(&dhdt_g,gauss); 5510 5510 5511 5511 GetJacobianDeterminant2d(&Jdettria, &xyz_list[0][0],gauss); … … 5548 5548 gauss->GaussPoint(ig); 5549 5549 5550 surface_mass_balance_input->Get ParameterValue(&surface_mass_balance_g,gauss);5551 basal_melting_input->Get ParameterValue(&basal_melting_g,gauss);5552 dhdt_input->Get ParameterValue(&dhdt_g,gauss);5550 surface_mass_balance_input->GetInputValue(&surface_mass_balance_g,gauss); 5551 basal_melting_input->GetInputValue(&basal_melting_g,gauss); 5552 dhdt_input->GetInputValue(&dhdt_g,gauss); 5553 5553 5554 5554 GetJacobianDeterminant2d(&Jdettria, &xyz_list[0][0],gauss); -
issm/trunk/src/c/objects/Elements/Tria.h
r9883 r10135 186 186 double GetArea(void); 187 187 int GetElementType(void); 188 void GetDofList(int** pdoflist,int approximation_enum,int setenum);189 void GetDofList1(int* doflist);188 void GetDofList(int** pdoflist,int approximation_enum,int setenum); 189 void GetDofList1(int* doflist); 190 190 void GetSidList(int* sidlist); 191 void Get ParameterListOnVertices(double* pvalue,int enumtype);192 void Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue);193 void Get ParameterListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index); //TO BE REMOVED194 void Get ParameterValue(double* pvalue,Node* node,int enumtype);191 void GetInputListOnVertices(double* pvalue,int enumtype); 192 void GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue); 193 void GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index); //TO BE REMOVED 194 void GetInputValue(double* pvalue,Node* node,int enumtype); 195 195 void GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input); 196 196 void InputUpdateFromSolutionOneDof(double* solution,int enum_type); -
issm/trunk/src/c/objects/Elements/TriaRef.cpp
r9320 r10135 463 463 } 464 464 /*}}}*/ 465 /*FUNCTION TriaRef::Get ParameterDerivativeValue{{{1*/466 void TriaRef::Get ParameterDerivativeValue(double* p, double* plist,double* xyz_list, GaussTria* gauss){465 /*FUNCTION TriaRef::GetInputDerivativeValue{{{1*/ 466 void TriaRef::GetInputDerivativeValue(double* p, double* plist,double* xyz_list, GaussTria* gauss){ 467 467 468 468 /*From node values of parameter p (plist[0],plist[1],plist[2]), return parameter derivative value at gaussian … … 486 486 } 487 487 /*}}}*/ 488 /*FUNCTION TriaRef::Get ParameterValue{{{1*/489 void TriaRef::Get ParameterValue(double* p, double* plist, GaussTria* gauss){488 /*FUNCTION TriaRef::GetInputValue{{{1*/ 489 void TriaRef::GetInputValue(double* p, double* plist, GaussTria* gauss){ 490 490 491 491 /*From node values of parameter p (plist[0],plist[1],plist[2]), return parameter value at gaussian -
issm/trunk/src/c/objects/Elements/TriaRef.h
r6987 r10135 43 43 void GetNodalFunctionsDerivatives(double* l1l2l3,double* xyz_list, GaussTria* gauss); 44 44 void GetNodalFunctionsDerivativesReference(double* dl1dl3,GaussTria* gauss); 45 void Get ParameterValue(double* pp, double* plist, GaussTria* gauss);46 void Get ParameterDerivativeValue(double* pp, double* plist,double* xyz_list, GaussTria* gauss);45 void GetInputValue(double* pp, double* plist, GaussTria* gauss); 46 void GetInputDerivativeValue(double* pp, double* plist,double* xyz_list, GaussTria* gauss); 47 47 48 48 }; -
issm/trunk/src/c/objects/Inputs/BoolInput.cpp
r9883 r10135 157 157 158 158 /*Object functions*/ 159 /*FUNCTION BoolInput::Get ParameterValue(bool* pvalue) {{{1*/160 void BoolInput::Get ParameterValue(bool* pvalue){159 /*FUNCTION BoolInput::GetInputValue(bool* pvalue) {{{1*/ 160 void BoolInput::GetInputValue(bool* pvalue){ 161 161 *pvalue=value; 162 162 } 163 163 /*}}}*/ 164 /*FUNCTION BoolInput::Get ParameterValue(int* pvalue){{{1*/165 void BoolInput::Get ParameterValue(int* pvalue){_error_(" not supported yet!");}166 /*}}}*/ 167 /*FUNCTION BoolInput::Get ParameterValue(double* pvalue){{{1*/168 void BoolInput::Get ParameterValue(double* pvalue){_error_(" not supported yet!");}169 /*}}}*/ 170 /*FUNCTION BoolInput::Get ParameterValue(double* pvalue,GaussTria* gauss){{{1*/171 void BoolInput::Get ParameterValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");}172 /*}}}*/ 173 /*FUNCTION BoolInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){{{1*/174 void BoolInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");}175 /*}}}*/ 176 /*FUNCTION BoolInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/177 void BoolInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");}178 /*}}}*/ 179 /*FUNCTION BoolInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/180 void BoolInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");}164 /*FUNCTION BoolInput::GetInputValue(int* pvalue){{{1*/ 165 void BoolInput::GetInputValue(int* pvalue){_error_(" not supported yet!");} 166 /*}}}*/ 167 /*FUNCTION BoolInput::GetInputValue(double* pvalue){{{1*/ 168 void BoolInput::GetInputValue(double* pvalue){_error_(" not supported yet!");} 169 /*}}}*/ 170 /*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ 171 void BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");} 172 /*}}}*/ 173 /*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ 174 void BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");} 175 /*}}}*/ 176 /*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ 177 void BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");} 178 /*}}}*/ 179 /*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ 180 void BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");} 181 181 /*}}}*/ 182 182 /*FUNCTION BoolInput::ChangeEnum{{{1*/ -
issm/trunk/src/c/objects/Inputs/BoolInput.h
r9883 r10135 50 50 /*}}}*/ 51 51 /*numerics: {{{1*/ 52 void Get ParameterValue(bool* pvalue);53 void Get ParameterValue(int* pvalue);54 void Get ParameterValue(double* pvalue);55 void Get ParameterValue(double* pvalue,GaussTria* gauss);56 void Get ParameterValue(double* pvalue,GaussPenta* gauss);57 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};58 void Get ParameterValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};59 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);60 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss);61 void Get ParameterAverage(double* pvalue){_error_("not implemented yet");};52 void GetInputValue(bool* pvalue); 53 void GetInputValue(int* pvalue); 54 void GetInputValue(double* pvalue); 55 void GetInputValue(double* pvalue,GaussTria* gauss); 56 void GetInputValue(double* pvalue,GaussPenta* gauss); 57 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; 58 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; 59 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); 60 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); 61 void GetInputAverage(double* pvalue){_error_("not implemented yet");}; 62 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 63 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; -
issm/trunk/src/c/objects/Inputs/ControlInput.cpp
r9883 r10135 398 398 return gradient->SpawnResult(step,time); 399 399 }/*}}}*/ 400 /*FUNCTION ControlInput::Get ParameterValue(bool* pvalue){{{1*/400 /*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{1*/ 401 401 void ControlInput::GetVectorFromInputs(Vec vector,int* doflist){ 402 402 values->GetVectorFromInputs(vector,doflist); 403 403 }/*}}}*/ 404 /*FUNCTION ControlInput::Get ParameterAverage(double* pvalue){{{1*/405 void ControlInput::Get ParameterAverage(double* pvalue){406 values->Get ParameterAverage(pvalue);407 }/*}}}*/ 408 /*FUNCTION ControlInput::Get ParameterValue(bool* pvalue){{{1*/409 void ControlInput::Get ParameterValue(bool* pvalue){410 values->Get ParameterValue(pvalue);411 }/*}}}*/ 412 /*FUNCTION ControlInput::Get ParameterValue(int* pvalue){{{1*/413 void ControlInput::Get ParameterValue(int* pvalue){414 values->Get ParameterValue(pvalue);415 }/*}}}*/ 416 /*FUNCTION ControlInput::Get ParameterValue(double* pvalue){{{1*/417 void ControlInput::Get ParameterValue(double* pvalue){418 values->Get ParameterValue(pvalue);419 }/*}}}*/ 420 /*FUNCTION ControlInput::Get ParameterValue(double* pvalue){{{1*/421 void ControlInput::Get ParameterValue(double* pvalue,GaussTria* gauss){422 values->Get ParameterValue(pvalue,gauss);423 }/*}}}*/ 424 /*FUNCTION ControlInput::Get ParameterValue(double* pvalue){{{1*/425 void ControlInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){426 values->Get ParameterValue(pvalue,gauss);427 }/*}}}*/ 428 /*FUNCTION ControlInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/429 void ControlInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){430 values->Get ParameterDerivativeValue(derivativevalues,xyz_list,gauss);431 }/*}}}*/ 432 /*FUNCTION ControlInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/433 void ControlInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){434 values->Get ParameterDerivativeValue(derivativevalues,xyz_list,gauss);404 /*FUNCTION ControlInput::GetInputAverage(double* pvalue){{{1*/ 405 void ControlInput::GetInputAverage(double* pvalue){ 406 values->GetInputAverage(pvalue); 407 }/*}}}*/ 408 /*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{1*/ 409 void ControlInput::GetInputValue(bool* pvalue){ 410 values->GetInputValue(pvalue); 411 }/*}}}*/ 412 /*FUNCTION ControlInput::GetInputValue(int* pvalue){{{1*/ 413 void ControlInput::GetInputValue(int* pvalue){ 414 values->GetInputValue(pvalue); 415 }/*}}}*/ 416 /*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/ 417 void ControlInput::GetInputValue(double* pvalue){ 418 values->GetInputValue(pvalue); 419 }/*}}}*/ 420 /*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/ 421 void ControlInput::GetInputValue(double* pvalue,GaussTria* gauss){ 422 values->GetInputValue(pvalue,gauss); 423 }/*}}}*/ 424 /*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/ 425 void ControlInput::GetInputValue(double* pvalue,GaussPenta* gauss){ 426 values->GetInputValue(pvalue,gauss); 427 }/*}}}*/ 428 /*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ 429 void ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){ 430 values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss); 431 }/*}}}*/ 432 /*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ 433 void ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){ 434 values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss); 435 435 }/*}}}*/ 436 436 /*FUNCTION ControlInput::SaveValue{{{1*/ -
issm/trunk/src/c/objects/Inputs/ControlInput.h
r9883 r10135 54 54 /*}}}*/ 55 55 /*numerics: {{{1*/ 56 void Get ParameterValue(bool* pvalue);57 void Get ParameterValue(int* pvalue);58 void Get ParameterValue(double* pvalue);59 void Get ParameterValue(double* pvalue,GaussTria* gauss);60 void Get ParameterValue(double* pvalue,GaussPenta* gauss);61 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};62 void Get ParameterValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};63 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);64 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss);65 void Get ParameterAverage(double* pvalue);56 void GetInputValue(bool* pvalue); 57 void GetInputValue(int* pvalue); 58 void GetInputValue(double* pvalue); 59 void GetInputValue(double* pvalue,GaussTria* gauss); 60 void GetInputValue(double* pvalue,GaussPenta* gauss); 61 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; 62 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; 63 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); 64 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); 65 void GetInputAverage(double* pvalue); 66 66 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 67 67 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; -
issm/trunk/src/c/objects/Inputs/DatasetInput.cpp
r9883 r10135 175 175 } 176 176 /*}}}*/ 177 /*FUNCTION DatasetInput::Get ParameterValue(double* pvalue,GaussTria* gauss,int index){{{1*/178 void DatasetInput::Get ParameterValue(double* pvalue,GaussTria* gauss,int index){177 /*FUNCTION DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){{{1*/ 178 void DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){ 179 179 180 180 /*Get requested input within dataset*/ … … 182 182 Input* input=(Input*)this->inputs->GetObjectByOffset(index); 183 183 184 input->Get ParameterValue(pvalue,gauss);184 input->GetInputValue(pvalue,gauss); 185 185 } 186 186 /*}}}*/ -
issm/trunk/src/c/objects/Inputs/DatasetInput.h
r9883 r10135 50 50 /*}}}*/ 51 51 /*numeriics: {{{1*/ 52 void Get ParameterValue(bool* pvalue){_error_("not implemented yet");};53 void Get ParameterValue(int* pvalue){_error_("not implemented yet");};54 void Get ParameterValue(double* pvalue){_error_("not implemented yet");};55 void Get ParameterValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");};56 void Get ParameterValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};57 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index);58 void Get ParameterValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};59 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");};60 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};61 void Get ParameterAverage(double* pvalue){_error_("not implemented yet");};52 void GetInputValue(bool* pvalue){_error_("not implemented yet");}; 53 void GetInputValue(int* pvalue){_error_("not implemented yet");}; 54 void GetInputValue(double* pvalue){_error_("not implemented yet");}; 55 void GetInputValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");}; 56 void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; 57 void GetInputValue(double* pvalue,GaussTria* gauss ,int index); 58 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; 59 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 60 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; 61 void GetInputAverage(double* pvalue){_error_("not implemented yet");}; 62 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 63 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; -
issm/trunk/src/c/objects/Inputs/DoubleInput.cpp
r9883 r10135 157 157 158 158 /*Object functions*/ 159 /*FUNCTION DoubleInput::Get ParameterValue(bool* pvalue) {{{1*/160 void DoubleInput::Get ParameterValue(bool* pvalue){159 /*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{1*/ 160 void DoubleInput::GetInputValue(bool* pvalue){ 161 161 #ifdef _SERIAL_ 162 162 *pvalue=(bool)value; … … 167 167 } 168 168 /*}}}*/ 169 /*FUNCTION DoubleInput::Get ParameterValue(int* pvalue){{{1*/170 void DoubleInput::Get ParameterValue(int* pvalue){169 /*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{1*/ 170 void DoubleInput::GetInputValue(int* pvalue){ 171 171 #ifdef _SERIAL_ 172 172 *pvalue=(int)value; … … 177 177 } 178 178 /*}}}*/ 179 /*FUNCTION DoubleInput::Get ParameterValue(double* pvalue){{{1*/180 void DoubleInput::Get ParameterValue(double* pvalue){179 /*FUNCTION DoubleInput::GetInputValue(double* pvalue){{{1*/ 180 void DoubleInput::GetInputValue(double* pvalue){ 181 181 182 182 /*return value*/ … … 184 184 } 185 185 /*}}}*/ 186 /*FUNCTION DoubleInput::Get ParameterValue(double* pvalue,GaussTria* gauss){{{1*/187 void DoubleInput::Get ParameterValue(double* pvalue,GaussTria* gauss){*pvalue=this->value;}188 /*}}}*/ 189 /*FUNCTION DoubleInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){{{1*/190 void DoubleInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){*pvalue=this->value;}191 /*}}}*/ 192 /*FUNCTION DoubleInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/193 void DoubleInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");}194 /*}}}*/ 195 /*FUNCTION DoubleInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/196 void DoubleInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");}186 /*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ 187 void DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){*pvalue=this->value;} 188 /*}}}*/ 189 /*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ 190 void DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){*pvalue=this->value;} 191 /*}}}*/ 192 /*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ 193 void DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");} 194 /*}}}*/ 195 /*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ 196 void DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");} 197 197 /*}}}*/ 198 198 /*FUNCTION DoubleInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){{{1*/ … … 323 323 } 324 324 /*}}}*/ 325 /*FUNCTION DoubleInput::Get ParameterAverage{{{1*/326 void DoubleInput::Get ParameterAverage(double* pvalue){325 /*FUNCTION DoubleInput::GetInputAverage{{{1*/ 326 void DoubleInput::GetInputAverage(double* pvalue){ 327 327 *pvalue=value; 328 328 } … … 341 341 342 342 case PentaVertexInputEnum: 343 thickness_input->Get ParameterAverage(&thickness_value);343 thickness_input->GetInputAverage(&thickness_value); 344 344 this->value=this->value*thickness_value; 345 345 return; … … 360 360 361 361 /*Check that inputB is of the same type*/ 362 inputB->Get ParameterAverage(&Bvalue);362 inputB->GetInputAverage(&Bvalue); 363 363 364 364 /*Create new DoubleInput*/ -
issm/trunk/src/c/objects/Inputs/DoubleInput.h
r9883 r10135 49 49 /*}}}*/ 50 50 /*numerics: {{{1*/ 51 void Get ParameterValue(bool* pvalue);52 void Get ParameterValue(int* pvalue);53 void Get ParameterValue(double* pvalue);54 void Get ParameterValue(double* pvalue,GaussTria* gauss);55 void Get ParameterValue(double* pvalue,GaussPenta* gauss);56 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};57 void Get ParameterValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};58 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);59 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss);60 void Get ParameterAverage(double* pvalue);51 void GetInputValue(bool* pvalue); 52 void GetInputValue(int* pvalue); 53 void GetInputValue(double* pvalue); 54 void GetInputValue(double* pvalue,GaussTria* gauss); 55 void GetInputValue(double* pvalue,GaussPenta* gauss); 56 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; 57 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; 58 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); 59 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); 60 void GetInputAverage(double* pvalue); 61 61 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss); 62 62 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss); -
issm/trunk/src/c/objects/Inputs/Input.h
r9883 r10135 23 23 /*Virtual functions:{{{1*/ 24 24 virtual int InstanceEnum()=0; 25 virtual void Get ParameterValue(bool* pvalue)=0;26 virtual void Get ParameterValue(int* pvalue)=0;27 virtual void Get ParameterValue(double* pvalue)=0;28 virtual void Get ParameterValue(double* pvalue,GaussTria* gauss)=0;29 virtual void Get ParameterValue(double* pvalue,GaussPenta* gauss)=0;30 virtual void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index)=0;31 virtual void Get ParameterValue(double* pvalue,GaussPenta* gauss,int index)=0;32 virtual void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss)=0;33 virtual void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss)=0;34 virtual void Get ParameterAverage(double* pvalue)=0;25 virtual void GetInputValue(bool* pvalue)=0; 26 virtual void GetInputValue(int* pvalue)=0; 27 virtual void GetInputValue(double* pvalue)=0; 28 virtual void GetInputValue(double* pvalue,GaussTria* gauss)=0; 29 virtual void GetInputValue(double* pvalue,GaussPenta* gauss)=0; 30 virtual void GetInputValue(double* pvalue,GaussTria* gauss ,int index)=0; 31 virtual void GetInputValue(double* pvalue,GaussPenta* gauss,int index)=0; 32 virtual void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss)=0; 33 virtual void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss)=0; 34 virtual void GetInputAverage(double* pvalue)=0; 35 35 virtual void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss)=0; 36 36 virtual void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss)=0; -
issm/trunk/src/c/objects/Inputs/IntInput.cpp
r9883 r10135 156 156 157 157 /*Object functions*/ 158 /*FUNCTION IntInput::Get ParameterValue(bool* pvalue) {{{1*/159 void IntInput::Get ParameterValue(bool* pvalue){_error_(" not supported yet!");}160 /*}}}*/ 161 /*FUNCTION IntInput::Get ParameterValue(int* pvalue){{{1*/162 void IntInput::Get ParameterValue(int* pvalue){158 /*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{1*/ 159 void IntInput::GetInputValue(bool* pvalue){_error_(" not supported yet!");} 160 /*}}}*/ 161 /*FUNCTION IntInput::GetInputValue(int* pvalue){{{1*/ 162 void IntInput::GetInputValue(int* pvalue){ 163 163 *pvalue=value; 164 164 } 165 165 /*}}}*/ 166 /*FUNCTION IntInput::Get ParameterValue(double* pvalue){{{1*/167 void IntInput::Get ParameterValue(double* pvalue){166 /*FUNCTION IntInput::GetInputValue(double* pvalue){{{1*/ 167 void IntInput::GetInputValue(double* pvalue){ 168 168 _error_("IntInput cannot return a double in parallel"); 169 169 } 170 170 /*}}}*/ 171 /*FUNCTION IntInput::Get ParameterValue(double* pvalue,GaussTria* gauss){{{1*/172 void IntInput::Get ParameterValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");}173 /*}}}*/ 174 /*FUNCTION IntInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){{{1*/175 void IntInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");}176 /*}}}*/ 177 /*FUNCTION IntInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/178 void IntInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");}179 /*}}}*/ 180 /*FUNCTION IntInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/181 void IntInput::Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");}171 /*FUNCTION IntInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ 172 void IntInput::GetInputValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");} 173 /*}}}*/ 174 /*FUNCTION IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ 175 void IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");} 176 /*}}}*/ 177 /*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ 178 void IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");} 179 /*}}}*/ 180 /*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ 181 void IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");} 182 182 /*}}}*/ 183 183 /*FUNCTION IntInput::ChangeEnum{{{1*/ -
issm/trunk/src/c/objects/Inputs/IntInput.h
r9883 r10135 50 50 /*}}}*/ 51 51 /*numerics: {{{1*/ 52 void Get ParameterValue(bool* pvalue);53 void Get ParameterValue(int* pvalue);54 void Get ParameterValue(double* pvalue);55 void Get ParameterValue(double* pvalue,GaussTria* gauss);56 void Get ParameterValue(double* pvalue,GaussPenta* gauss);57 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};58 void Get ParameterValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};59 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);60 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss);61 void Get ParameterAverage(double* pvalue){_error_("not implemented yet");};52 void GetInputValue(bool* pvalue); 53 void GetInputValue(int* pvalue); 54 void GetInputValue(double* pvalue); 55 void GetInputValue(double* pvalue,GaussTria* gauss); 56 void GetInputValue(double* pvalue,GaussPenta* gauss); 57 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; 58 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; 59 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); 60 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); 61 void GetInputAverage(double* pvalue){_error_("not implemented yet");}; 62 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 63 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; -
issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp
r9883 r10135 178 178 179 179 /*Object functions*/ 180 /*FUNCTION PentaVertexInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){{{1*/181 void PentaVertexInput::Get ParameterValue(double* pvalue,GaussPenta* gauss){180 /*FUNCTION PentaVertexInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ 181 void PentaVertexInput::GetInputValue(double* pvalue,GaussPenta* gauss){ 182 182 183 183 /*Call PentaRef function*/ 184 PentaRef::Get ParameterValue(pvalue,&values[0],gauss);185 186 } 187 /*}}}*/ 188 /*FUNCTION PentaVertexInput::Get ParameterDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{1*/189 void PentaVertexInput::Get ParameterDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){184 PentaRef::GetInputValue(pvalue,&values[0],gauss); 185 186 } 187 /*}}}*/ 188 /*FUNCTION PentaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{1*/ 189 void PentaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){ 190 190 191 191 /*Call PentaRef function*/ 192 PentaRef::Get ParameterDerivativeValue(p,&values[0],xyz_list,gauss);192 PentaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); 193 193 } 194 194 /*}}}*/ … … 382 382 } 383 383 /*}}}*/ 384 /*FUNCTION PentaVertexInput::Get ParameterAverage{{{1*/385 void PentaVertexInput::Get ParameterAverage(double* pvalue){384 /*FUNCTION PentaVertexInput::GetInputAverage{{{1*/ 385 void PentaVertexInput::GetInputAverage(double* pvalue){ 386 386 *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]); 387 387 } -
issm/trunk/src/c/objects/Inputs/PentaVertexInput.h
r9883 r10135 50 50 /*}}}*/ 51 51 /*numerics: {{{1*/ 52 void Get ParameterValue(bool* pvalue){_error_("not implemented yet");};53 void Get ParameterValue(int* pvalue){_error_("not implemented yet");};54 void Get ParameterValue(double* pvalue){_error_("not implemented yet");};55 void Get ParameterValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");};56 void Get ParameterValue(double* pvalue,GaussPenta* gauss);57 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};58 void Get ParameterValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};59 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");};60 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss);61 void Get ParameterAverage(double* pvalue);52 void GetInputValue(bool* pvalue){_error_("not implemented yet");}; 53 void GetInputValue(int* pvalue){_error_("not implemented yet");}; 54 void GetInputValue(double* pvalue){_error_("not implemented yet");}; 55 void GetInputValue(double* pvalue,GaussTria* gauss){_error_("not implemented yet");}; 56 void GetInputValue(double* pvalue,GaussPenta* gauss); 57 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; 58 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; 59 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 60 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss); 61 void GetInputAverage(double* pvalue); 62 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 63 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; -
issm/trunk/src/c/objects/Inputs/TransientInput.cpp
r9883 r10135 258 258 259 259 /*Object functions*/ 260 /*FUNCTION TransientInput::Get ParameterValue(double* pvalue,GaussTria* gauss){{{1*/261 void TransientInput::Get ParameterValue(double* pvalue,GaussTria* gauss){260 /*FUNCTION TransientInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ 261 void TransientInput::GetInputValue(double* pvalue,GaussTria* gauss){ 262 262 263 263 double time; … … 270 270 271 271 /*Call input function*/ 272 input->Get ParameterValue(pvalue,gauss);273 274 delete input; 275 276 } 277 /*}}}*/ 278 /*FUNCTION TransientInput::Get ParameterDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/279 void TransientInput::Get ParameterDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){272 input->GetInputValue(pvalue,gauss); 273 274 delete input; 275 276 } 277 /*}}}*/ 278 /*FUNCTION TransientInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/ 279 void TransientInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){ 280 280 281 281 double time; … … 288 288 289 289 /*Call input function*/ 290 input->Get ParameterDerivativeValue(p,xyz_list,gauss);290 input->GetInputDerivativeValue(p,xyz_list,gauss); 291 291 292 292 delete input; … … 299 299 } 300 300 /*}}}*/ 301 /*FUNCTION TransientInput::Get ParameterAverage{{{1*/302 void TransientInput::Get ParameterAverage(double* pvalue){301 /*FUNCTION TransientInput::GetInputAverage{{{1*/ 302 void TransientInput::GetInputAverage(double* pvalue){ 303 303 304 304 double time; … … 311 311 312 312 /*Call input function*/ 313 input->Get ParameterAverage(pvalue);313 input->GetInputAverage(pvalue); 314 314 315 315 delete input; -
issm/trunk/src/c/objects/Inputs/TransientInput.h
r9883 r10135 52 52 /*}}}*/ 53 53 /*numerics: {{{1*/ 54 void Get ParameterValue(bool* pvalue){_error_("not implemented yet");};55 void Get ParameterValue(int* pvalue){_error_("not implemented yet");};56 void Get ParameterValue(double* pvalue){_error_("not implemented yet");};57 void Get ParameterValue(double* pvalue,GaussTria* gauss);58 void Get ParameterValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};59 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};60 void Get ParameterValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};61 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);62 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};63 void Get ParameterAverage(double* pvalue);54 void GetInputValue(bool* pvalue){_error_("not implemented yet");}; 55 void GetInputValue(int* pvalue){_error_("not implemented yet");}; 56 void GetInputValue(double* pvalue){_error_("not implemented yet");}; 57 void GetInputValue(double* pvalue,GaussTria* gauss); 58 void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; 59 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; 60 void GetInputValue(double* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; 61 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); 62 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; 63 void GetInputAverage(double* pvalue); 64 64 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; 65 65 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; -
issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp
r9883 r10135 167 167 168 168 /*Object functions*/ 169 /*FUNCTION TriaVertexInput::Get ParameterValue(double* pvalue,GaussTria* gauss){{{1*/170 void TriaVertexInput::Get ParameterValue(double* pvalue,GaussTria* gauss){169 /*FUNCTION TriaVertexInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ 170 void TriaVertexInput::GetInputValue(double* pvalue,GaussTria* gauss){ 171 171 172 172 /*Call TriaRef function*/ 173 TriaRef::Get ParameterValue(pvalue,&values[0],gauss);174 175 } 176 /*}}}*/ 177 /*FUNCTION TriaVertexInput::Get ParameterDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/178 void TriaVertexInput::Get ParameterDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){173 TriaRef::GetInputValue(pvalue,&values[0],gauss); 174 175 } 176 /*}}}*/ 177 /*FUNCTION TriaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/ 178 void TriaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){ 179 179 180 180 /*Call TriaRef function*/ 181 TriaRef::Get ParameterDerivativeValue(p,&values[0],xyz_list,gauss);181 TriaRef::GetInputDerivativeValue(p,&values[0],xyz_list,gauss); 182 182 } 183 183 /*}}}*/ … … 233 233 } 234 234 /*}}}*/ 235 /*FUNCTION TriaVertexInput::Get ParameterAverage{{{1*/236 void TriaVertexInput::Get ParameterAverage(double* pvalue){235 /*FUNCTION TriaVertexInput::GetInputAverage{{{1*/ 236 void TriaVertexInput::GetInputAverage(double* pvalue){ 237 237 *pvalue=1./3.*(values[0]+values[1]+values[2]); 238 238 } -
issm/trunk/src/c/objects/Inputs/TriaVertexInput.h
r9883 r10135 50 50 /*}}}*/ 51 51 /*numerics: {{{1*/ 52 void Get ParameterValue(bool* pvalue){_error_("not implemented yet");}53 void Get ParameterValue(int* pvalue){_error_("not implemented yet");}54 void Get ParameterValue(double* pvalue){_error_("not implemented yet");}55 void Get ParameterValue(double* pvalue,GaussTria* gauss);56 void Get ParameterValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");};57 void Get ParameterValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};58 void Get ParameterValue(double* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");};59 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss);60 void Get ParameterDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};61 void Get ParameterAverage(double* pvalue);52 void GetInputValue(bool* pvalue){_error_("not implemented yet");} 53 void GetInputValue(int* pvalue){_error_("not implemented yet");} 54 void GetInputValue(double* pvalue){_error_("not implemented yet");} 55 void GetInputValue(double* pvalue,GaussTria* gauss); 56 void GetInputValue(double* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; 57 void GetInputValue(double* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; 58 void GetInputValue(double* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");}; 59 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss); 60 void GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; 61 void GetInputAverage(double* pvalue); 62 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss); 63 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss); -
issm/trunk/src/c/objects/Loads/Friction.cpp
r9610 r10135 73 73 74 74 /*Recover parameters: */ 75 inputs->Get ParameterValue(&drag_p,FrictionPEnum);76 inputs->Get ParameterValue(&drag_q,FrictionQEnum);77 this->Get ParameterValue(&thickness, gauss,ThicknessEnum);78 this->Get ParameterValue(&bed, gauss,BedEnum);79 this->Get ParameterValue(&drag_coefficient, gauss,FrictionCoefficientEnum);75 inputs->GetInputValue(&drag_p,FrictionPEnum); 76 inputs->GetInputValue(&drag_q,FrictionQEnum); 77 this->GetInputValue(&thickness, gauss,ThicknessEnum); 78 this->GetInputValue(&bed, gauss,BedEnum); 79 this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); 80 80 81 81 /*Get material parameters: */ … … 98 98 99 99 if(strcmp(element_type,"2d")==0){ 100 this->Get ParameterValue(&vx, gauss,vxenum);101 this->Get ParameterValue(&vy, gauss,vyenum);100 this->GetInputValue(&vx, gauss,vxenum); 101 this->GetInputValue(&vy, gauss,vyenum); 102 102 vmag=sqrt(pow(vx,2)+pow(vy,2)); 103 103 } 104 104 else if (strcmp(element_type,"3d")==0){ 105 this->Get ParameterValue(&vx, gauss,vxenum);106 this->Get ParameterValue(&vy, gauss,vyenum);107 this->Get ParameterValue(&vz, gauss,vzenum);105 this->GetInputValue(&vx, gauss,vxenum); 106 this->GetInputValue(&vy, gauss,vyenum); 107 this->GetInputValue(&vz, gauss,vzenum); 108 108 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); 109 109 } … … 137 137 138 138 /*Recover parameters: */ 139 inputs->Get ParameterValue(&drag_p,FrictionPEnum);140 inputs->Get ParameterValue(&drag_q,FrictionQEnum);141 this->Get ParameterValue(&thickness, gauss,ThicknessEnum);142 this->Get ParameterValue(&bed, gauss,BedEnum);143 this->Get ParameterValue(&drag_coefficient, gauss,FrictionCoefficientEnum);139 inputs->GetInputValue(&drag_p,FrictionPEnum); 140 inputs->GetInputValue(&drag_q,FrictionQEnum); 141 this->GetInputValue(&thickness, gauss,ThicknessEnum); 142 this->GetInputValue(&bed, gauss,BedEnum); 143 this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); 144 144 145 145 /*Get material parameters: */ … … 162 162 163 163 if(strcmp(element_type,"2d")==0){ 164 this->Get ParameterValue(&vx, gauss,vxenum);165 this->Get ParameterValue(&vy, gauss,vyenum);164 this->GetInputValue(&vx, gauss,vxenum); 165 this->GetInputValue(&vy, gauss,vyenum); 166 166 vmag=sqrt(pow(vx,2)+pow(vy,2)); 167 167 } 168 168 else if (strcmp(element_type,"3d")==0){ 169 this->Get ParameterValue(&vx, gauss,vxenum);170 this->Get ParameterValue(&vy, gauss,vyenum);171 this->Get ParameterValue(&vz, gauss,vzenum);169 this->GetInputValue(&vx, gauss,vxenum); 170 this->GetInputValue(&vy, gauss,vyenum); 171 this->GetInputValue(&vz, gauss,vzenum); 172 172 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); 173 173 } … … 203 203 204 204 /*Recover parameters: */ 205 inputs->Get ParameterValue(&drag_p,FrictionPEnum);206 inputs->Get ParameterValue(&drag_q,FrictionQEnum);207 this->Get ParameterValue(&thickness, gauss,ThicknessEnum);208 this->Get ParameterValue(&bed, gauss,BedEnum);209 this->Get ParameterValue(&drag_coefficient, gauss,FrictionCoefficientEnum);205 inputs->GetInputValue(&drag_p,FrictionPEnum); 206 inputs->GetInputValue(&drag_q,FrictionQEnum); 207 this->GetInputValue(&thickness, gauss,ThicknessEnum); 208 this->GetInputValue(&bed, gauss,BedEnum); 209 this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); 210 210 211 211 /*Get material parameters: */ … … 229 229 //We need the velocity magnitude to evaluate the basal stress: 230 230 if(strcmp(element_type,"2d")==0){ 231 this->Get ParameterValue(&vx, gauss,vxenum);232 this->Get ParameterValue(&vy, gauss,vyenum);231 this->GetInputValue(&vx, gauss,vxenum); 232 this->GetInputValue(&vy, gauss,vyenum); 233 233 vmag=sqrt(pow(vx,2)+pow(vy,2)); 234 234 } 235 235 else if (strcmp(element_type,"3d")==0){ 236 this->Get ParameterValue(&vx, gauss,vxenum);237 this->Get ParameterValue(&vy, gauss,vyenum);238 this->Get ParameterValue(&vz, gauss,vzenum);236 this->GetInputValue(&vx, gauss,vxenum); 237 this->GetInputValue(&vy, gauss,vyenum); 238 this->GetInputValue(&vz, gauss,vzenum); 239 239 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); 240 240 } … … 269 269 270 270 /*Recover parameters: */ 271 inputs->Get ParameterValue(&drag_p,FrictionPEnum);272 inputs->Get ParameterValue(&drag_q,FrictionQEnum);273 this->Get ParameterValue(&thickness, gauss,ThicknessEnum);274 this->Get ParameterValue(&bed, gauss,BedEnum);275 this->Get ParameterValue(&drag_coefficient, gauss,FrictionCoefficientEnum);271 inputs->GetInputValue(&drag_p,FrictionPEnum); 272 inputs->GetInputValue(&drag_q,FrictionQEnum); 273 this->GetInputValue(&thickness, gauss,ThicknessEnum); 274 this->GetInputValue(&bed, gauss,BedEnum); 275 this->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); 276 276 277 277 /*Get material parameters: */ … … 295 295 //We need the velocity magnitude to evaluate the basal stress: 296 296 if(strcmp(element_type,"2d")==0){ 297 this->Get ParameterValue(&vx, gauss,vxenum);298 this->Get ParameterValue(&vy, gauss,vyenum);297 this->GetInputValue(&vx, gauss,vxenum); 298 this->GetInputValue(&vy, gauss,vyenum); 299 299 vmag=sqrt(pow(vx,2)+pow(vy,2)); 300 300 } 301 301 else if (strcmp(element_type,"3d")==0){ 302 this->Get ParameterValue(&vx, gauss,vxenum);303 this->Get ParameterValue(&vy, gauss,vyenum);304 this->Get ParameterValue(&vz, gauss,vzenum);302 this->GetInputValue(&vx, gauss,vxenum); 303 this->GetInputValue(&vy, gauss,vyenum); 304 this->GetInputValue(&vz, gauss,vzenum); 305 305 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2)); 306 306 } … … 316 316 } 317 317 /*}}}*/ 318 /*FUNCTION Friction::Get ParameterValue{{{1*/319 void Friction::Get ParameterValue(double* pvalue,GaussTria* gauss,int enum_type){318 /*FUNCTION Friction::GetInputValue{{{1*/ 319 void Friction::GetInputValue(double* pvalue,GaussTria* gauss,int enum_type){ 320 320 321 321 Input* input=inputs->GetInput(enum_type); 322 322 if(!input) _error_("input %s not found",EnumToStringx(enum_type)); 323 input->Get ParameterValue(pvalue,gauss);324 325 } 326 /*}}}*/ 327 /*FUNCTION Friction::Get ParameterValue{{{1*/328 void Friction::Get ParameterValue(double* pvalue,GaussPenta* gauss,int enum_type){323 input->GetInputValue(pvalue,gauss); 324 325 } 326 /*}}}*/ 327 /*FUNCTION Friction::GetInputValue{{{1*/ 328 void Friction::GetInputValue(double* pvalue,GaussPenta* gauss,int enum_type){ 329 329 330 330 Input* input=inputs->GetInput(enum_type); 331 331 if(!input) _error_("input %s not found",EnumToStringx(enum_type)); 332 input->Get ParameterValue(pvalue,gauss);333 334 } 335 /*}}}*/ 332 input->GetInputValue(pvalue,gauss); 333 334 } 335 /*}}}*/ -
issm/trunk/src/c/objects/Loads/Friction.h
r8657 r10135 31 31 void GetAlphaComplement(double* alpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum); 32 32 void GetAlphaComplement(double* alpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum); 33 void Get ParameterValue(double* pvalue,GaussTria* gauss,int enum_type);34 void Get ParameterValue(double* pvalue,GaussPenta* gauss,int enum_type);33 void GetInputValue(double* pvalue,GaussTria* gauss,int enum_type); 34 void GetInputValue(double* pvalue,GaussPenta* gauss,int enum_type); 35 35 36 36 }; -
issm/trunk/src/c/objects/Loads/Icefront.cpp
r9883 r10135 438 438 439 439 int type; 440 inputs->Get ParameterValue(&type,TypeEnum);440 inputs->GetInputValue(&type,TypeEnum); 441 441 442 442 switch(type){ … … 483 483 Input* thickness_input=tria->inputs->GetInput(ThicknessEnum); _assert_(thickness_input); 484 484 Input* bed_input =tria->inputs->GetInput(BedEnum); _assert_(bed_input); 485 inputs->Get ParameterValue(&fill,FillEnum);485 inputs->GetInputValue(&fill,FillEnum); 486 486 rho_water=matpar->GetRhoWater(); 487 487 rho_ice =matpar->GetRhoIce(); … … 498 498 gauss->GaussPoint(ig); 499 499 500 thickness_input->Get ParameterValue(&thickness,gauss);501 bed_input->Get ParameterValue(&bed,gauss);500 thickness_input->GetInputValue(&thickness,gauss); 501 bed_input->GetInputValue(&bed,gauss); 502 502 503 503 switch(fill){ … … 599 599 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICESQUA); 600 600 Input* surface_input =penta->inputs->GetInput(SurfaceEnum); _assert_(surface_input); 601 inputs->Get ParameterValue(&fill,FillEnum);601 inputs->GetInputValue(&fill,FillEnum); 602 602 rho_water=matpar->GetRhoWater(); 603 603 rho_ice =matpar->GetRhoIce(); … … 623 623 penta->GetQuadJacobianDeterminant(&Jdet,xyz_list,gauss); 624 624 z_g=penta->GetZcoord(gauss); 625 surface_input->Get ParameterValue(&surface,gauss);625 surface_input->GetInputValue(&surface,gauss); 626 626 627 627 switch(fill){ … … 672 672 /*Retrieve all inputs and parameters*/ 673 673 GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICESQUA); 674 inputs->Get ParameterValue(&fill,FillEnum);674 inputs->GetInputValue(&fill,FillEnum); 675 675 rho_water=matpar->GetRhoWater(); 676 676 gravity =matpar->GetG(); … … 737 737 738 738 /*recover type: */ 739 inputs->Get ParameterValue(&type,TypeEnum);739 inputs->GetInputValue(&type,TypeEnum); 740 740 741 741 /*Some checks for debugging*/ -
issm/trunk/src/c/objects/Loads/Numericalflux.cpp
r9883 r10135 422 422 423 423 int type; 424 inputs->Get ParameterValue(&type,TypeEnum);424 inputs->GetInputValue(&type,TypeEnum); 425 425 426 426 switch(type){ … … 474 474 tria->GetSegmentBprimeFlux(&Bprime[0],gauss,index1,index2); 475 475 476 vxaverage_input->Get ParameterValue(&vx,gauss);477 vyaverage_input->Get ParameterValue(&vy,gauss);476 vxaverage_input->GetInputValue(&vx,gauss); 477 vyaverage_input->GetInputValue(&vy,gauss); 478 478 UdotN=vx*normal[0]+vy*normal[1]; 479 479 tria->GetSegmentJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss); … … 532 532 gauss=new GaussTria(); 533 533 gauss->GaussEdgeCenter(index1,index2); 534 vxaverage_input->Get ParameterValue(&mean_vx,gauss);535 vyaverage_input->Get ParameterValue(&mean_vy,gauss);534 vxaverage_input->GetInputValue(&mean_vx,gauss); 535 vyaverage_input->GetInputValue(&mean_vy,gauss); 536 536 delete gauss; 537 537 … … 552 552 tria->GetSegmentNodalFunctions(&L[0],gauss,index1,index2); 553 553 554 vxaverage_input->Get ParameterValue(&vx,gauss);555 vyaverage_input->Get ParameterValue(&vy,gauss);554 vxaverage_input->GetInputValue(&vx,gauss); 555 vyaverage_input->GetInputValue(&vy,gauss); 556 556 UdotN=vx*normal[0]+vy*normal[1]; 557 557 tria->GetSegmentJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss); … … 575 575 576 576 int type; 577 inputs->Get ParameterValue(&type,TypeEnum);577 inputs->GetInputValue(&type,TypeEnum); 578 578 579 579 switch(type){ … … 626 626 tria->GetSegmentBprimeFlux(&Bprime[0],gauss,index1,index2); 627 627 628 vxaverage_input->Get ParameterValue(&vx,gauss);629 vyaverage_input->Get ParameterValue(&vy,gauss);628 vxaverage_input->GetInputValue(&vx,gauss); 629 vyaverage_input->GetInputValue(&vy,gauss); 630 630 UdotN=vx*normal[0]+vy*normal[1]; 631 631 tria->GetSegmentJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss); … … 683 683 gauss=new GaussTria(); 684 684 gauss->GaussEdgeCenter(index1,index2); 685 vxaverage_input->Get ParameterValue(&mean_vx,gauss);686 vyaverage_input->Get ParameterValue(&mean_vy,gauss);685 vxaverage_input->GetInputValue(&mean_vx,gauss); 686 vyaverage_input->GetInputValue(&mean_vy,gauss); 687 687 delete gauss; 688 688 … … 703 703 tria->GetSegmentNodalFunctions(&L[0],gauss,index1,index2); 704 704 705 vxaverage_input->Get ParameterValue(&vx,gauss);706 vyaverage_input->Get ParameterValue(&vy,gauss);705 vxaverage_input->GetInputValue(&vx,gauss); 706 vyaverage_input->GetInputValue(&vy,gauss); 707 707 UdotN=vx*normal[0]+vy*normal[1]; 708 708 tria->GetSegmentJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss); … … 726 726 727 727 int type; 728 inputs->Get ParameterValue(&type,TypeEnum);728 inputs->GetInputValue(&type,TypeEnum); 729 729 730 730 switch(type){ … … 758 758 759 759 int type; 760 inputs->Get ParameterValue(&type,TypeEnum);760 inputs->GetInputValue(&type,TypeEnum); 761 761 762 762 switch(type){ … … 811 811 gauss=new GaussTria(); 812 812 gauss->GaussEdgeCenter(index1,index2); 813 vxaverage_input->Get ParameterValue(&mean_vx,gauss);814 vyaverage_input->Get ParameterValue(&mean_vy,gauss);813 vxaverage_input->GetInputValue(&mean_vx,gauss); 814 vyaverage_input->GetInputValue(&mean_vy,gauss); 815 815 delete gauss; 816 816 … … 831 831 tria->GetSegmentNodalFunctions(&L[0],gauss,index1,index2); 832 832 833 vxaverage_input->Get ParameterValue(&vx,gauss);834 vyaverage_input->Get ParameterValue(&vy,gauss);835 spcthickness_input->Get ParameterValue(&thickness,gauss);833 vxaverage_input->GetInputValue(&vx,gauss); 834 vyaverage_input->GetInputValue(&vy,gauss); 835 spcthickness_input->GetInputValue(&thickness,gauss); 836 836 if(isnan(thickness)) _error_("Cannot weakly apply constraint because NaN was provided"); 837 837 … … 852 852 853 853 int type; 854 inputs->Get ParameterValue(&type,TypeEnum);854 inputs->GetInputValue(&type,TypeEnum); 855 855 856 856 switch(type){ … … 904 904 gauss=new GaussTria(); 905 905 gauss->GaussEdgeCenter(index1,index2); 906 vxaverage_input->Get ParameterValue(&mean_vx,gauss);907 vyaverage_input->Get ParameterValue(&mean_vy,gauss);906 vxaverage_input->GetInputValue(&mean_vx,gauss); 907 vyaverage_input->GetInputValue(&mean_vy,gauss); 908 908 delete gauss; 909 909 UdotN=mean_vx*normal[0]+mean_vy*normal[1]; … … 923 923 tria->GetSegmentNodalFunctions(&L[0],gauss,index1,index2); 924 924 925 vxaverage_input->Get ParameterValue(&vx,gauss);926 vyaverage_input->Get ParameterValue(&vy,gauss);927 thickness_input->Get ParameterValue(&thickness,gauss);925 vxaverage_input->GetInputValue(&vx,gauss); 926 vyaverage_input->GetInputValue(&vy,gauss); 927 thickness_input->GetInputValue(&thickness,gauss); 928 928 929 929 UdotN=vx*normal[0]+vy*normal[1]; -
issm/trunk/src/c/objects/Loads/Pengrid.cpp
r9883 r10135 491 491 492 492 //First recover pressure and temperature values, using the element: */ 493 penta->Get ParameterValue(&pressure,node,PressureEnum);494 penta->Get ParameterValue(&temperature,node,TemperaturePicardEnum);493 penta->GetInputValue(&pressure,node,PressureEnum); 494 penta->GetInputValue(&temperature,node,TemperaturePicardEnum); 495 495 496 496 //Recover our data: … … 545 545 546 546 /*Initialize Element vector and return if necessary*/ 547 penta->inputs->Get ParameterValue(&approximation,ApproximationEnum);547 penta->inputs->GetInputValue(&approximation,ApproximationEnum); 548 548 if(approximation!=StokesApproximationEnum && approximation!=PattynStokesApproximationEnum) return NULL; 549 549 ElementMatrix* Ke=new ElementMatrix(&node,1,this->parameters,StokesApproximationEnum); … … 551 551 /*Retrieve all inputs and parameters*/ 552 552 parameters->FindParam(&penalty_offset,DiagnosticPenaltyFactorEnum); 553 penta->Get ParameterValue(&slope[0],node,BedSlopeXEnum);554 penta->Get ParameterValue(&slope[1],node,BedSlopeYEnum);553 penta->GetInputValue(&slope[0],node,BedSlopeXEnum); 554 penta->GetInputValue(&slope[1],node,BedSlopeYEnum); 555 555 556 556 /*Create elementary matrix: add penalty to constrain wb (wb=ub*db/dx+vb*db/dy)*/ … … 577 577 578 578 /*Retrieve all inputs and parameters*/ 579 penta->Get ParameterValue(&pressure,node,PressureEnum);580 penta->Get ParameterValue(&temperature,node,TemperatureEnum);579 penta->GetInputValue(&pressure,node,PressureEnum); 580 penta->GetInputValue(&temperature,node,TemperatureEnum); 581 581 parameters->FindParam(&penalty_factor,ThermalPenaltyFactorEnum); 582 582 … … 630 630 631 631 /*Retrieve all inputs and parameters*/ 632 penta->Get ParameterValue(&pressure,node,PressureEnum);633 penta->Get ParameterValue(&temperature,node,TemperatureEnum);634 inputs->Get ParameterValue(&melting_offset,MeltingOffsetEnum);632 penta->GetInputValue(&pressure,node,PressureEnum); 633 penta->GetInputValue(&temperature,node,TemperatureEnum); 634 inputs->GetInputValue(&melting_offset,MeltingOffsetEnum); 635 635 parameters->FindParam(&dt,TimesteppingTimeStepEnum); 636 636 parameters->FindParam(&penalty_factor,ThermalPenaltyFactorEnum); … … 670 670 671 671 /*Retrieve all inputs and parameters*/ 672 penta->Get ParameterValue(&pressure,node,PressureEnum);672 penta->GetInputValue(&pressure,node,PressureEnum); 673 673 parameters->FindParam(&penalty_factor,ThermalPenaltyFactorEnum); 674 674 -
issm/trunk/src/c/objects/Loads/Riftfront.cpp
r9883 r10135 139 139 140 140 /*recover some inputs first: */ 141 input=(Input*)this->inputs->GetInput(FillEnum); input->Get ParameterValue(&fill);142 input=(Input*)this->inputs->GetInput(FrictionEnum); input->Get ParameterValue(&friction);143 input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->Get ParameterValue(&fractionincrement);141 input=(Input*)this->inputs->GetInput(FillEnum); input->GetInputValue(&fill); 142 input=(Input*)this->inputs->GetInput(FrictionEnum); input->GetInputValue(&friction); 143 input=(Input*)this->inputs->GetInput(FractionIncrementEnum); input->GetInputValue(&fractionincrement); 144 144 145 145 printf("Riftfront:\n"); … … 526 526 /*Get some parameters: */ 527 527 this->parameters->FindParam(&penalty_offset,DiagnosticPenaltyFactorEnum); 528 this->inputs->Get ParameterValue(&friction,FrictionEnum);529 tria1->Get ParameterValue(&h[0],nodes[0],ThicknessEnum);530 tria2->Get ParameterValue(&h[1],nodes[1],ThicknessEnum);528 this->inputs->GetInputValue(&friction,FrictionEnum); 529 tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum); 530 tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum); 531 531 if (h[0]!=h[1])_error_(" different thicknesses not supported for rift fronts"); 532 532 thickness=h[0]; … … 616 616 617 617 /*Get some inputs: */ 618 this->inputs->Get ParameterValue(&fill,FillEnum);619 this->inputs->Get ParameterValue(&shelf,SegmentOnIceShelfEnum);618 this->inputs->GetInputValue(&fill,FillEnum); 619 this->inputs->GetInputValue(&shelf,SegmentOnIceShelfEnum); 620 620 rho_ice=matpar->GetRhoIce(); 621 621 rho_water=matpar->GetRhoWater(); 622 622 gravity=matpar->GetG(); 623 tria1->Get ParameterValue(&h[0],nodes[0],ThicknessEnum);624 tria2->Get ParameterValue(&h[1],nodes[1],ThicknessEnum);623 tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum); 624 tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum); 625 625 if (h[0]!=h[1])_error_(" different thicknesses not supported for rift fronts"); 626 626 thickness=h[0]; 627 tria1->Get ParameterValue(&b[0],nodes[0],BedEnum);628 tria2->Get ParameterValue(&b[1],nodes[1],BedEnum);627 tria1->GetInputValue(&b[0],nodes[0],BedEnum); 628 tria2->GetInputValue(&b[1],nodes[1],BedEnum); 629 629 if (b[0]!=b[1])_error_(" different beds not supported for rift fronts"); 630 630 bed=b[0]; … … 729 729 730 730 /*recover parameters: */ 731 this->inputs->Get ParameterValue(&fractionincrement,FractionIncrementEnum);731 this->inputs->GetInputValue(&fractionincrement,FractionIncrementEnum); 732 732 733 733 /*First recover velocity: */ 734 tria1->Get ParameterValue(&vx1,nodes[0],VxEnum);735 tria2->Get ParameterValue(&vx2,nodes[1],VxEnum);736 tria1->Get ParameterValue(&vy1,nodes[0],VyEnum);737 tria2->Get ParameterValue(&vy2,nodes[1],VyEnum);734 tria1->GetInputValue(&vx1,nodes[0],VxEnum); 735 tria2->GetInputValue(&vx2,nodes[1],VxEnum); 736 tria1->GetInputValue(&vy1,nodes[0],VyEnum); 737 tria2->GetInputValue(&vy2,nodes[1],VyEnum); 738 738 739 739 /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ … … 795 795 double converged=0; 796 796 797 this->inputs->Get ParameterValue(&converged,ConvergedEnum);797 this->inputs->GetInputValue(&converged,ConvergedEnum); 798 798 799 799 if(converged){ … … 834 834 835 835 /*recover velocity: */ 836 tria1->Get ParameterValue(&vx1,nodes[0],VxEnum);837 tria2->Get ParameterValue(&vx2,nodes[1],VxEnum);838 tria1->Get ParameterValue(&vy1,nodes[0],VyEnum);839 tria2->Get ParameterValue(&vy2,nodes[1],VyEnum);836 tria1->GetInputValue(&vx1,nodes[0],VxEnum); 837 tria2->GetInputValue(&vx2,nodes[1],VxEnum); 838 tria1->GetInputValue(&vy1,nodes[0],VyEnum); 839 tria2->GetInputValue(&vy2,nodes[1],VyEnum); 840 840 841 841 /*Node1 faces node2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ … … 876 876 877 877 /*First recover velocity: */ 878 tria1->Get ParameterValue(&vx1,nodes[0],VxEnum);879 tria2->Get ParameterValue(&vx2,nodes[1],VxEnum);880 tria1->Get ParameterValue(&vy1,nodes[0],VyEnum);881 tria2->Get ParameterValue(&vy2,nodes[1],VyEnum);878 tria1->GetInputValue(&vx1,nodes[0],VxEnum); 879 tria2->GetInputValue(&vx2,nodes[1],VxEnum); 880 tria1->GetInputValue(&vy1,nodes[0],VyEnum); 881 tria2->GetInputValue(&vy2,nodes[1],VyEnum); 882 882 883 883 /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ … … 919 919 920 920 /*First recover velocity: */ 921 tria1->Get ParameterValue(&vx1,nodes[0],VxEnum);922 tria2->Get ParameterValue(&vx2,nodes[1],VxEnum);923 tria1->Get ParameterValue(&vy1,nodes[0],VyEnum);924 tria2->Get ParameterValue(&vy2,nodes[1],VyEnum);921 tria1->GetInputValue(&vx1,nodes[0],VxEnum); 922 tria2->GetInputValue(&vx2,nodes[1],VxEnum); 923 tria1->GetInputValue(&vy1,nodes[0],VyEnum); 924 tria2->GetInputValue(&vy2,nodes[1],VyEnum); 925 925 926 926 /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ … … 968 968 969 969 /*First recover velocity: */ 970 tria1->Get ParameterValue(&vx1,nodes[0],VxEnum);971 tria2->Get ParameterValue(&vx2,nodes[1],VxEnum);972 tria1->Get ParameterValue(&vy1,nodes[0],VyEnum);973 tria2->Get ParameterValue(&vy2,nodes[1],VyEnum);970 tria1->GetInputValue(&vx1,nodes[0],VxEnum); 971 tria2->GetInputValue(&vx2,nodes[1],VxEnum); 972 tria1->GetInputValue(&vy1,nodes[0],VyEnum); 973 tria2->GetInputValue(&vy2,nodes[1],VyEnum); 974 974 975 975 /*Node 1 faces node 2, compute penetration of 2 into 1 (V2-V1).N (with N normal vector, and V velocity vector: */ -
issm/trunk/src/c/objects/Materials/Matice.cpp
r9883 r10135 204 204 double B; 205 205 206 inputs->Get ParameterAverage(&B,MaterialsRheologyBEnum);206 inputs->GetInputAverage(&B,MaterialsRheologyBEnum); 207 207 return B; 208 208 } … … 214 214 double Bbar; 215 215 216 inputs->Get ParameterAverage(&Bbar,MaterialsRheologyBbarEnum);216 inputs->GetInputAverage(&Bbar,MaterialsRheologyBbarEnum); 217 217 return Bbar; 218 218 } … … 224 224 double n; 225 225 226 inputs->Get ParameterAverage(&n,MaterialsRheologyNEnum);226 inputs->GetInputAverage(&n,MaterialsRheologyNEnum); 227 227 return n; 228 228 } -
issm/trunk/src/c/objects/Node.cpp
r9883 r10135 632 632 633 633 /*recover parameters: */ 634 inputs->Get ParameterValue(&approximation,ApproximationEnum);634 inputs->GetInputValue(&approximation,ApproximationEnum); 635 635 636 636 return approximation; … … 642 642 643 643 /*recover parameters: */ 644 inputs->Get ParameterValue(&connectivity,NumberNodeToElementConnectivityEnum);644 inputs->GetInputValue(&connectivity,NumberNodeToElementConnectivityEnum); 645 645 646 646 return connectivity; … … 740 740 741 741 /*recover parameters: */ 742 inputs->Get ParameterValue(&onbed,MeshVertexonbedEnum);742 inputs->GetInputValue(&onbed,MeshVertexonbedEnum); 743 743 744 744 return onbed; … … 751 751 752 752 /*recover parameters: */ 753 inputs->Get ParameterValue(&onsheet,MaskVertexongroundediceEnum);753 inputs->GetInputValue(&onsheet,MaskVertexongroundediceEnum); 754 754 755 755 return onsheet; … … 762 762 763 763 /*recover parameters: */ 764 inputs->Get ParameterValue(&onshelf,MaskVertexonfloatingiceEnum);764 inputs->GetInputValue(&onshelf,MaskVertexonfloatingiceEnum); 765 765 766 766 return onshelf; … … 773 773 774 774 /*recover parameters: */ 775 inputs->Get ParameterValue(&onsurface,MeshVertexonsurfaceEnum);775 inputs->GetInputValue(&onsurface,MeshVertexonsurfaceEnum); 776 776 777 777 return onsurface;
Note:
See TracChangeset
for help on using the changeset viewer.