Index: /issm/trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 10989) @@ -164,5 +164,5 @@ /*}}}*/ /*FUNCTION Elements::ToResults{{{1*/ -void Elements::ToResults(Results* results,Parameters* parameters,int step, double time){ +void Elements::ToResults(Results* results,Parameters* parameters){ extern int my_rank; @@ -170,10 +170,13 @@ Patch *patch = NULL; int *resultsenums = NULL; + int *resultssize = NULL; + int *resultsstep = NULL; + double *resultstimes = NULL; double *vector_serial= NULL; Vec vector = NULL; bool io_gather; bool results_as_patches; - int numberofvertices; - int numberofresults; + int numberofvertices,numberofelements; + int numberofresults,vectorsize; /*Recover parameters: */ @@ -181,4 +184,5 @@ parameters->FindParam(&results_as_patches,SettingsResultsAsPatchesEnum); parameters->FindParam(&numberofvertices,MeshNumberofverticesEnum); + parameters->FindParam(&numberofelements,MeshNumberofelementsEnum); if(!results_as_patches){ @@ -187,5 +191,5 @@ /*OK, see what the first element of this partition has in stock (this is common to all partitions)*/ Element* element=(Element*)this->GetObjectByOffset(0); - element->ListResultsEnums(&resultsenums,&numberofresults); + element->ListResultsInfo(&resultsenums,&resultssize,&resultstimes,&resultsstep,&numberofresults); /*Loop over all results and get nodal vector*/ @@ -193,8 +197,12 @@ /*Get vector for result number i*/ - vector=NewVec(numberofvertices); + if(resultssize[i]==P1Enum) vectorsize=numberofvertices; + else if(resultssize[i]==P0Enum) vectorsize=numberofelements; + else _error_("Unkown result size: %s",EnumToStringx(resultssize[i])); + vector=NewVec(vectorsize); + for(int j=0;jSize();j++){ Element* element=(Element*)this->GetObjectByOffset(j); - element->GetVectorFromResults(vector,resultsenums[i]); + element->GetVectorFromResults(vector,i); } VecAssemblyBegin(vector); @@ -205,5 +213,5 @@ if(my_rank==0){ /*No need to add this vector for all cpus*/ - results->AddObject(new DoubleVecExternalResult(results->Size()+1,resultsenums[i],vector_serial,numberofvertices,step,time)); + results->AddObject(new DoubleVecExternalResult(results->Size()+1,resultsenums[i],vector_serial,vectorsize,resultsstep[i],resultstimes[i])); } @@ -224,7 +232,7 @@ /*create result object and add to results dataset:*/ if (patch->maxvertices && patch->maxnodes){ - results->AddObject(new IntExternalResult(results->Size()+1,PatchVerticesEnum,patch->maxvertices,step,time)); - results->AddObject(new IntExternalResult(results->Size()+1,PatchNodesEnum, patch->maxnodes,step,time)); - results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum,patch->values,patch->numrows,patch->numcols,step,time)); + results->AddObject(new IntExternalResult(results->Size()+1,PatchVerticesEnum,patch->maxvertices,1,0)); + results->AddObject(new IntExternalResult(results->Size()+1,PatchNodesEnum, patch->maxnodes,1,0)); + results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum, patch->values,patch->numrows,patch->numcols,1,0)); } } @@ -232,4 +240,7 @@ /*Free ressources:*/ xfree((void**)&resultsenums); + xfree((void**)&resultssize); + xfree((void**)&resultstimes); + xfree((void**)&resultsstep); delete patch; } Index: /issm/trunk-jpl/src/c/Container/Elements.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.h (revision 10988) +++ /issm/trunk-jpl/src/c/Container/Elements.h (revision 10989) @@ -30,5 +30,5 @@ void ProcessResultsUnits(void); void SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); - void ToResults(Results* results,Parameters* parameters,int step, double time); + void ToResults(Results* results,Parameters* parameters); Patch* ResultsToPatch(void); int NumberOfElements(void); Index: /issm/trunk-jpl/src/c/Container/Results.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Results.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/Container/Results.cpp (revision 10989) @@ -136,5 +136,5 @@ /*Fill each field: */ - for(i=0;iSize();i++){ //do not include the last one used for time ExternalResult* result=(ExternalResult*)this->GetObjectByOffset(i); result->SetMatlabField(dataref); Index: /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 10989) @@ -17,7 +17,7 @@ #ifdef _SERIAL_ -void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults, int step, double time){ +void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults){ #else -void OutputResultsx( Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults, int step, double time){ +void OutputResultsx( Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults){ #endif @@ -54,5 +54,5 @@ /*We have results inside our elements, loads, etc ... Get them out of there, into the results dataset: */ elements->ProcessResultsUnits(); - elements->ToResults(results,parameters,step,time); + elements->ToResults(results,parameters); elements->DeleteResults(); Index: /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.h (revision 10988) +++ /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.h (revision 10989) @@ -16,7 +16,7 @@ #ifdef _SERIAL_ #include -void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, Results** presults,int step=1,double time=0); +void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, Results** presults); #else -void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, Results** presults,int step=1,double time=0); +void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, Results** presults); #endif Index: /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h (revision 10989) @@ -45,4 +45,6 @@ /*ElementResult virtual functions definitions: {{{1*/ ElementResult* SpawnTriaElementResult(int* indices); + double GetTime(void){return time;}; + int GetStep(void){return step;}; void ProcessUnits(Parameters* parameters); int NumberOfNodalValues(void); Index: /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 10989) @@ -45,4 +45,6 @@ /*ElementResult virtual functions definitions: {{{1*/ ElementResult* SpawnTriaElementResult(int* indices); + double GetTime(void){return time;}; + int GetStep(void){return step;}; void ProcessUnits(Parameters* parameters); int NumberOfNodalValues(void); Index: /issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h (revision 10989) @@ -19,4 +19,6 @@ virtual ElementResult* SpawnTriaElementResult(int* indices)=0; + virtual double GetTime(void)=0; + virtual int GetStep(void)=0; virtual void ProcessUnits(Parameters* parameters)=0; virtual int NumberOfNodalValues(void)=0; Index: /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 10989) @@ -44,4 +44,6 @@ /*ElementResult virtual functions definitions: {{{1*/ ElementResult* SpawnTriaElementResult(int* indices); + double GetTime(void){return time;}; + int GetStep(void){return step;}; void ProcessUnits(Parameters* parameters); int NumberOfNodalValues(void); Index: /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 10989) @@ -43,4 +43,6 @@ /*ElementResult virtual functions definitions: {{{1*/ ElementResult* SpawnTriaElementResult(int* indices); + double GetTime(void){return time;}; + int GetStep(void){return step;}; void ProcessUnits(Parameters* parameters); int NumberOfNodalValues(void); Index: /issm/trunk-jpl/src/c/objects/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Element.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/Elements/Element.h (revision 10989) @@ -47,5 +47,5 @@ virtual void PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes)=0; virtual void PatchFill(int* pcount, Patch* patch)=0; - virtual void ListResultsEnums(int** results_enums,int* num_results)=0; + virtual void ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results)=0; virtual void DeleteResults(void)=0; virtual void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type)=0; @@ -59,5 +59,5 @@ virtual void InputScale(int enum_type,double scale_factor)=0; virtual void GetVectorFromInputs(Vec vector, int name_enum)=0; - virtual void GetVectorFromResults(Vec vector,int name_enum)=0; + virtual void GetVectorFromResults(Vec vector,int id)=0; virtual void InputArtificialNoise(int enum_type,double min,double max)=0; virtual bool InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0; Index: /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 10989) @@ -1139,5 +1139,5 @@ /*}}}*/ /*FUNCTION Penta::GetVectorFromResults{{{1*/ -void Penta::GetVectorFromResults(Vec vector,int result_enum){ +void Penta::GetVectorFromResults(Vec vector,int offset){ int doflist1[NUMVERTICES]; @@ -1146,13 +1146,7 @@ this->GetSidList(&doflist1[0]); - /*Get result)*/ - for(int i=0;iresults->Size();i++){ - ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - if(elementresult->InstanceEnum()!=result_enum) continue; - elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); - return; - } - - _error_("Result %s not found in element",EnumToStringx(result_enum)); + /*Get result*/ + ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); + elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); } /*}}}*/ @@ -2057,6 +2051,6 @@ } /*}}}*/ -/*FUNCTION Penta::ListResultsEnums{{{*/ -void Penta::ListResultsEnums(int** in_results_enums,int* in_num_results){ +/*FUNCTION Penta::ListResultsInfo{{{*/ +void Penta::ListResultsInfo(int** in_resultsenums,int** in_resultssizes,double** in_resultstimes,int** in_resultssteps,int* in_num_results){ /*Intermediaries*/ @@ -2064,4 +2058,7 @@ int numberofresults = 0; int *resultsenums = NULL; + int *resultssizes = NULL; + double *resultstimes = NULL; + int *resultssteps = NULL; /*Checks*/ @@ -2078,4 +2075,7 @@ /*Allocate output*/ resultsenums=(int*)xmalloc(numberofresults*sizeof(int)); + resultssizes=(int*)xmalloc(numberofresults*sizeof(int)); + resultstimes=(double*)xmalloc(numberofresults*sizeof(double)); + resultssteps=(int*)xmalloc(numberofresults*sizeof(int)); /*populate enums*/ @@ -2083,4 +2083,12 @@ ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); resultsenums[i]=elementresult->InstanceEnum(); + resultstimes[i]=elementresult->GetTime(); + resultssteps[i]=elementresult->GetStep(); + if(elementresult->ObjectEnum()==PentaVertexElementResultEnum){ + resultssizes[i]=P1Enum; + } + else{ + resultssizes[i]=P0Enum; + } } } @@ -2088,5 +2096,8 @@ /*Assign output pointers:*/ *in_num_results=numberofresults; - *in_results_enums=resultsenums; + *in_resultsenums=resultsenums; + *in_resultssizes=resultssizes; + *in_resultstimes=resultstimes; + *in_resultssteps=resultssteps; }/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Penta.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/Elements/Penta.h (revision 10989) @@ -92,5 +92,5 @@ double GetZcoord(GaussPenta* gauss); void GetVectorFromInputs(Vec vector,int name_enum); - void GetVectorFromResults(Vec vector,int name_enum); + void GetVectorFromResults(Vec vector,int offset); int Sid(); @@ -107,5 +107,5 @@ void PotentialSheetUngrounding(Vec potential_sheet_ungrounding); void RequestedOutput(int output_enum,int step,double time); - void ListResultsEnums(int** results_enums,int* num_results); + void ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results); void PatchFill(int* pcount, Patch* patch); void PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes); Index: /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 10989) @@ -1254,7 +1254,6 @@ /*}}}*/ /*FUNCTION Tria::GetVectorFromResults{{{1*/ -void Tria::GetVectorFromResults(Vec vector,int result_enum){ - - bool found=false; +void Tria::GetVectorFromResults(Vec vector,int offset){ + int doflist1[NUMVERTICES]; @@ -1262,13 +1261,7 @@ this->GetSidList(&doflist1[0]); - /*Get result)*/ - for(int i=0;iresults->Size();i++){ - ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - if(elementresult->InstanceEnum()!=result_enum) continue; - elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); - return; - } - - _error_("Result %s not found in element",EnumToStringx(result_enum)); + /*Get result*/ + ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset); + elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); } /*}}}*/ @@ -1897,6 +1890,6 @@ } /*}}}*/ -/*FUNCTION Tria::ListResultsEnums{{{*/ -void Tria::ListResultsEnums(int** in_results_enums,int* in_num_results){ +/*FUNCTION Tria::ListResultsInfo{{{*/ +void Tria::ListResultsInfo(int** in_resultsenums,int** in_resultssizes,double** in_resultstimes,int** in_resultssteps,int* in_num_results){ /*Intermediaries*/ @@ -1904,4 +1897,7 @@ int numberofresults = 0; int *resultsenums = NULL; + int *resultssizes = NULL; + double *resultstimes = NULL; + int *resultssteps = NULL; /*Checks*/ @@ -1918,4 +1914,7 @@ /*Allocate output*/ resultsenums=(int*)xmalloc(numberofresults*sizeof(int)); + resultssizes=(int*)xmalloc(numberofresults*sizeof(int)); + resultstimes=(double*)xmalloc(numberofresults*sizeof(double)); + resultssteps=(int*)xmalloc(numberofresults*sizeof(int)); /*populate enums*/ @@ -1923,4 +1922,12 @@ ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); resultsenums[i]=elementresult->InstanceEnum(); + resultstimes[i]=elementresult->GetTime(); + resultssteps[i]=elementresult->GetStep(); + if(elementresult->ObjectEnum()==TriaVertexElementResultEnum){ + resultssizes[i]=P1Enum; + } + else{ + resultssizes[i]=P0Enum; + } } } @@ -1928,5 +1935,8 @@ /*Assign output pointers:*/ *in_num_results=numberofresults; - *in_results_enums=resultsenums; + *in_resultsenums=resultsenums; + *in_resultssizes=resultssizes; + *in_resultstimes=resultstimes; + *in_resultssteps=resultssteps; }/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Tria.h (revision 10988) +++ /issm/trunk-jpl/src/c/objects/Elements/Tria.h (revision 10989) @@ -92,5 +92,5 @@ void GetSolutionFromInputs(Vec solution); void GetVectorFromInputs(Vec vector, int name_enum); - void GetVectorFromResults(Vec vector,int name_enum); + void GetVectorFromResults(Vec vector,int offset); void InputArtificialNoise(int enum_type,double min, double max); bool InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums); @@ -106,5 +106,5 @@ void PotentialSheetUngrounding(Vec potential_sheet_ungrounding); void RequestedOutput(int output_enum,int step,double time); - void ListResultsEnums(int** results_enums,int* num_results); + void ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results); void PatchFill(int* pcount, Patch* patch); void PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 10989) @@ -209,8 +209,8 @@ void DoubleVecExternalResult::SetMatlabField(mxArray* dataref){ - mxArray* pfield=NULL; - double* doublemat=NULL; - char* name=NULL; - double* doublevec=NULL; + mxArray *pfield = NULL; + double *doublemat = NULL; + char *name = NULL; + double *doublevec = NULL; /*Make a copy of the value, to be used by matlab: */ @@ -230,5 +230,4 @@ mxSetField( dataref, this->step-1, "time",mxCreateDoubleScalar((double)this->time)); mxSetField( dataref, this->step-1, "step",mxCreateDoubleScalar((double)this->step)); - } #endif Index: /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 10989) @@ -61,5 +61,5 @@ /*unload results*/ _printf_(VerboseSolution()," saving temporary results\n"); - OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results,i+1,time); + OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results); } Index: /issm/trunk-jpl/src/c/solutions/thermal_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/thermal_core.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/solutions/thermal_core.cpp (revision 10989) @@ -60,8 +60,4 @@ InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i+1,time); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,i+1,time); - - /*unload results*/ - _printf_(VerboseSolution()," saving temporary results\n"); - OutputResultsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,&femmodel->results,i+1,time); } Index: /issm/trunk-jpl/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 10988) +++ /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 10989) @@ -141,5 +141,5 @@ /*unload results*/ _printf_(VerboseSolution()," saving temporary results\n"); - OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results,step,time); + OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results); } }