Index: /issm/trunk-jpl/src/c/CMakeLists.txt =================================================================== --- /issm/trunk-jpl/src/c/CMakeLists.txt (revision 16485) +++ /issm/trunk-jpl/src/c/CMakeLists.txt (revision 16486) @@ -9,5 +9,4 @@ $ENV{ISSM_DIR}/src/c/classes $ENV{ISSM_DIR}/src/c/classes/Options - $ENV{ISSM_DIR}/src/c/classes/ElementResults $ENV{ISSM_DIR}/src/c/classes/ExternalResults $ENV{ISSM_DIR}/src/c/classes/Elements @@ -95,7 +94,4 @@ ./classes/Vertex.cpp ./classes/Hook.cpp - ./classes/ElementResults/DoubleElementResult.cpp - ./classes/ElementResults/TriaP1ElementResult.cpp - ./classes/ElementResults/BoolElementResult.cpp ./classes/ExternalResults/Results.cpp ./classes/Elements/Elements.cpp @@ -395,5 +391,4 @@ #3D sources {{{ set(threed_sources ./classes/gauss/GaussPenta.cpp - ./classes/ElementResults/PentaP1ElementResult.cpp ./classes/Inputs/PentaInput.cpp ./classes/Elements/Penta.cpp Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 16485) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 16486) @@ -63,11 +63,4 @@ ./classes/Hook.h\ ./classes/Hook.cpp\ - ./classes/ElementResults/ElementResultLocal.h\ - ./classes/ElementResults/DoubleElementResult.h\ - ./classes/ElementResults/DoubleElementResult.cpp\ - ./classes/ElementResults/TriaP1ElementResult.h\ - ./classes/ElementResults/TriaP1ElementResult.cpp\ - ./classes/ElementResults/BoolElementResult.h\ - ./classes/ElementResults/BoolElementResult.cpp\ ./classes/ExternalResults/Results.h\ ./classes/ExternalResults/Results.cpp\ @@ -594,6 +587,4 @@ threed_sources = ./classes/gauss/GaussPenta.h\ ./classes/gauss/GaussPenta.cpp\ - ./classes/ElementResults/PentaP1ElementResult.h\ - ./classes/ElementResults/PentaP1ElementResult.cpp\ ./classes/Inputs/PentaInput.h\ ./classes/Inputs/PentaInput.cpp\ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 16486) @@ -59,8 +59,6 @@ virtual void ComputeBasalStress(Vector* sigma_b)=0; virtual void ComputeStrainRate(Vector* eps)=0; - virtual void ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results)=0; virtual void ResultInterpolation(int* pinterpolation,int output_enum)=0; virtual void ResultToVector(Vector* vector,int output_enum)=0; - virtual void DeleteResults(void)=0; virtual void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finite_element)=0; virtual void InputDuplicate(int original_enum,int new_enum)=0; @@ -70,5 +68,4 @@ virtual void InputScale(int enum_type,IssmDouble scale_factor)=0; virtual void GetVectorFromInputs(Vector* vector, int name_enum)=0; - virtual void GetVectorFromResults(Vector* vector,int id,int enum_in,int interp)=0; virtual IssmDouble TimeAdapt()=0; virtual void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Elements.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Elements.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Elements.cpp (revision 16486) @@ -51,13 +51,4 @@ } /*}}}*/ -/*FUNCTION Elements::DeleteResults{{{*/ -void Elements::DeleteResults(void){ - - for (int i=0;iSize();i++){ - Element* element=dynamic_cast(this->GetObjectByOffset(i)); - element->DeleteResults(); - } -} -/*}}}*/ /*FUNCTION Elements::SetCurrentConfiguration{{{*/ void Elements::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ @@ -73,99 +64,4 @@ } -} -/*}}}*/ -/*FUNCTION Elements::ToResults{{{*/ -void Elements::ToResults(Results* results,Parameters* parameters){ - - int my_rank; - int num_procs; - - int *resultsenums = NULL; - int *resultssizes = NULL; - int *resultssteps = NULL; - IssmDouble *resultstimes = NULL; - IssmDouble *vector_serial = NULL; - Vector *vector = NULL; - bool io_gather; - int numberofvertices,numberofelements; - int numberofresults ,vectorsize; - int rank; - int minrank; - - /*recover my_rank:*/ - my_rank=IssmComm::GetRank(); - num_procs=IssmComm::GetSize(); - - /*Recover parameters: */ - parameters->FindParam(&io_gather,SettingsIoGatherEnum); - parameters->FindParam(&numberofvertices,MeshNumberofverticesEnum); - parameters->FindParam(&numberofelements,MeshNumberofelementsEnum); - - /*Get rank of first cpu that has results*/ - if(this->Size()) rank=my_rank; - else rank=num_procs; - ISSM_MPI_Allreduce (&rank,&minrank,1,ISSM_MPI_INT,ISSM_MPI_MIN,IssmComm::GetComm()); - - /*see what the first element of this partition has in stock (this is common to all partitions)*/ - if(my_rank==minrank){ - if(this->Size()==0) _error_("Cannot write results because there is no element??"); - Element* element=dynamic_cast(this->GetObjectByOffset(0)); - element->ListResultsInfo(&resultsenums,&resultssizes,&resultstimes,&resultssteps,&numberofresults); - } - ISSM_MPI_Bcast(&numberofresults,1,ISSM_MPI_INT,minrank,IssmComm::GetComm()); - - /*Get out if there is no results. Otherwise broadcast info*/ - if(!numberofresults) return; - if(my_rank!=minrank){ - resultsenums=xNew(numberofresults); - resultssizes=xNew(numberofresults); - resultstimes=xNew(numberofresults); - resultssteps=xNew(numberofresults); - } - ISSM_MPI_Bcast(resultsenums,numberofresults,ISSM_MPI_INT,minrank,IssmComm::GetComm()); - ISSM_MPI_Bcast(resultssizes,numberofresults,ISSM_MPI_INT,minrank,IssmComm::GetComm()); - ISSM_MPI_Bcast(resultstimes,numberofresults,ISSM_MPI_DOUBLE,minrank,IssmComm::GetComm()); - ISSM_MPI_Bcast(resultssteps,numberofresults,ISSM_MPI_INT,minrank,IssmComm::GetComm()); - - /*Loop over all results and get nodal vector*/ - for(int i=0;i(vectorsize); - - for(int j=0;jSize();j++){ - Element* element=dynamic_cast(this->GetObjectByOffset(j)); - element->GetVectorFromResults(vector,i,resultsenums[i],resultssizes[i]); - } - vector->Assemble(); - - /*Serialize and add to results*/ - vector_serial=vector->ToMPISerial(); - results->DeleteResult(resultsenums[i],resultssteps[i]); - if(my_rank==0){ - /*No need to add this vector for all cpus*/ -#ifdef _HAVE_ADOLC_ - IssmPDouble* vector_serial_passive=xNew(vectorsize); - for(int k=0;k(vector_serial[k]); - results->AddResult(new GenericExternalResult(results->Size()+1,resultsenums[i],vector_serial_passive,vectorsize,1,resultssteps[i],resultstimes[i])); - xDelete(vector_serial_passive); -#else - results->AddResult(new GenericExternalResult(results->Size()+1,resultsenums[i],vector_serial,vectorsize,1,resultssteps[i],resultstimes[i])); -#endif - } - - /*clean up*/ - delete vector; - xDelete(vector_serial); - } - - /*Free ressources:*/ - xDelete(resultsenums); - xDelete(resultssizes); - xDelete(resultssteps); - xDelete(resultstimes); } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Elements.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Elements.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Elements.h (revision 16486) @@ -25,8 +25,6 @@ /*numerics*/ void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); - void DeleteResults(void); int MaxNumNodes(void); void SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); - void ToResults(Results* results,Parameters* parameters); int NumberOfElements(void); void InputDuplicate(int input_enum,int output_enum); Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16486) @@ -30,5 +30,4 @@ this->inputs = NULL; this->parameters = NULL; - this->results = NULL; } /*}}}*/ @@ -36,5 +35,4 @@ Penta::~Penta(){ delete inputs; - delete results; this->parameters=NULL; } @@ -65,7 +63,6 @@ this->parameters=NULL; - /*intialize inputs and results: */ + /*intialize inputs: */ this->inputs=new Inputs(); - this->results=new Results(); /*initialize pointers:*/ @@ -107,10 +104,4 @@ else{ penta->inputs=new Inputs(); - } - if(this->results){ - penta->results=(Results*)this->results->Copy(); - } - else{ - penta->results=new Results(); } /*point parameters: */ @@ -845,15 +836,4 @@ _printf_(" inputs\n"); inputs->DeepEcho(); - _printf_(" results\n"); - results->DeepEcho(); -} -/*}}}*/ -/*FUNCTION Penta::DeleteResults {{{*/ -void Penta::DeleteResults(void){ - - /*Delete and reinitialize results*/ - delete this->results; - this->results=new Results(); - } /*}}}*/ @@ -1656,24 +1636,4 @@ /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ input->GetVectorFromInputs(vector,&vertexpidlist[0]); -} -/*}}}*/ -/*FUNCTION Penta::GetVectorFromResults{{{*/ -void Penta::GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp){ - - /*Get result*/ - ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); - if(interp==P1Enum){ - int vertexpidlist[NUMVERTICES]; - int connectivity[NUMVERTICES]; - this->GetVertexSidList(&vertexpidlist[0]); - this->GetConnectivityList(&connectivity[0]); - elementresult->GetVectorFromResults(vector,&vertexpidlist[0],&connectivity[0],NUMVERTICES); - } - else if(interp==P0Enum){ - elementresult->GetElementVectorFromResults(vector,sid); - } - else{ - _printf_("Interpolation " << EnumToStringx(interp) << " not supported\n"); - } } /*}}}*/ @@ -2759,49 +2719,4 @@ } /*}}}*/ -/*FUNCTION Penta::ListResultsInfo{{{*/ -void Penta::ListResultsInfo(int** in_resultsenums,int** in_resultssizes,IssmDouble** in_resultstimes,int** in_resultssteps,int* in_num_results){ - - /*Intermediaries*/ - int *resultsenums = NULL; - int *resultssizes = NULL; - IssmDouble *resultstimes = NULL; - int *resultssteps = NULL; - - /*Checks*/ - _assert_(in_num_results); - - /*Count number of results*/ - int numberofresults = this->results->Size(); - - if(numberofresults){ - /*Allocate output*/ - resultsenums=xNew(numberofresults); - resultssizes=xNew(numberofresults); - resultstimes=xNew(numberofresults); - resultssteps=xNew(numberofresults); - - /*populate enums*/ - for(int i=0;iresults->Size();i++){ - ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - resultsenums[i]=StringToEnumx(elementresult->GetResultName()); - resultstimes[i]=elementresult->GetTime(); - resultssteps[i]=elementresult->GetStep(); - if(elementresult->ObjectEnum()==PentaP1ElementResultEnum){ - resultssizes[i]=P1Enum; - } - else{ - resultssizes[i]=P0Enum; - } - } - } - - /*Assign output pointers:*/ - *in_num_results=numberofresults; - *in_resultsenums=resultsenums; - *in_resultssizes=resultssizes; - *in_resultstimes=resultstimes; - *in_resultssteps=resultssteps; - -}/*}}}*/ /*FUNCTION Penta::MinEdgeLength{{{*/ IssmDouble Penta::MinEdgeLength(IssmDouble xyz_list[6][3]){ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 16486) @@ -43,5 +43,4 @@ Parameters *parameters; //pointer to solution parameters Inputs *inputs; - Results *results; /*Penta constructors and destructor: {{{*/ @@ -82,5 +81,4 @@ void CreateJacobianMatrix(Matrix* Jff); void Delta18oParameterization(void); - void DeleteResults(void); int GetNodeIndex(Node* node); void GetNodesSidList(int* sidlist); @@ -90,5 +88,4 @@ IssmDouble GetZcoord(GaussPenta* gauss); void GetVectorFromInputs(Vector* vector,int name_enum); - void GetVectorFromResults(Vector* vector,int offset,int name_enum,int interp); int Sid(); @@ -98,5 +95,4 @@ void InputScale(int enum_type,IssmDouble scale_factor); - void ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results); void ResultInterpolation(int* pinterpolation,int output_enum); void ResultToVector(Vector* vector,int output_enum); Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.cpp (revision 16486) @@ -27,5 +27,4 @@ this->inputs = NULL; this->parameters = NULL; - this->results = NULL; } /*}}}*/ @@ -41,7 +40,6 @@ this->parameters = NULL; - /*intialize inputs and results: */ + /*intialize inputs: */ this->inputs = new Inputs(); - this->results = new Results(); /*initialize pointers:*/ @@ -56,5 +54,4 @@ Seg::~Seg(){ delete inputs; - delete results; this->parameters=NULL; } @@ -89,7 +86,4 @@ if (inputs) inputs->Echo(); else _printf_("inputs=NULL\n"); - - if (results) results->Echo(); - else _printf_("results=NULL\n"); } /*}}}*/ @@ -118,7 +112,4 @@ if (inputs) inputs->DeepEcho(); else _printf_("inputs=NULL\n"); - - if (results) results->DeepEcho(); - else _printf_("results=NULL\n"); return; Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 16486) @@ -40,5 +40,4 @@ Parameters *parameters; //pointer to solution parameters Inputs *inputs; - Results *results; /*Seg constructors, destructors {{{*/ @@ -105,14 +104,11 @@ void GetSolutionFromInputs(Vector* solution){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector, int name_enum){_error_("not implemented yet");}; - void GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp){_error_("not implemented yet");}; void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){_error_("not implemented yet");}; void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum=MeshElementsEnum){_error_("not implemented yet");}; void InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");}; void InputScale(int enum_type,IssmDouble scale_factor){_error_("not implemented yet");}; - void DeleteResults(void){_error_("not implemented yet");}; void MaterialUpdateFromTemperature(void){_error_("not implemented yet");}; int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){_error_("not implemented yet");}; void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){_error_("not implemented yet");}; - void ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results){_error_("not implemented yet");}; void ResultInterpolation(int* pinterpolation,int output_enum){_error_("not implemented");}; void ResultToVector(Vector* vector,int output_enum){_error_("not implemented");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16486) @@ -32,5 +32,4 @@ this->inputs = NULL; this->parameters = NULL; - this->results = NULL; } @@ -47,7 +46,6 @@ this->parameters = NULL; - /*intialize inputs and results: */ + /*intialize inputs: */ this->inputs = new Inputs(); - this->results = new Results(); /*initialize pointers:*/ @@ -62,5 +60,4 @@ Tria::~Tria(){ delete inputs; - delete results; this->parameters=NULL; } @@ -94,10 +91,4 @@ else{ tria->inputs=new Inputs(); - } - if(this->results){ - tria->results=(Results*)this->results->Copy(); - } - else{ - tria->results=new Results(); } /*point parameters: */ @@ -759,17 +750,5 @@ else _printf_("inputs=NULL\n"); - if (results) results->DeepEcho(); - else _printf_("results=NULL\n"); - return; -} -/*}}}*/ -/*FUNCTION Tria::DeleteResults {{{*/ -void Tria::DeleteResults(void){ - - /*Delete and reinitialize results*/ - delete this->results; - this->results=new Results(); - } /*}}}*/ @@ -869,7 +848,4 @@ if (inputs) inputs->Echo(); else _printf_("inputs=NULL\n"); - - if (results) results->Echo(); - else _printf_("results=NULL\n"); } /*}}}*/ @@ -1549,24 +1525,4 @@ /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ input->GetVectorFromInputs(vector,&vertexpidlist[0]); -} -/*}}}*/ -/*FUNCTION Tria::GetVectorFromResults{{{*/ -void Tria::GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp){ - - /*Get result*/ - ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); - if(interp==P1Enum){ - int vertexpidlist[NUMVERTICES]; - int connectivity[NUMVERTICES]; - this->GetVertexSidList(&vertexpidlist[0]); - this->GetConnectivityList(&connectivity[0]); - elementresult->GetVectorFromResults(vector,&vertexpidlist[0],&connectivity[0],NUMVERTICES); - } - else if(interp==P0Enum){ - elementresult->GetElementVectorFromResults(vector,sid); - } - else{ - _printf_("Interpolation " << EnumToStringx(interp) << " not supported\n"); - } } /*}}}*/ @@ -2347,50 +2303,4 @@ } /*}}}*/ -/*FUNCTION Tria::ListResultsInfo{{{*/ -void Tria::ListResultsInfo(int** in_resultsenums,int** in_resultssizes,IssmDouble** in_resultstimes,int** in_resultssteps,int* in_num_results){ - - /*Intermediaries*/ - int *resultsenums = NULL; - int *resultssizes = NULL; - IssmDouble *resultstimes = NULL; - int *resultssteps = NULL; - - /*Checks*/ - _assert_(in_num_results); - - /*Count number of results*/ - int numberofresults = this->results->Size(); - - if(numberofresults){ - - /*Allocate output*/ - resultsenums=xNew(numberofresults); - resultssizes=xNew(numberofresults); - resultstimes=xNew(numberofresults); - resultssteps=xNew(numberofresults); - - /*populate enums*/ - for(int i=0;iresults->Size();i++){ - ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - resultsenums[i]=StringToEnumx(elementresult->GetResultName()); - resultstimes[i]=elementresult->GetTime(); - resultssteps[i]=elementresult->GetStep(); - if(elementresult->ObjectEnum()==TriaP1ElementResultEnum){ - resultssizes[i]=P1Enum; - } - else{ - resultssizes[i]=P0Enum; - } - } - } - - /*Assign output pointers:*/ - *in_num_results=numberofresults; - *in_resultsenums=resultsenums; - *in_resultssizes=resultssizes; - *in_resultstimes=resultstimes; - *in_resultssteps=resultssteps; - -}/*}}}*/ /*FUNCTION Tria::NodalValue {{{*/ int Tria::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16486) @@ -41,5 +41,4 @@ Parameters *parameters; //pointer to solution parameters Inputs *inputs; - Results *results; /*Tria constructors, destructors {{{*/ @@ -96,14 +95,11 @@ void GetSolutionFromInputs(Vector* solution); void GetVectorFromInputs(Vector* vector, int name_enum); - void GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp); void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code); void InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum=MeshElementsEnum); void InputDuplicate(int original_enum,int new_enum); void InputScale(int enum_type,IssmDouble scale_factor); - void DeleteResults(void); void MaterialUpdateFromTemperature(void){_error_("not implemented yet");}; int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum); void PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm); - void ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results); void ResultInterpolation(int* pinterpolation,int output_enum); void ResultToVector(Vector* vector,int output_enum); Index: /issm/trunk-jpl/src/c/classes/ExternalResults/Results.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/ExternalResults/Results.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/ExternalResults/Results.cpp (revision 16486) @@ -15,5 +15,4 @@ #include "../../shared/shared.h" #include "../Params/Parameters.h" -#include "../ElementResults/ElementResult.h" using namespace std; @@ -49,31 +48,4 @@ } -} -/*}}}*/ -/*FUNCTION Results::AddResult(ElementResult* in_result){{{*/ -int Results::AddResult(ElementResult* in_result){ - - /*First, go through dataset of inputs and check whether any input - * with the same name is already in. If so, erase the corresponding - * object before adding this new one: */ - vector::iterator object; - - /*In debugging mode, check that the input is not a NULL pointer*/ - _assert_(in_result); - - for(object=objects.begin() ; object(*object); - - if(result->GetStep()==in_result->GetStep()){ - if(strcmp(result->GetResultName(),in_result->GetResultName())==0){ - this->DeleteObject(result); - break; - } - } - } - this->AddObject(in_result); - - return 1; } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/ExternalResults/Results.h =================================================================== --- /issm/trunk-jpl/src/c/classes/ExternalResults/Results.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/ExternalResults/Results.h (revision 16486) @@ -6,5 +6,4 @@ /*forward declarations */ class Parameters; -class ElementResult; class ExternalResult; @@ -22,5 +21,4 @@ /*Mehthos*/ - int AddResult(ElementResult* result); int AddResult(ExternalResult* result); int DeleteResult(int result_enum,int result_step); Index: /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp (revision 16486) @@ -101,11 +101,4 @@ } /*}}}*/ -/*FUNCTION BoolInput::SpawnResult{{{*/ -ElementResult* BoolInput::SpawnResult(int step, IssmDouble time){ - - return new BoolElementResult(this->enum_type,this->value,step,time); - -} -/*}}}*/ /*Object functions*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h (revision 16486) @@ -39,5 +39,4 @@ Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; - ElementResult* SpawnResult(int step, IssmDouble time); int GetResultInterpolation(void){return P0Enum;}; void Configure(Parameters* parameters); Index: /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp (revision 16486) @@ -185,8 +185,4 @@ }/*}}}*/ -/*FUNCTION ControlInput::SpawnResult{{{*/ -ElementResult* ControlInput::SpawnResult(int step, IssmDouble time){ - return savedvalues->SpawnResult(step,time); -}/*}}}*/ /*FUNCTION ControlInput::SpawnTriaInput{{{*/ Input* ControlInput::SpawnTriaInput(int location){ @@ -196,9 +192,4 @@ Input* ControlInput::SpawnSegInput(int index1,int index2){ return values->SpawnSegInput(index1,index2); -}/*}}}*/ -/*FUNCTION ControlInput::SpawnGradient{{{*/ -ElementResult* ControlInput::SpawnGradient(int step, IssmDouble time){ - _assert_(gradient); - return gradient->SpawnResult(step,time); }/*}}}*/ /*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist){{{*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h (revision 16486) @@ -43,5 +43,4 @@ Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; - ElementResult* SpawnResult(int step, IssmDouble time); void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); @@ -91,5 +90,4 @@ void GetVectorFromInputs(Vector* vector,int* doflist,const char* data); void GetVectorFromInputs(Vector* vector,int* doflist); - ElementResult* SpawnGradient(int step, IssmDouble time); int GetResultInterpolation(void); void GetGradient(Vector* gradient_vec,int* doflist); Index: /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 16486) @@ -41,5 +41,4 @@ Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; - ElementResult* SpawnResult(int step, IssmDouble time){_error_("not implemented yet");}; void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); @@ -85,5 +84,4 @@ void VerticallyIntegrate(Input* thickness_input){_error_("not implemented yet");}; void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");}; - ElementResult* SpawnGradient(int step, IssmDouble time){_error_("not implemented yet");}; int GetResultInterpolation(void){_error_("not implemented yet");}; void GetGradient(Vector* gradient_vec,int* doflist){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp (revision 16486) @@ -101,11 +101,4 @@ } /*}}}*/ -/*FUNCTION DoubleInput::SpawnResult{{{*/ -ElementResult* DoubleInput::SpawnResult(int step, IssmDouble time){ - - return new DoubleElementResult(this->enum_type,this->value,step,time); - -} -/*}}}*/ /*Object functions*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h (revision 16486) @@ -38,5 +38,4 @@ Input* PointwiseMin(Input* inputB); Input* PointwiseMax(Input* inputB); - ElementResult* SpawnResult(int step, IssmDouble time); int GetResultInterpolation(void){return P0Enum;}; void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; Index: /issm/trunk-jpl/src/c/classes/Inputs/Input.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/Input.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/Input.h (revision 16486) @@ -11,5 +11,4 @@ #include "../../shared/shared.h" class Node; -class ElementResult; class GaussTria; class GaussSeg; @@ -72,5 +71,4 @@ virtual Input* PointwiseMax(Input* inputmax)=0; virtual Input* PointwiseMin(Input* inputmin)=0; - virtual ElementResult* SpawnResult(int step, IssmDouble time)=0; virtual int GetResultInterpolation(void)=0; }; Index: /issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp (revision 16486) @@ -99,11 +99,4 @@ } /*}}}*/ -/*FUNCTION IntInput::SpawnResult{{{*/ -ElementResult* IntInput::SpawnResult(int step, IssmDouble time){ - - _error_("not supported yet!"); - -} -/*}}}*/ /*Object functions*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/IntInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/IntInput.h (revision 16486) @@ -39,5 +39,4 @@ Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; - ElementResult* SpawnResult(int step, IssmDouble time); int GetResultInterpolation(void){return P0Enum;}; void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; Index: /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 16486) @@ -130,11 +130,4 @@ } /*}}}*/ -/*FUNCTION PentaInput::SpawnResult{{{*/ -ElementResult* PentaInput::SpawnResult(int step, IssmDouble time){ - - return new PentaP1ElementResult(this->enum_type,this->values,step,time); - -} -/*}}}*/ /*FUNCTION PentaInput::GetResultInterpolation{{{*/ int PentaInput::GetResultInterpolation(void){ Index: /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h (revision 16486) @@ -39,5 +39,4 @@ Input* PointwiseMin(Input* inputB); Input* PointwiseMax(Input* inputB); - ElementResult* SpawnResult(int step, IssmDouble time); int GetResultInterpolation(void); void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; Index: /issm/trunk-jpl/src/c/classes/Inputs/SegInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/SegInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/SegInput.h (revision 16486) @@ -39,5 +39,4 @@ Input* PointwiseMin(Input* inputB){_error_("not supported yet");}; Input* PointwiseMax(Input* inputB){_error_("not supported yet");}; - ElementResult* SpawnResult(int step, IssmDouble time){_error_("not supported yet");}; int GetResultInterpolation(void){_error_("not implemented");}; void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; Index: /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 16486) @@ -145,20 +145,4 @@ return outinput; -} -/*}}}*/ -/*FUNCTION TransientInput::SpawnResult{{{*/ -ElementResult* TransientInput::SpawnResult(int step, IssmDouble time){ - - ElementResult* elementresult=NULL; - - /*Ok, we want to spawn an ElementResult. We have the time, just get - *the correct values: */ - Input* input=GetTimeInput(time); - - elementresult=input->SpawnResult(step,time); - - delete input; - - return elementresult; } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h (revision 16486) @@ -43,5 +43,4 @@ Input* PointwiseMin(Input* forcingB){_error_("not implemented yet");}; Input* PointwiseMax(Input* forcingB){_error_("not implemented yet");}; - ElementResult* SpawnResult(int step, IssmDouble time); int GetResultInterpolation(void); void Configure(Parameters* parameters); Index: /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 16486) @@ -117,11 +117,4 @@ } /*}}}*/ -/*FUNCTION TriaInput::SpawnResult{{{*/ -ElementResult* TriaInput::SpawnResult(int step, IssmDouble time){ - - return new TriaP1ElementResult(this->enum_type,this->values,step,time); - -} -/*}}}*/ /*FUNCTION TriaInput::GetResultInterpolation{{{*/ int TriaInput::GetResultInterpolation(void){ Index: /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.h (revision 16486) @@ -39,5 +39,4 @@ Input* PointwiseMin(Input* inputB); Input* PointwiseMax(Input* inputB); - ElementResult* SpawnResult(int step, IssmDouble time); int GetResultInterpolation(void); void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; Index: /issm/trunk-jpl/src/c/classes/classes.h =================================================================== --- /issm/trunk-jpl/src/c/classes/classes.h (revision 16485) +++ /issm/trunk-jpl/src/c/classes/classes.h (revision 16486) @@ -65,11 +65,4 @@ #include "./Inputs/TransientInput.h" -/*ElementResults: */ -#include "./ElementResults/ElementResult.h" -#include "./ElementResults/DoubleElementResult.h" -#include "./ElementResults/TriaP1ElementResult.h" -#include "./ElementResults/PentaP1ElementResult.h" -#include "./ElementResults/BoolElementResult.h" - /*ExternalResults: */ #include "./ExternalResults/Results.h" Index: /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 16486) @@ -36,8 +36,4 @@ return; } - - /*We have results inside our elements, loads, etc ... Get them out of there, into the results dataset: */ - elements->ToResults(results,parameters); - elements->DeleteResults(); /*Results do not include the type of solution being run . In parallel, we output results to a filename, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16485) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16486) @@ -376,5 +376,4 @@ DoubleVecParamEnum, ElementEnum, - ElementResultEnum, ExternalResultEnum, FileParamEnum, @@ -532,16 +531,12 @@ /*Results{{{*/ SaveResultsEnum, - BoolElementResultEnum, BoolExternalResultEnum, - DoubleElementResultEnum, DoubleExternalResultEnum, DoubleMatExternalResultEnum, IntExternalResultEnum, JEnum, - PentaP1ElementResultEnum, StringExternalResultEnum, StepEnum, TimeEnum, - TriaP1ElementResultEnum, WaterColumnOldEnum, /*}}}*/ Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16486) @@ -376,5 +376,4 @@ case DoubleVecParamEnum : return "DoubleVecParam"; case ElementEnum : return "Element"; - case ElementResultEnum : return "ElementResult"; case ExternalResultEnum : return "ExternalResult"; case FileParamEnum : return "FileParam"; @@ -522,16 +521,12 @@ case TaylorHoodEnum : return "TaylorHood"; case SaveResultsEnum : return "SaveResults"; - case BoolElementResultEnum : return "BoolElementResult"; case BoolExternalResultEnum : return "BoolExternalResult"; - case DoubleElementResultEnum : return "DoubleElementResult"; case DoubleExternalResultEnum : return "DoubleExternalResult"; case DoubleMatExternalResultEnum : return "DoubleMatExternalResult"; case IntExternalResultEnum : return "IntExternalResult"; case JEnum : return "J"; - case PentaP1ElementResultEnum : return "PentaP1ElementResult"; case StringExternalResultEnum : return "StringExternalResult"; case StepEnum : return "Step"; case TimeEnum : return "Time"; - case TriaP1ElementResultEnum : return "TriaP1ElementResult"; case WaterColumnOldEnum : return "WaterColumnOld"; case OutputdefinitionEnum : return "Outputdefinition"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16485) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16486) @@ -382,10 +382,9 @@ else if (strcmp(name,"DoubleVecParam")==0) return DoubleVecParamEnum; else if (strcmp(name,"Element")==0) return ElementEnum; - else if (strcmp(name,"ElementResult")==0) return ElementResultEnum; + else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum; - else if (strcmp(name,"FileParam")==0) return FileParamEnum; + if (strcmp(name,"FileParam")==0) return FileParamEnum; else if (strcmp(name,"Input")==0) return InputEnum; else if (strcmp(name,"IntInput")==0) return IntInputEnum; @@ -506,9 +505,9 @@ else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; else if (strcmp(name,"HydrologyWaterVx")==0) return HydrologyWaterVxEnum; + else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum; - else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; + if (strcmp(name,"StressTensor")==0) return StressTensorEnum; else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; @@ -534,16 +533,12 @@ else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum; else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; - else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum; else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; - else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum; else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum; else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum; else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum; else if (strcmp(name,"J")==0) return JEnum; - else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; else if (strcmp(name,"Step")==0) return StepEnum; else if (strcmp(name,"Time")==0) return TimeEnum; - else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;