Changeset 6441

Timestamp:

10/27/10 13:59:06 (14 years ago)

Author:

Mathieu Morlighem

Message:

Quick fix for transient runs (To be modified)

Location:

issm/trunk/src/c

Files:

• io/pfclose.cpp (modified) (1 diff)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (2 diffs)
• solutions/issm.cpp (modified) (2 diffs)

issm/trunk/src/c/io/pfclose.cpp

@@ -17 +17 @@
         /*Close file handle: */
         extern int my_rank;
+        _assert_(fid);
         if(fclose(fid)!=0)_error_("%s%s","could not close file ",filename);
 }

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

@@ -88 +88 @@
 
                 /*Close output file? :*/
+                /*WARNING: issm.cpp is taking care of it for now (quick fix)
                 if((step==1) && (time==0)){
                         if(io_gather){
@@ -94 +95 @@
                         else pfclose(fid,cpu_outputfilename);
                 }
+                */
         #endif
 

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

@@ -62 +62 @@
         femmodel=new FemModel(argv[3] /*input*/,argv[5] /*output*/,solution_type,analyses,numanalyses);
 
+        /*Open output file once for all*/
+        output_fid=pfopen(argv[5],"wb");
+        femmodel->parameters->SetParam(output_fid,OutputFilePointerEnum);
+
         /*add petsc options to parameters: */
         ParsePetscOptions(femmodel->parameters,petscoptionsfilename);
@@ -100 +104 @@
 
         /*Close output file and write lock file if requested*/
+        pfclose(output_fid,argv[5]);
         if (waitonlock>0){
                 _printf_(true,"write lock file:\n");