Changeset 4182

Timestamp:

06/23/10 17:50:28 (15 years ago)

Author:

Eric.Larour

Message:

Added OutputResults module.
OutputResultsx now outputs time and step for results.
serial solutions updated to get results from OutputResults module.

Location:

issm/trunk/src

Files:

• c/DataSet/DataSet.cpp (modified) (2 diffs)
• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/OutputResultsx/MatlabWriteResults.cpp (modified) (1 diff)
• c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• c/modules/OutputResultsx/OutputResultsx.h (modified) (1 diff)
• c/objects/ExternalResults/BoolExternalResult.cpp (modified) (1 diff)
• c/objects/ExternalResults/BoolExternalResult.h (modified) (1 diff)
• c/objects/ExternalResults/DoubleExternalResult.cpp (modified) (1 diff)
• c/objects/ExternalResults/DoubleExternalResult.h (modified) (1 diff)
• c/objects/ExternalResults/DoubleMatExternalResult.cpp (modified) (1 diff)
• c/objects/ExternalResults/DoubleMatExternalResult.h (modified) (1 diff)
• c/objects/ExternalResults/DoubleVecExternalResult.cpp (modified) (1 diff)
• c/objects/ExternalResults/DoubleVecExternalResult.h (modified) (1 diff)
• c/objects/ExternalResults/ExternalResult.h (modified) (1 diff)
• c/objects/ExternalResults/IntExternalResult.cpp (modified) (1 diff)
• c/objects/ExternalResults/IntExternalResult.h (modified) (1 diff)
• c/objects/ExternalResults/PetscVecExternalResult.cpp (modified) (1 diff)
• c/objects/ExternalResults/PetscVecExternalResult.h (modified) (1 diff)
• c/objects/ExternalResults/StringExternalResult.cpp (modified) (1 diff)
• c/objects/ExternalResults/StringExternalResult.h (modified) (1 diff)
• m/solutions/bedslope.m (modified) (1 diff)
• m/solutions/control_core.m (modified) (1 diff)
• m/solutions/controlrestart.m (deleted)
• m/solutions/diagnostic.m (modified) (1 diff)
• m/solutions/prognostic.m (modified) (1 diff)
• m/solutions/prognostic2.m (modified) (1 diff)
• m/solutions/steadystate.m (modified) (1 diff)
• m/solutions/surfaceslope.m (modified) (1 diff)
• m/solutions/thermal.m (modified) (1 diff)
• m/solutions/transient2d.m (modified) (1 diff)
• m/solutions/transient3d.m (modified) (1 diff)
• m/solutions/transient3d_core.m (modified) (1 diff)
• mex/Makefile.am (modified) (2 diffs)
• mex/OutputResults (added)
• mex/OutputResults/OutputResults.cpp (added)
• mex/OutputResults/OutputResults.h (added)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -486 +486 @@
         /*Go through a dataset, and for each object, report it cpu: */
 
+        int i;
         int rank;
         int sid;
