some fixes

Author: nsimakov

src/header/extfun.h

@@ -141,11 +141,11 @@ extern void output_stoch_stats(MatProps* matprops, StatProps* statprops);
 
 //! this function writes text tecplot output files in the tecplxxxxxxxx.plt format.  Keith rewrote this function to eliminate a lot of bugs shortly after he started the project, since then files were 1/3 the size they were previously.
 extern void tecplotter(ElementType elementType, ElementsHashTable* HT_Elem_Ptr, NodeHashTable* HT_Node_Ptr, MatProps* matprops, TimeProps* timeprops,
-                       MapNames* mapnames, double v_star);
+                       MapNames* mapnames, double v_star, const char * output_prefix);
 
 //! this function writes text tecplot output files in the mshplxxxxxxxx.plt format.  This is largely untouched since before I (Keith) joined the GMFG, just minor changes.  This is the preferred (by Professor Patra) format of output for debugging purposes even though tecplxxxxxxxx.plt create nicer images.
 extern void meshplotter(ElementsHashTable* HT_Elem_Ptr, NodeHashTable* HT_Node_Ptr, MatProps* matprops, TimeProps* timeprops,
-                        MapNames* mapnames, double v_star);
+                        MapNames* mapnames, double v_star, const char * output_prefix);
 
 //! one of "pady's" output functions, since Keith never met "pady" this is probably long out of date
 extern void vizplotter(ElementsHashTable* HT_Elem_Ptr, NodeHashTable* HT_Node_Ptr, MatProps* matprops, TimeProps* timeprops);
@@ -181,11 +181,11 @@ void web_simplify(TimeProps* timeprops);
 void web_correct(TimeProps* timeprops);
 
 //! this function writes the header for grass sites style output, the grass sites output format is correct and works, but importing the data into GIS packages such as ARCGIS is non trivial until you know the trick to it.  Keith does not know the trick, I just wrote this in the format Alex Sorokine specified.
-void grass_sites_header_output(TimeProps* timeprops);
+void grass_sites_header_output(TimeProps* timeprops, const char * output_prefix);
 
 //! this function writes one processors grass sites style output, the grass sites output format is correct and works, but importing the data into GIS packages such as ARCGIS is non trivial until you know the trick to it.  Keith does not know the trick, I (Keith) just wrote this in the format Alex Sorokine specified.
 void grass_sites_proc_output(ElementsHashTable* HT_Elem_Ptr, NodeHashTable* HT_Node_Ptr, int myid, MatProps* matprops,
-                             TimeProps* timeprops);
+                             TimeProps* timeprops, const char * output_prefix);
 
 //! this function is legacy, it is not defined in the finite difference/volume version of titan
 extern void check_p_order(ElementsHashTable* HT_Elem_Ptr, NodeHashTable* HT_Node_Ptr);

src/main/titan.C

