Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 24378) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 24379) @@ -74,5 +74,4 @@ ./classes/FemModel.cpp\ ./classes/Loads/Friction.cpp\ - ./classes/Inputs/TransientInput.cpp\ ./classes/Constraints/SpcTransient.cpp\ ./classes/DependentObject.cpp\ @@ -103,12 +102,4 @@ ./classes/Elements/Penta.cpp\ ./classes/Elements/PentaRef.cpp\ - ./classes/Inputs/Inputs.cpp\ - ./classes/Inputs/SegInput.cpp\ - ./classes/Inputs/TriaInput.cpp\ - ./classes/Inputs/BoolInput.cpp\ - ./classes/Inputs/IntInput.cpp\ - ./classes/Inputs/DoubleInput.cpp\ - ./classes/Inputs/DoubleArrayInput.cpp\ - ./classes/Inputs/DatasetInput.cpp\ ./classes/Materials/Materials.cpp\ ./classes/Materials/Matice.cpp\ @@ -292,5 +283,4 @@ ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\ ./modules/RheologyBAbsGradientx/RheologyBAbsGradientx.cpp\ - ./classes/Inputs/ControlInput.cpp\ ./shared/Numerics/BrentSearch.cpp\ ./cores/control_core.cpp\ @@ -325,6 +315,4 @@ ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\ ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\ - ./classes/Inputs/PentaInput.cpp\ - ./classes/Inputs/TetraInput.cpp\ ./classes/Inputs2/Inputs2.cpp\ ./classes/Inputs2/BoolInput2.cpp\ Index: /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp (revision 24379) @@ -20,5 +20,4 @@ #include "../modules/SurfaceAreax/SurfaceAreax.h" #include "../classes/Params/Parameters.h" -#include "../classes/Inputs/Input.h" #include "../classes/gauss/Gauss.h" #include "./Inputs2/DatasetInput2.h" Index: /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.cpp (revision 24379) @@ -20,5 +20,4 @@ #include "../modules/SurfaceAreax/SurfaceAreax.h" #include "../classes/Params/Parameters.h" -#include "../classes/Inputs/Input.h" #include "../classes/gauss/Gauss.h" #include "./Inputs2/DatasetInput2.h" Index: /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp (revision 24379) @@ -20,5 +20,4 @@ #include "../modules/SurfaceAreax/SurfaceAreax.h" #include "../classes/Params/Parameters.h" -#include "../classes/Inputs/Input.h" #include "../classes/gauss/Gauss.h" #include "./Inputs2/DatasetInput2.h" Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 24379) @@ -1864,39 +1864,39 @@ else if(M==iomodel->numberofvertices+1 && N>1){ _error_("not supported tet"); - /*create transient input: */ - IssmDouble* times = xNew(N); - for(int t=0;tObjectEnum()){ - case TriaEnum: - values_input->AddTimeInput(new TriaInput(input_enum,values,P1Enum)); - mins_input->AddTimeInput(new TriaInput(ControlInputMinsEnum,values_min,P1Enum)); - maxs_input->AddTimeInput(new TriaInput(ControlInputMaxsEnum,values_max,P1Enum)); - break; - case PentaEnum: - values_input->AddTimeInput(new PentaInput(input_enum,values,P1Enum)); - mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum)); - maxs_input->AddTimeInput(new PentaInput(ControlInputMaxsEnum,values_max,P1Enum)); - break; - case TetraEnum: - values_input->AddTimeInput(new TetraInput(input_enum,values,P1Enum)); - mins_input->AddTimeInput(new TetraInput(ControlInputMinsEnum,values_min,P1Enum)); - maxs_input->AddTimeInput(new TetraInput(ControlInputMaxsEnum,values_max,P1Enum)); - break; - default: _error_("Not implemented yet"); - } - } + ///*create transient input: */ + //IssmDouble* times = xNew(N); + //for(int t=0;tObjectEnum()){ + // case TriaEnum: + // values_input->AddTimeInput(new TriaInput(input_enum,values,P1Enum)); + // mins_input->AddTimeInput(new TriaInput(ControlInputMinsEnum,values_min,P1Enum)); + // maxs_input->AddTimeInput(new TriaInput(ControlInputMaxsEnum,values_max,P1Enum)); + // break; + // case PentaEnum: + // values_input->AddTimeInput(new PentaInput(input_enum,values,P1Enum)); + // mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum)); + // maxs_input->AddTimeInput(new PentaInput(ControlInputMaxsEnum,values_max,P1Enum)); + // break; + // case TetraEnum: + // values_input->AddTimeInput(new TetraInput(input_enum,values,P1Enum)); + // mins_input->AddTimeInput(new TetraInput(ControlInputMinsEnum,values_min,P1Enum)); + // maxs_input->AddTimeInput(new TetraInput(ControlInputMaxsEnum,values_max,P1Enum)); + // break; + // default: _error_("Not implemented yet"); + // } + //} //this->inputs->AddInput(new ControlInput(input_enum,TransientInputEnum,values_input,mins_input,maxs_input,grad_input,P1Enum,id)); - xDelete(times); + //xDelete(times); } else _error_("not currently supported type of M and N attempted"); @@ -1996,19 +1996,19 @@ else if(M==iomodel->numberofelements+1){ _error_("not supported"); - /*create transient input: */ - IssmDouble* times = xNew(N); - for(t=0;tSid()+t]; - switch(this->ObjectEnum()){ - case TriaEnum: transientinput->AddTimeInput(new TriaInput( input_enum,&value,P0Enum)); break; - case PentaEnum: transientinput->AddTimeInput(new PentaInput(input_enum,&value,P0Enum)); break; - case TetraEnum: transientinput->AddTimeInput(new TetraInput(input_enum,&value,P0Enum)); break; - default: _error_("Not implemented yet"); - } - } - xDelete(times); + ///*create transient input: */ + //IssmDouble* times = xNew(N); + //for(t=0;tSid()+t]; + // switch(this->ObjectEnum()){ + // case TriaEnum: transientinput->AddTimeInput(new TriaInput( input_enum,&value,P0Enum)); break; + // case PentaEnum: transientinput->AddTimeInput(new PentaInput(input_enum,&value,P0Enum)); break; + // case TetraEnum: transientinput->AddTimeInput(new TetraInput(input_enum,&value,P0Enum)); break; + // default: _error_("Not implemented yet"); + // } + //} + //xDelete(times); } else _error_("element vector is either numberofelements or numberofelements+1 long. Field provided (" << EnumToStringx(input_enum) << ") is " << M << " long"); @@ -2017,13 +2017,13 @@ _error_("not supported"); - /*For right now we are static */ - if(M==iomodel->numberofelements){ - /*create transient input: */ - IssmDouble* layers = xNewZeroInit(N);; - for(t=0;tSid()+t]; - DoubleArrayInput* arrayinput=new DoubleArrayInput(input_enum,layers,N); - xDelete(layers); - } - else _error_("element vector is either numberofelements or numberofelements+1 long. Field provided (" << EnumToStringx(input_enum) << ") is " << M << " long"); + ///*For right now we are static */ + //if(M==iomodel->numberofelements){ + // /*create transient input: */ + // IssmDouble* layers = xNewZeroInit(N);; + // for(t=0;tSid()+t]; + // DoubleArrayInput* arrayinput=new DoubleArrayInput(input_enum,layers,N); + // xDelete(layers); + //} + //else _error_("element vector is either numberofelements or numberofelements+1 long. Field provided (" << EnumToStringx(input_enum) << ") is " << M << " long"); } else{ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 24379) @@ -240,10 +240,10 @@ } /*Create inputs and add to DataSetInput*/ - DatasetInput* datasetinput=new DatasetInput(input_enum); - for(int i=0;iAddInput(new PentaInput(input_enum,nodeinputs,P1Enum),individual_enums[i]); - } +// DatasetInput* datasetinput=new DatasetInput(input_enum); +// for(int i=0;iAddInput(new PentaInput(input_enum,nodeinputs,P1Enum),individual_enums[i]); +// } /*Add datasetinput to element inputs*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 24379) @@ -243,5 +243,5 @@ } /*Create inputs and add to DataSetInput*/ - DatasetInput* datasetinput=new DatasetInput(input_enum); + //DatasetInput* datasetinput=new DatasetInput(input_enum); for(int i=0;inumtimesteps;t++) { IssmDouble time = transientinput->GetTimeByOffset(t); - TriaInput* timeinput = xDynamicCast(transientinput->GetTimeInput(time)); - if(timeinput->interpolation_type!=P1Enum) _error_("not supported yet"); - input->Serve(NUMVERTICES,&lidlist[0]); - /*Create list of indices and values for global vector*/ - for(int i=0;ivertices[i]->Sid()+t*M[control_index]; - values[N*i+t] = timeinput->values[i]; - } + _error_("not implemented"); + //TriaInput* timeinput = xDynamicCast(transientinput->GetTimeInput(time)); + //if(timeinput->interpolation_type!=P1Enum) _error_("not supported yet"); + //input->Serve(NUMVERTICES,&lidlist[0]); + ///*Create list of indices and values for global vector*/ + //for(int i=0;ivertices[i]->Sid()+t*M[control_index]; + // values[N*i+t] = timeinput->values[i]; + //} } vector->SetValues(NUMVERTICES*transientinput->numtimesteps,idlist,values,INS_VAL); Index: /issm/trunk-jpl/src/c/classes/Inputs2/DatasetInput2.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs2/DatasetInput2.h (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Inputs2/DatasetInput2.h (revision 24379) @@ -1,3 +1,3 @@ -/*! \file DatasetInput.h +/*! \file DatasetInput2.h * \brief: header file for datasetinput object */ Index: /issm/trunk-jpl/src/c/classes/Materials/Matestar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matestar.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Materials/Matestar.cpp (revision 24379) @@ -11,9 +11,4 @@ #include "./Matestar.h" #include "./Materials.h" -#include "../Inputs/Input.h" -#include "../Inputs/Inputs.h" -#include "../Inputs/TriaInput.h" -#include "../Inputs/PentaInput.h" -#include "../Inputs/ControlInput.h" #include "../Elements/Element.h" #include "../Elements/Tria.h" Index: /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 24379) @@ -11,9 +11,4 @@ #include "./Matice.h" #include "./Materials.h" -#include "../Inputs/Input.h" -#include "../Inputs/Inputs.h" -#include "../Inputs/TriaInput.h" -#include "../Inputs/PentaInput.h" -#include "../Inputs/ControlInput.h" #include "../Elements/Element.h" #include "../Elements/Tria.h" Index: /issm/trunk-jpl/src/c/classes/Misfit.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Misfit.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Misfit.cpp (revision 24379) @@ -20,5 +20,4 @@ #include "../modules/SurfaceAreax/SurfaceAreax.h" #include "../classes/Params/Parameters.h" -#include "../classes/Inputs/Input.h" #include "../classes/gauss/Gauss.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Nodalvalue.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Nodalvalue.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Nodalvalue.cpp (revision 24379) @@ -15,5 +15,4 @@ #include "../modules/SurfaceAreax/SurfaceAreax.h" #include "../classes/Params/Parameters.h" -#include "../classes/Inputs/Input.h" #include "../classes/gauss/Gauss.h" #include "./classes.h" Index: /issm/trunk-jpl/src/c/classes/Radar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Radar.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/classes/Radar.cpp (revision 24379) @@ -17,5 +17,4 @@ #include "./FemModel.h" #include "../classes/Params/Parameters.h" -#include "../classes/Inputs/Input.h" #include "../classes/gauss/Gauss.h" #include "./Radar.h" Index: /issm/trunk-jpl/src/c/classes/classes.h =================================================================== --- /issm/trunk-jpl/src/c/classes/classes.h (revision 24378) +++ /issm/trunk-jpl/src/c/classes/classes.h (revision 24379) @@ -66,19 +66,4 @@ #include "./Options/OptionUtilities.h" -/*Inputs: */ -#include "./Inputs/Inputs.h" -#include "./Inputs/Input.h" -#include "./Inputs/BoolInput.h" -#include "./Inputs/DoubleInput.h" -#include "./Inputs/DoubleArrayInput.h" -#include "./Inputs/IntInput.h" -#include "./Inputs/TetraInput.h" -#include "./Inputs/PentaInput.h" -#include "./Inputs/TriaInput.h" -#include "./Inputs/SegInput.h" -#include "./Inputs/ControlInput.h" -#include "./Inputs/DatasetInput.h" -#include "./Inputs/TransientInput.h" - /*Inputs2*/ #include "./Inputs2/Inputs2.h" Index: /issm/trunk-jpl/src/c/datastructures/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/datastructures/DataSet.cpp (revision 24378) +++ /issm/trunk-jpl/src/c/datastructures/DataSet.cpp (revision 24379) @@ -215,58 +215,4 @@ this->AddObject(seg); } - else if(obj_enum==BoolInputEnum){ - BoolInput* boolinput=NULL; - boolinput=new BoolInput(); - boolinput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(boolinput); - } - else if(obj_enum==DoubleInputEnum){ - DoubleInput* doubleinput=NULL; - doubleinput=new DoubleInput(); - doubleinput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(doubleinput); - } - else if(obj_enum==IntInputEnum){ - IntInput* intinput=NULL; - intinput=new IntInput(); - intinput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(intinput); - } - else if(obj_enum==ControlInputEnum){ - ControlInput* cinput=NULL; - cinput=new ControlInput(); - cinput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(cinput); - } - else if(obj_enum==TransientInputEnum){ - TransientInput* transinput=NULL; - transinput=new TransientInput(); - transinput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(transinput); - } - else if(obj_enum==TriaInputEnum){ - TriaInput* triainput=NULL; - triainput=new TriaInput(); - triainput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(triainput); - } - else if(obj_enum==PentaInputEnum){ - PentaInput* pentainput=NULL; - pentainput=new PentaInput(); - pentainput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(pentainput); - } - else if(obj_enum==TetraInputEnum){ - TetraInput* tetrainput=NULL; - tetrainput=new TetraInput(); - tetrainput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(tetrainput); - } - else if(obj_enum==SegInputEnum){ - SegInput* seginput=NULL; - seginput=new SegInput(); - seginput->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction); - this->AddObject(seginput); - } else if(obj_enum==RiftfrontEnum){ Riftfront* rift=NULL;