-        vector<Object*>::iterator object;
-        DofObject* dofobject=NULL;
-
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                /*Ok, this object is a node, ask which rank it has: */
-                rank=(*object)->MyRank();
-
-                /*Which id does it have: */
-                dofobject=dynamic_cast<DofObject*>(*object);
-                sid=dofobject->Sid();
-
+        
+        for(i=0;i<this->Size();i++){
+                Object* object=(Object*)this->GetObjectByOffset(i);
+                rank=object->MyRank();
+
+                if (object->Enum()==NodeEnum){
+                        Node* node=(Node*)object;
+                        sid=node->Sid();
+                }
+                if (object->Enum()==VertexEnum){
+                        Vertex* vertex=(Vertex*)object;
+                        sid=vertex->Sid();
+                }
                 /*Plug rank into ranks, according to id: */
                 ranks[sid]=rank; 
@@ -914 +916 @@
         MPI_Bcast(&node_max_sid,1,MPI_INT,0,MPI_COMM_WORLD);
         max_sid=node_max_sid;
-        #endif
+        #endif 
 
         /*sid starts at 0*/

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -264 +264 @@
         JEnum,
         PatchEnum,
+        TimeEnum,
         /*}}}*/
         /*Convergence{{{1*/

issm/trunk/src/c/modules/OutputResultsx/MatlabWriteResults.cpp

@@ -19 +19 @@
 void  MatlabWriteResults(mxArray** pdataref, Parameters* parameters, DataSet* results){
 
-        int i;
+        int i,j;
+        int count;
 
         /*output: */
         mxArray* dataref=NULL;
         mwSize nfields;
+        mwSize maxfields;
+        mwSize nsteps;
+        mwSize step;
         const   char**  fnames=NULL;
+        int*    enums=NULL;
+        int     baseenum;
         mwSize          onebyone[2] = {1,1};
         mwSize          ndim=2;
 
-        /*How many results? : */
-        nfields=(mwSize)results->Size();
-
-        /*recover names: */
-        fnames=(const char**)xmalloc(nfields*sizeof(char*));
+        /*How many time steps do we have? : */
+        nsteps=0;
         for(i=0;i<nfields;i++){
                 ExternalResult* result=(ExternalResult*)results->GetObjectByOffset(i);
-                fnames[i]=result->GetResultName();
+                step=result->GetStep();
+                if(step>nsteps)nsteps=step;
         }
+        onebyone[0]=nsteps;
+
+        /*How many field names do we have. First, figure out how many result types we have: */
+        maxfields=(mwSize)results->Size();
+        enums=(int*)xmalloc(maxfields*sizeof(int));
+        for(i=0;i<maxfields;i++){
+                ExternalResult* result=(ExternalResult*)results->GetObjectByOffset(i);
+                enums[i]=result->EnumType();
+        }
+        /*Now, make result types unique: */
+        for(i=0;i<maxfields;i++){
+                if(enums[i]>=0){//if <0, it means this enum was found to replicate another one previously
+                        baseenum=enums[i];              
+                        /*is the baseenum repeated later on?:*/
+                        for(j=i+1;j<maxfields;j++){
+                                if (enums[j]==baseenum)enums[j]=-1;
+                        }
+                }
+                else continue;
+        }
+
+        /*Now, go through enums, and whatever is not null is a non repeated field name: */
+        nfields=0;
+        for(i=0;i<maxfields;i++)if(enums[i]>0)nfields++;
+
+        /*Add 1 field for time: */
+        nfields++;
+        
+        /*Fill the names of the structure field: */
+        fnames=(const char**)xmalloc(nfields*sizeof(char*));
+        count=0;
+        for(i=0;i<maxfields;i++){
+                if (enums[i]>0){
+                        fnames[count]=EnumAsString(enums[i]);
+                        count++;
+                }
+        }
+        /*don't forget the extra field "time":*/
+        fnames[nfields-1]=EnumAsString(TimeEnum);
 
         /*Initialize structure: */

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -45 +45 @@
         #endif
 }
-
-

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h

@@ -3 +3 @@
  */ 
 
-#ifndef _OUTPUTRESULTS_H
-#define _OUTPUTRESULTS_H
+#ifndef _OUTPUTRESULTSX_H
+#define _OUTPUTRESULTSX_H
 
 #ifdef HAVE_CONFIG_H

issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp

@@ -188 +188 @@
         char* name=NULL;
         name=this->GetResultName();
-        mxSetField( dataref, 0, name,mxCreateDoubleScalar((double)value));
+        
+        mxSetField( dataref, this->step-1, name,mxCreateDoubleScalar((double)value));
+        mxSetField( dataref, this->step-1, EnumAsString(TimeEnum),mxCreateDoubleScalar((double)this->time));
 }
 #endif
 /*}}}*/
+/*FUNCTION BoolExternalResult::GetStep(void);{{{1*/
+int BoolExternalResult::GetStep(void){
+
+        return this->step;
+}
+/*}}}*/

issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h

