Changeset 16591

Timestamp:

10/31/13 09:31:23 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying prototype for OutputResultsx

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (1 diff)
• classes/FemModel.h (modified) (1 diff)
• cores/hydrology_core.cpp (modified) (2 diffs)
• cores/transient_core.cpp (modified) (1 diff)
• main/issm.cpp (modified) (1 diff)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (5 diffs)
• modules/OutputResultsx/OutputResultsx.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -244 +244 @@
 
         }
-/*}}}*/
-/*FUNCTION FemModel::OutputResults {{{*/
-void FemModel::OutputResults(void){
-
-        _printf0_("write results to disk:\n");
-
-        /*Just call the OutputResultsx module: */
-        OutputResultsx(this->elements, this->nodes, this->vertices, this->loads, this->materials, this->parameters,this->results);
-
-}
 /*}}}*/
 /*FUNCTION FemModel::SetStaticComm {{{*/

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -54 +54 @@
                 void InitFromFiles(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int solution_type,const int* analyses,const int nummodels);
                 void Solve(void);
-                void OutputResults(void);
                 void SetStaticComm();
                 void SetCurrentConfiguration(int configuration_type);

issm/trunk-jpl/src/c/cores/hydrology_core.cpp

@@ -73 +73 @@
                                 /*unload results*/
                                 if(VerboseSolution()) _printf0_("   saving temporary results\n");
-                                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
+                                OutputResultsx(femmodel);
                         }
                 }
@@ -98 +98 @@
                                 /*unload results*/
                                 if(VerboseSolution()) _printf0_("   saving temporary results\n");
-                                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
+                                OutputResultsx(femmodel);
                         }
                 }

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -172 +172 @@
                         }
                         if(VerboseSolution()) _printf0_("   saving temporary results\n");
-                        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
+                        OutputResultsx(femmodel);
                 }
         }

issm/trunk-jpl/src/c/main/issm.cpp

@@ -20 +20 @@
 
         /*Output results: */
-        femmodel->OutputResults();
+        OutputResultsx(femmodel);
 
         /*Wrap up: */

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

@@ -15 +15 @@
 #include "../../classes/classes.h"
 
-void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
+void OutputResultsx(FemModel* femmodel){
 
         int         my_rank;
@@ -27 +27 @@
 
         /*retrieve parameters: */
-        parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
+        femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
 
         /*recover my_rank:*/
@@ -40 +40 @@
          *therefore, we need to include the solutiontype into the filename: */
         if(my_rank==0){
-                parameters->FindParam(&solutiontype,SolutionTypeEnum);
+                femmodel->parameters->FindParam(&solutiontype,SolutionTypeEnum);
                 EnumToStringx(&solutiontypestring,solutiontype);
-                results->AddResult(new GenericExternalResult<char*>(results->Size()+1,SolutionTypeEnum,solutiontypestring,1,0));
+                femmodel->results->AddResult(new GenericExternalResult<char*>(femmodel->results->Size()+1,SolutionTypeEnum,solutiontypestring,1,0));
                 xDelete<char>(solutiontypestring);
         }
 
         /*Now, open file for writing, if not already done: */
-        if(!parameters->Exist(OutputFilePointerEnum)){
+        if(!femmodel->parameters->Exist(OutputFilePointerEnum)){
 
                 /*We don't have a file pointer. Retrieve the output file name and open it for writing:*/
-                parameters->FindParam(&outputfilename,OutputFileNameEnum);
+                femmodel->parameters->FindParam(&outputfilename,OutputFileNameEnum);
 
                 /*What strategy? : */
-                parameters->FindParam(&io_gather,SettingsIoGatherEnum);
+                femmodel->parameters->FindParam(&io_gather,SettingsIoGatherEnum);
 
                 if(io_gather){
@@ -61 +61 @@
                 else{
                         /*We are opening different  files for output on all cpus. Append the  rank to the filename, and open: */
-                        parameters->FindParam(&fid,OutputFilePointerEnum);
+                        femmodel->parameters->FindParam(&fid,OutputFilePointerEnum);
                         sprintf(cpu_outputfilename,"%s.%i",outputfilename,my_rank);
                         fid=pfopen(cpu_outputfilename ,"wb");
@@ -68 +68 @@
 
                 /*Add file pointer in parameters for further calls to OutputResultsx: */
-                parameters->SetParam(fid,OutputFilePointerEnum);
+                femmodel->parameters->SetParam(fid,OutputFilePointerEnum);
         }
 
         /*Write results to disk: */
-        results->Write(parameters);
+        femmodel->results->Write(femmodel->parameters);
 
         /*Delete and reinitialize results, in parallel: */
-        results->clear();
+        femmodel->results->clear();
 
         /*Close output file? :*/
-        /*WARNING: issm.cpp is taking care of it for now (quick fix)
+        /*FIXME WARNING: issm.cpp is taking care of it for now (quick fix)
           if((step==1) && (time==0)){
           if(io_gather){

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

@@ -14 +14 @@
 #include "../../classes/classes.h"
 
-void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters, Results* results);
+void OutputResultsx(FemModel* femmodel);
 
 #endif  /* _OUTPUTRESULTS_H */