now only c++ is used (hd5calls.c->hd5calls.C) updated autotools on that. Updated INSTALL and README.

Author: nsimakov

INSTALL

@@ -72,9 +72,15 @@ make install
 # ====================================================================
 # hdf5 installation
 # ====================================================================
-# serial version of hdf5 needed to be installed 
+# serial version of hdf5 with C++ support needed to be installed 
+cd $TITAN_WSP
 export TITAN_HDF5=$TITAN_WSP/hdf5
-
+wget http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.16.tar
+tar xvzf hdf5-1.8.16.tar
+cd hdf5-1.8.16
+./configure --prefix=$TITAN_HDF5 --enable-cxx
+make -j 8
+make install
 # ====================================================================
 # GRASS installation
 # ====================================================================
@@ -107,19 +113,25 @@ aclocal;autoheader;autoconf;automake --add-missing --copy
 cd $TITAN_WSP
 mkdir titan2d_bld
 cd titan2d_bld
-mkdir iccopt
-cd iccopt
+mkdir iccoptompmpi
+cd iccoptompmpi
 
 #
 #../../titan2d/configure --with-grass=<path_to_grass_installation> --without-gdal \
-#--with-hdf5=<path_to_top_dir_of_hdf5> --prefix=<where_to_install>  \
-#CC=mpicc CXX=mpic++ F77=mpif90 PYTHON=<path to python2.7>
+#    --with-hdf5=<path_to_top_dir_of_hdf5> --prefix=<where_to_install>  \
+#    PYTHON=<path to python2.7> SWIG=<path to swig>\
+#    [--enable-mpi] [--enable-openmp] \
+#    [CXX=<path to non-default c++ compiler, mpic++ for example> ] \
+#    [CXXFLAGS=<non-default optimization flags, for example "-g -O0" for no optimization or "-O3" for heavy optimization ]\
+#    [CPPGLAGS=<non-default preprocessor flags, for example "-DDEB2" for extra debuging information]
 #
-#for example:
+#for example hybrid MPI/OpenMP:
 ../../titan2d/configure --with-grass=$TITAN_GRASS --without-gdal \
 --with-hdf5=$TITAN_HDF5 --prefix=`pwd`  \
-CC=mpicc CXX=mpic++ F77=mpif90 PYTHON=$TITAN_PYTHON/bin/python2.7 \
-SWIG=$TITAN_SWIG/bin/swig CXXFLAGS=-O3 CFLAGS=-O3
+--enable-mpi --enable-openmp \
+CXX=mpic++ \
+PYTHON=$TITAN_PYTHON/bin/python2.7 \
+SWIG=$TITAN_SWIG/bin/swig CXXFLAGS=-O3
 
 # Now compile it:
 make -j <number of proccesses to use>

README

@@ -1,3 +1,26 @@
+Installation
+=====================================
+See INSTALL for compilation instruction
+
+Execution
+=====================================
+In order to run Titan in openMP mode (prefered at this time):
+
+source <path_to_titan>/bin/titanvars.sh
+<path_to_titan>/bin/titan -nt <number of threads> <input python script>
+
+In order to run Titan in hybrid MPI/OpenMP mode:
+
+source <path_to_titan>/bin/titanvars.sh
+mpirun -np <number of processes> <path_to_titan>/bin/titan -nt <number of threads> <input python script>
+
+
+
+
+
+
+Bellow is old read me
+=====================================
 The code currently simulates granular flows.  It runs in parallel with mesh refinement and unrefinement.  The maximum refinement level is set by the user when specifying the Number of Computational Cells Across Smallest Pile/Flux-Source.  Mesh repartitioning is also used to maintain a good load-balance.  A python script is included to organize the preprocessing and launching of jobs on different computers, including all available computers at the Center for Computational Research (CCR) at UB.  GRASS is now used as the GIS.  The python script can also be run directly from GRASS.  Instructions for this are in the README.GRASS file.
 
 The python script is located in the bin directory and is run by 

configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT(titan, 3.0.0)
+AC_INIT(titan, 3.1.0)
 AM_INIT_AUTOMAKE
 
 ## Host specific stuff
@@ -36,7 +36,6 @@ AC_LANG_CPLUSPLUS
 
 # Checks for programs.
 AC_PROG_CXX
-AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S

src/header/hd5calls.h

@@ -30,11 +30,9 @@ const int XDMF_CLOSE = 2;
 
 
 
-#ifdef __cplusplus
+
 #include <string>
-extern "C"
-{
-#endif
+
 
 /*! GH5_openfile opens hdf file for reading or writing.
  * mode can have "n" or "o" values
@@ -73,9 +71,7 @@ void GH5_write_mesh_data(hid_t fp, int conns, int points, int *conndata, double
  */
 void GH5_write_state_vars(hid_t fp, int num_elms, double *state_var, const char *var_names);
 
-#ifdef __cplusplus
-}
-#endif
+
 /*************************************************************
  *
  *      FOLLOWING CALLS ARE NOT EXPECTED TO BE MADE

src/tecplot/Makefile.am

@@ -6,7 +6,7 @@
 
 noinst_LIBRARIES = libtecplot.a
 
-libtecplot_a_SOURCES = outsum.C tecplot.C grassout.C xdfm_write.C hd5calls.c
+libtecplot_a_SOURCES = outsum.C tecplot.C grassout.C xdfm_write.C hd5calls.C
 
 libtecplot_a_CPPFLAGS=-I$(srcdir)/../header/ -I$(srcdir)/../gisapi