@@ -70 +70 @@
                 void  SetMatlabField(mxArray* dataref);
                 #endif
+                int   GetStep(void);
                 /*}}}*/
 };

issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp

@@ -184 +184 @@
         char* name=NULL;
         name=this->GetResultName();
-        mxSetField( dataref, 0, name,mxCreateDoubleScalar(value));
+        mxSetField( dataref,this->step-1, name,mxCreateDoubleScalar(value));
+        mxSetField( dataref,this->step-1, EnumAsString(TimeEnum),mxCreateDoubleScalar((double)this->time));
+
 }
 #endif
 /*}}}*/
+/*FUNCTION DoubleExternalResult::GetStep(void);{{{1*/
+int DoubleExternalResult::GetStep(void){
+
+        return this->step;
+}
+/*}}}*/

issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h

@@ -70 +70 @@
                 void  SetMatlabField(mxArray* dataref);
                 #endif
+                int   GetStep(void);
                 /*}}}*/
 };

issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

@@ -231 +231 @@
 
         /*set tranpose matrix inside the dataref structure: */
-        mxSetField( dataref, 0, name,pfield2);
+        mxSetField( dataref, this->step-1, name,pfield2);
+        mxSetField( dataref, this->step-1, EnumAsString(TimeEnum),mxCreateDoubleScalar((double)this->time));
+
+
+
 }
 #endif
 /*}}}*/
+/*FUNCTION DoubleMatExternalResult::GetStep(void);{{{1*/
+int DoubleMatExternalResult::GetStep(void){
+
+        return this->step;
+}
+/*}}}*/

issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.h

@@ -70 +70 @@
                 void  SetMatlabField(mxArray* dataref);
                 #endif
+                int   GetStep(void);
                 /*}}}*/
 };

issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

@@ -222 +222 @@
         mxSetN(pfield,1);
         mxSetPr(pfield,doublevec);
-        mxSetField( dataref, 0, name,pfield);
+
+        mxSetField( dataref, this->step-1, name,pfield);
+        mxSetField( dataref, this->step-1, EnumAsString(TimeEnum),mxCreateDoubleScalar((double)this->time));
+
 
 }
 #endif
 /*}}}*/
+/*FUNCTION DoubleVecExternalResult::GetStep(void);{{{1*/
+int DoubleVecExternalResult::GetStep(void){
+
+        return this->step;
+}
+/*}}}*/

issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h

@@ -69 +69 @@
                 void  SetMatlabField(mxArray* dataref);
                 #endif
+                int   GetStep(void);
                 /*}}}*/
 };

issm/trunk/src/c/objects/ExternalResults/ExternalResult.h

@@ -37 +37 @@
                 virtual void  SetMatlabField(mxArray* dataref)=0;
                 #endif
+                virtual int   GetStep(void)=0;
                 /*}}}*/
 };

issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp

@@ -188 +188 @@
         char* name=NULL;
         name=this->GetResultName();
-        mxSetField( dataref, 0, name,mxCreateDoubleScalar(value));
+
+        mxSetField( dataref, this->step-1, name,mxCreateDoubleScalar(value));
+        mxSetField( dataref, this->step-1, EnumAsString(TimeEnum),mxCreateDoubleScalar((double)this->time));
+
 }
 #endif
 /*}}}*/
+/*FUNCTION IntExternalResult::GetStep(void);{{{1*/
+int IntExternalResult::GetStep(void){
+
+        return this->step;
+}
+/*}}}*/

issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h

@@ -70 +70 @@
                 void  SetMatlabField(mxArray* dataref);
                 #endif
+                int   GetStep(void);
                 /*}}}*/
 };

issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp

@@ -256 +256 @@
         mxSetPr(pfield,doublevec);
         
-        mxSetField( dataref, 0, name, pfield);
+        mxSetField( dataref, this->step-1, name, pfield);
+        mxSetField( dataref, this->step-1, EnumAsString(TimeEnum),mxCreateDoubleScalar((double)this->time));
+
 }
 #endif
 /*}}}*/
