Changeset 4873 for issm/trunk/src/c/solutions/issm.cpp

Timestamp:

07/29/10 10:07:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

outputfile is now loaded step by step to save memory. the file is open once and closed at the end of the solution

File:

• issm/trunk/src/c/solutions/issm.cpp (modified) (5 diffs)

issm/trunk/src/c/solutions/issm.cpp

@@ -12 +12 @@
 
         /*I/O: */
-        FILE     *fid              = NULL;
+        FILE     *input_fid        = NULL;
+        FILE     *output_fid       = NULL;
         char     *inputfilename    = NULL;
         char     *outputfilename   = NULL;
@@ -48 +49 @@
         MPI_Comm_size(MPI_COMM_WORLD,&num_procs); 
 
-        _printf_("recover input and output file names:\n");
+        _printf_("recover solution and file names:\n");
         solution_type=StringAsEnum(argv[1]);
         inputfilename=argv[3];
@@ -60 +61 @@
         SolutionConfiguration(&analyses,&numanalyses,&solutioncore,solution_type);
 
-        /*Open handle to data on disk: */
-        fid=pfopen(inputfilename,"rb");
+        /*Open input file to process model
+         * and ouput file to start unload results*/
+        input_fid =pfopen(inputfilename ,"rb");
+        output_fid=pfopen(outputfilename,"wb");
 
         _printf_("create finite element model:\n");
-        femmodel=new FemModel(fid,solution_type,analyses,numanalyses);
+        femmodel=new FemModel(input_fid,solution_type,analyses,numanalyses);
 
-        /*add outputfilename in parameters: */
-        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
+        /*add output_fid to parameters: */
+        femmodel->parameters->SetParam(output_fid,OutputFilePointerEnum);
         
         /*get parameters: */
@@ -96 +99 @@
 
                 _printf_("write results to disk:\n");
-                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
+                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
         }
         else{
@@ -111 +114 @@
         }
 
+        /*Close output file and write lock file if requested*/
+        pfclose(output_fid,outputfilename);
         if (waitonlock>0){
                 _printf_("write lock file:\n");