@@ -46,7 +46,6 @@ extern "C" void init_cxxtitan();
 
 int main(int argc, char *argv[])
 {
-    printf("Titan2d\n");
     int myid, master, numprocs;
     int namelen;
 

src/main/titan.py

@@ -404,15 +404,16 @@ def __init__(self,overwrite_output=False):
                 'short_speed':{'desc':'',
                     'validator':VarType(bool).chk
                 },    
-            }
+            },
+            defaultParameters={'short_speed':False,'geoflow_tiny':0.0001}
         )
         #setMatModel
         self.ui_MatModel=None
         self.chk_MatModel=TiArgCheckerAndSetter(
             sectionName="setMatModel",
             levelZeroParameters={                                      
             },
-            defaultParameters={'use_gis_matmap':False,'geoflow_tiny':0.0001,'short_speed':False,},
+            defaultParameters={'use_gis_matmap':False},
             switchArguments={
                 'use_gis_matmap':
                 {
@@ -464,7 +465,7 @@ def __init__(self,overwrite_output=False):
                         ),
                         'Maeno':TiArgCheckerAndSetter(
                             levelZeroParameters={
-                                'phi1':{'validator':VarType(float,conditions=[{'f':lambda v: v > 0,'msg':'should be positive!'}]).chk,'desc':''},
+                                'phis':{'validator':VarType(float,conditions=[{'f':lambda v: v > 0,'msg':'should be positive!'}]).chk,'desc':''},
                                 'phi2':{'validator':VarType(float,conditions=[{'f':lambda v: v > 0,'msg':'should be positive!'}]).chk,'desc':''},
                                 'partdiam':{'validator':VarType(float,conditions=[{'f':lambda v: v > 0,'msg':'should be positive!'}]).chk,'desc':''},
                                 'I_not':{'validator':VarType(float,conditions=[{'f':lambda v: v > 0,'msg':'should be positive!'}]).chk,'desc':''},
@@ -748,11 +749,9 @@ def setTimeSeriesOutput(self,**kwarg):
         if self.ui_TimeSeriesOutput['diter']==None:
             self.ui_TimeSeriesOutput['diter']=-1
     def setStatProps(self,enabled,**kwarg):
-        args=copy.deepcopy(kwarg)
-        args['enabled']=enabled
-        ui=self.chk_StatProps.process(args)
+        ui=self.chk_StatProps.process(kwarg)
 
-                #Test if flow reaches height [m] ...
+        #Test if flow reaches height [m] ...
         if ui['edge_height'] == None:
             ui['edge_height'] = -1.0
         else:
@@ -774,9 +773,7 @@ def setStatProps(self,enabled,**kwarg):
                 raise ValueError('TitanSimulation::test_location should be set if test_height>0\n') 
         self.ui_StatProps=ui
     def setOutlineProps(self,enabled,**kwarg):
-        args=copy.deepcopy(kwarg)
-        args['enabled']=enabled
-        self.ui_OutlineProps=self.chk_OutlineProps.process(args)
+        self.ui_OutlineProps=self.chk_OutlineProps.process(kwarg)
     def addPile(self,**kwarg):
         self.ui_Pile.append(self.chk_Pile.process(kwarg))
     def addFluxSource(self,**kwarg):
@@ -807,7 +804,7 @@ def _validate(self):
         else:
             for pile in self.ui_Pile:
                 if 'vol_fract' in pile:
-                    raise ValueError('TitanSimulation:addFluxSource: Siogle phases model is set, addPile should not have vol_fract argument!')
+                    raise ValueError('TitanSimulation:addFluxSource: Single phase model is set, addPile should not have vol_fract argument!')
 
         #######################################################################
         #check satisfaction of integrator
@@ -830,36 +827,7 @@ def _validate(self):
             raise ValueError("Can not find suitable integrator, here is the hint\n"+msg+"\ncheck the manual.")
         self.integratorConstructor=integrator
 
-        #######################################################################
-        #check the presence of output files and delete them if nessesary also create directory for some outputs
-        def check_and_remove_filedir(filename):
-            if os.path.exists(filename):
-                if self.overwrite_output:
-                    if os.path.isfile(filename):
-                        os.remove(filename)
-                    if os.path.isdir(filename):
-                        shutil.rmtree(filename)
-                else:
-                    raise IOError("Output file or directory exists ("+filename+"). Remove it manually or set overwrite_output to True or change output prefix.")
-        def check_and_remove_filedir_by_wildcard(filename):
-            files=glob.glob(filename)
-            print filename,files
-            if not self.overwrite_output and len(files)>0:
-                raise IOError("Output files or directories exists ("+",".join(files)+"). Remove it manually or set overwrite_output to True or change output prefix.")
-            for f in files:
-                check_and_remove_filedir(f)
-        #restarts     
-        output_prefix=self.ui_RestartOutput['output_prefix']
-        check_and_remove_filedir(output_prefix)
-        check_and_remove_filedir_by_wildcard("%s_Quad[49]_p[0-9][0-9][0-9][0-9].xmf"%(output_prefix,));
-        
-        os.mkdir(output_prefix)
-        #visoutput
-        output_prefix=self.ui_TimeSeriesOutput['output_prefix']
-        check_and_remove_filedir(output_prefix)
-        check_and_remove_filedir_by_wildcard("%s_xdmf_p[0-9][0-9][0-9][0-9].xmf"%(output_prefix,));
-        
-        os.mkdir(output_prefix)
+        
 
 class TitanSimulation(TitanSimulationBase):
     def __init__(self,overwrite_output=False):
@@ -869,7 +837,7 @@ def __init__(self,overwrite_output=False):
 
     def _setCxxTitanSimulation(self):
         """initiate and set all parameters of cxxTitanSimulation"""
-        if 1:
+        if 0:
             print self.ui_GIS
             print self.ui_Scale
             print self.ui_NumProp
@@ -902,6 +870,36 @@ def _setCxxTitanSimulation(self):
 
         self.sim=cxxTitanSimulation()
         self.sim.overwrite_output=self.overwrite_output
+        #######################################################################
+        #check the presence of output files and delete them if nessesary also create directory for some outputs
+        if self.sim.myid==0:
+            def check_and_remove_filedir(filename):
+                if os.path.exists(filename):
+                    if self.overwrite_output:
+                        if os.path.isfile(filename):
+                            os.remove(filename)
+                        if os.path.isdir(filename):
+                            shutil.rmtree(filename)
+                    else:
+                        raise IOError("Output file or directory exists ("+filename+"). Remove it manually or set overwrite_output to True or change output prefix.")
+            def check_and_remove_filedir_by_wildcard(filename):
+                files=glob.glob(filename)
+                if not self.overwrite_output and len(files)>0:
+                    raise IOError("Output files or directories exists ("+",".join(files)+"). Remove it manually or set overwrite_output to True or change output prefix.")
+                for f in files:
+                    check_and_remove_filedir(f)
+            #restarts     
+            output_prefix=self.ui_RestartOutput['output_prefix']
+            check_and_remove_filedir(output_prefix)
+            check_and_remove_filedir_by_wildcard("%s_Quad[49]_p[0-9][0-9][0-9][0-9].xmf"%(output_prefix,));
+            
+            os.mkdir(output_prefix)
+            #visoutput
+            output_prefix=self.ui_TimeSeriesOutput['output_prefix']
+            check_and_remove_filedir(output_prefix)
+            check_and_remove_filedir_by_wildcard("%s_xdmf_p[0-9][0-9][0-9][0-9].xmf"%(output_prefix,));
+            
+            os.mkdir(output_prefix)
 
         #######################################################################
         #Set GIS
@@ -1077,6 +1075,7 @@ def _preproc(self):
 
     def run(self):
         """Perform simulation"""
+        
         self._validate()
         #by this time all values should be sanitized
         self._setCxxTitanSimulation()

src/main/titan_simulation.C

@@ -740,10 +740,10 @@ void cxxTitanSimulation::save_vizoutput_file(const int mode)
         output_summary(&timeprops, statprops, savefileflag);
 
     if(vizoutput & 1)
-        tecplotter(elementType, ElemTable, NodeTable, matprops, &timeprops, &mapnames, statprops->vstar);
+        tecplotter(elementType, ElemTable, NodeTable, matprops, &timeprops, &mapnames, statprops->vstar,vizoutput_prefix.c_str());
 
     if(vizoutput & 2)
-        meshplotter(ElemTable, NodeTable, matprops, &timeprops, &mapnames, statprops->vstar);
+        meshplotter(ElemTable, NodeTable, matprops, &timeprops, &mapnames, statprops->vstar,vizoutput_prefix.c_str());
 
 #if HAVE_LIBHDF5
     if(vizoutput & 4)
@@ -764,8 +764,8 @@ void cxxTitanSimulation::save_vizoutput_file(const int mode)
     if(vizoutput & 8)
     {
         if(myid == 0)
-            grass_sites_header_output(&timeprops);
-        grass_sites_proc_output(ElemTable, NodeTable, myid, matprops, &timeprops);
+            grass_sites_header_output(&timeprops,vizoutput_prefix.c_str());
+        grass_sites_proc_output(ElemTable, NodeTable, myid, matprops, &timeprops,vizoutput_prefix.c_str());
     }
 }
 

src/tecplot/grassout.C

@@ -1,10 +1,10 @@
 #include "../header/hpfem.h"
 
-void grass_sites_header_output(TimeProps* timeprops)
+void grass_sites_header_output(TimeProps* timeprops, const char * output_prefix)
 {
     char filename[24];
 
-    sprintf(filename, "grass_sites%08d.hdr", timeprops->iter);
+    sprintf(filename, "%s/grass_sites%08d.hdr", output_prefix, timeprops->iter);
     FILE *fp = fopen(filename, "w");
 
     fprintf(fp, "name|titangrassout.site\n");
@@ -18,7 +18,7 @@ void grass_sites_header_output(TimeProps* timeprops)
 }
 
 void grass_sites_proc_output(ElementsHashTable* HT_Elem_Ptr, NodeHashTable* HT_Node_Ptr, int myid, MatProps* matprops,
-                             TimeProps* timeprops)
+                             TimeProps* timeprops, const char * output_prefix)
 {
     int no_of_buckets = HT_Elem_Ptr->get_no_of_buckets();
     vector<HashEntryLine> &bucket=HT_Elem_Ptr->bucket;
@@ -29,7 +29,7 @@ void grass_sites_proc_output(ElementsHashTable* HT_Elem_Ptr, NodeHashTable* HT_N
 
     char filename[24];
 
-    sprintf(filename, "grass_sites%08d.%03d", timeprops->iter, myid);
+    sprintf(filename, "%s/grass_sites%08d.%03d", output_prefix, timeprops->iter, myid);
     FILE *fp = fopen(filename, "w");
 
     /***************************************************************/

src/tecplot/tecplot.C

@@ -71,7 +71,7 @@ void testkey2(ElementsHashTable * El_Table)
 }
 
 void tecplotter(ElementType elementType,ElementsHashTable * El_Table, NodeHashTable * NodeTable, MatProps * matprops, TimeProps * timeprops,
-                MapNames * mapnames, double v_star)
+                MapNames * mapnames, double v_star, const char * output_prefix)
 {
     int i_buck, i_neigh;          //indices
     int xp, xm, yp, ym;           //x plus, x minus, y plus, y minus directions
@@ -173,8 +173,8 @@ void tecplotter(ElementType elementType,ElementsHashTable * El_Table, NodeHashTa
     int num_tec_elem = num_tec_quad + num_tec_tri;
     int num_tec_elem2 = 0;
 
-    char filename[20];
-    sprintf(filename, "tecpl%02d%08d.tec", myid, timeprops->iter);
+    char filename[256];
+    sprintf(filename, "%s/tecpl%02d%08d.tec",output_prefix, myid, timeprops->iter);
     FILE *fp = fopen(filename, "w");
 
     //print the tecplot header
@@ -751,7 +751,7 @@ void viz_output(ElementType elementType,ElementsHashTable * El_Table, NodeHashTa
  **************************************
  *************************************/
 void meshplotter(ElementsHashTable * El_Table, NodeHashTable * NodeTable, MatProps * matprops, TimeProps * timeprops,
-                 MapNames * mapnames, double v_star)
+                 MapNames * mapnames, double v_star, const char * output_prefix)
 {
     int myid, i;
     int numprocs;
@@ -776,7 +776,7 @@ void meshplotter(ElementsHashTable * El_Table, NodeHashTable * NodeTable, MatPro
     }
     IF_MPI(MPI_Barrier (MPI_COMM_WORLD));
 
-    sprintf(filename, "mshpl%02d%08d.tec", myid, timeprops->iter);
+    sprintf(filename, "%s/mshpl%02d%08d.tec",output_prefix, myid, timeprops->iter);
 
     int order;
 

src/tecplot/xdfm_write.C

@@ -104,7 +104,7 @@ int write_xdmf_two_phases(ElementsHashTable *El_Table, NodeHashTable *NodeTable,
     /* 
      * Write HDF5 File 
      */
-    char hdf5file[64];
+    char hdf5file[256];
     sprintf(hdf5file, "%s/xdmf_p%04d_i%08d.h5", output_prefix, myid, timeprops_ptr->iter);
     hid_t h5fid = GH5_fopen(hdf5file, 'n');
 
@@ -154,7 +154,7 @@ int write_xdmf_two_phases(ElementsHashTable *El_Table, NodeHashTable *NodeTable,
 
     /* generate XML file if required */
     ofstream xmlf;
-    char filename[20];
+    char filename[256];
     sprintf(filename, "%s_xdmf_p%04d.xmf", output_prefix,myid);
     if(mode == XDMF_NEW)
         xdmf_fopen(filename);
@@ -225,7 +225,7 @@ int write_xdmf_single_phase(ElementsHashTable *El_Table, NodeHashTable *NodeTabl
     int myid;
     MPI_Comm_rank(MPI_COMM_WORLD, &myid);
     ofstream xmlf;
-    char filename[64];
+    char filename[256];
     sprintf(filename, "%s_xdmf_p%04d.xmf", output_prefix,myid);
     if(mode == XDMF_NEW)
         xdmf_fopen(filename);
@@ -335,7 +335,7 @@ int write_xdmf_single_phase(ElementsHashTable *El_Table, NodeHashTable *NodeTabl
     /* 
      * Write HDF5 File 
      */
-    char hdf5file[64];
+    char hdf5file[256];
     sprintf(hdf5file, "%s/xdmf_p%04d_i%08d.h5", output_prefix, myid, timeprops_ptr->iter);
     hid_t h5fid = GH5_fopen(hdf5file, 'n');