+/*FUNCTION PetscVecExternalResult::GetStep(void);{{{1*/
+int PetscVecExternalResult::GetStep(void){
+
+        return this->step;
+}
+/*}}}*/

issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h

@@ -68 +68 @@
                 void  SetMatlabField(mxArray* dataref);
                 #endif
+                int   GetStep(void);
                 /*}}}*/
 };

issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp

@@ -200 +200 @@
 
         name=this->GetResultName();
-        mxSetField( dataref, 0, name, mxCreateString(value));
+
+        mxSetField( dataref, this->step-1, name, mxCreateString(value));
+        mxSetField( dataref, this->step-1, EnumAsString(TimeEnum),mxCreateDoubleScalar((double)this->time));
+
 }
 #endif
 /*}}}*/
+/*FUNCTION StringExternalResult::GetStep(void);{{{1*/
+int StringExternalResult::GetStep(void){
+
+        return this->step;
+}
+/*}}}*/

issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h

@@ -69 +69 @@
                 void  SetMatlabField(mxArray* dataref);
                 #endif
+                int   GetStep(void);
                 /*}}}*/
 };

issm/trunk/src/m/solutions/bedslope.m

@@ -24 +24 @@
         
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.bedslopecompute=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
 
         else

issm/trunk/src/m/solutions/control_core.m

@@ -74 +74 @@
         end
 
-        %Temporary saving every five iterations
-        if mod(n+1,5)==0;
-                displaystring(verbose,'\n%s',['      saving temporary results...']);
-                controlrestart(femmmodel,J);
-        end
-
 end
 

issm/trunk/src/m/solutions/diagnostic.m

@@ -34 +34 @@
                 
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.diagnostic=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
 
         else

issm/trunk/src/m/solutions/prognostic.m

@@ -25 +25 @@
 
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.prognostic=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
         else
                 %launch dakota driver for diagnostic core solution

issm/trunk/src/m/solutions/prognostic2.m

@@ -24 +24 @@
 
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.prognostic2=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
         else
                 %launch dakota driver for diagnostic core solution

issm/trunk/src/m/solutions/steadystate.m

@@ -35 +35 @@
 
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.steadystate=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
 
         else

issm/trunk/src/m/solutions/surfaceslope.m

@@ -24 +24 @@
         
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.surfaceslopecompute=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
 
         else

issm/trunk/src/m/solutions/thermal.m

@@ -24 +24 @@
 
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.thermal=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
         else
                 %launch dakota driver for diagnostic core solution

issm/trunk/src/m/solutions/transient2d.m

@@ -23 +23 @@
                 
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.transient2d=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
 
         else

issm/trunk/src/m/solutions/transient3d.m

@@ -22 +22 @@
                 
                 displaystring(verbose,'%s',['write results']);
-                OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
+                md.results.transient3d=OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
 
         else

issm/trunk/src/m/solutions/transient3d_core.m

@@ -50 +50 @@
                 femmodel.elements=InputToResult(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingEnum,step,time);
 
-                %Save temporary results
-                if mod(step,5)==0,
-                        displaystring(verbose,'\n%s',['saving temporary results...']);
-                        OutputResults(femmodel.elements, femmodel.loads, femmodel.nodes, femmodel.vertices, femmodel.materials, femmodel.parameters);
-                end
         end
 

issm/trunk/src/mex/Makefile.am

@@ -43 +43 @@
                                 Orth\
                                 OutputRifts\
+                                OutputResults\
                                 PenaltyConstraints\
                                 PenaltySystemMatrices\
@@ -208 +209 @@
                           OutputRifts/OutputRifts.h
 
+OutputResults_SOURCES = OutputResults/OutputResults.cpp\
+                          OutputResults/OutputResults.h
+
 PenaltyConstraints_SOURCES = PenaltyConstraints/PenaltyConstraints.cpp\
                           PenaltyConstraints/PenaltyConstraints.h