Commit 13e182bf authored by allens's avatar allens
Browse files

updated support for Uintah and alphabeticalized the names

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22669 18c085ea-50e0-402c-830e-de6fd14e8384
parent db6e9359
......@@ -136,7 +136,7 @@ function build_uintah
fi
if [[ "$PAR_INCLUDE_STRING" == "" ]] ; then
warn "You must set either the PAR_COMPILER or PAR_INCLUDE environment variable to be Ice-T."
warn "You must set either the PAR_COMPILER or PAR_INCLUDE environment variable to be Uintah."
warn "PAR_COMPILER should be of the form \"/path/to/mpi/bin/mpicc\""
warn "PAR_INCLUDE should be of the form \"-I/path/to/mpi/include\""
warn "Giving Up!"
......@@ -175,9 +175,9 @@ function build_uintah
if test -z "${PAR_INCLUDE_DIR}" ; then
if test -n "${PAR_INCLUDE}" ; then
warn "This script believes you have defined PAR_INCLUDE as: $PAR_INCLUDE"
warn "However, to build Ice-T, this script expects to parse a -I/path/to/mpi out of PAR_INCLUDE"
warn "However, to build Uintah, this script expects to parse a -I/path/to/mpi out of PAR_INCLUDE"
fi
warn "Could not determine the MPI include information which is needed to compile IceT."
warn "Could not determine the MPI include information which is needed to compile Uintah."
if test -n "${PAR_INCLUDE}" ; then
error "Please re-run with the required \"-I\" option included in PAR_INCLUDE"
else
......@@ -187,6 +187,19 @@ function build_uintah
fi
fi
if [[ "$FC_COMPILER" == "no" ]] ; then
if [[ "$OPSYS" != "Darwin" ]]; then
warn "Uintah may require fortran to be enabled. It does not appear that the --fortran "
warn "agrument was set. If Uintah fails to build try adding the --fortranargument"
FORTRANARGS=""
# return 1
fi
else
FORTRANARGS="FC=\"$FC_COMPILER\" F77=\"$FC_COMPILER\" FCFLAGS=\"$FCFLAGS\" FFLAGS=\"$FCFLAGS\" --enable-fortran"
fi
#
# Prepare build dir
#
......@@ -208,11 +221,6 @@ function build_uintah
else
cf_build_type="--enable-shared --disable-static"
fi
if [[ "$FC_COMPILER" == "no" ]] ; then
FORTRANARGS=""
else
FORTRANARGS="FC=\"$FC_COMPILER\" F77=\"$FC_COMPILER\" FCFLAGS=\"$FCFLAGS\" FFLAGS=\"$FCFLAGS\" --enable-fortran"
fi
# In order to ensure $FORTRANARGS is expanded to build the arguments to
# configure, we wrap the invokation in 'sh -c "..."' syntax
......
......@@ -11,35 +11,34 @@
<!-- optional libraries -->
<optional>
<lib name="szip"/>
<lib name="hdf5"/>
<lib name="mili"/>
<lib name="icet"/>
<lib name="hdf4"/>
<lib name="netcdf"/>
<lib name="cgns"/>
<lib name="gdal"/>
<lib name="tcmalloc"/>
<lib name="adios"/>
<lib name="advio"/>
<lib name="boxlib"/>
<lib name="ccmio"/>
<lib name="cfitsio"/>
<!-- <lib name="mdsplus"/> Removed for now by Allen Sanderson-->
<lib name="h5part"/>
<lib name="cgns"/>
<lib name="fastbit"/>
<lib name="ccmio"/>
<lib name="silo"/>
<lib name="gdal"/>
<lib name="h5part"/>
<lib name="hdf4"/>
<lib name="hdf5"/>
<lib name="icet"/>
<lib name="itaps"/>
<lib name="advio"/>
<lib name="xdmf"/>
<lib name="mxml"/>
<lib name="adios"/>
<lib name="pyside"/>
<lib name="mili"/>
<!-- <lib name="mdsplus"/> Removed for now by Allen Sanderson-->
<lib name="manta"/>
<lib name="mpich"/>
<lib name="zlib"/>
<lib name="mxml"/>
<lib name="netcdf"/>
<lib name="pyside"/>
<lib name="uintah"/>
<lib name="silo"/>
<lib name="szip"/>
<lib name="tcmalloc"/>
<lib name="xdmf"/>
<lib name="zlib"/>
</optional>
<!-- thirdparty flag -->
<group name="required" comment="All required libraries">
<lib name="cmake"/> <!-- cmake is here -->
......@@ -50,34 +49,34 @@
</group>
<group name="optional" comment="All optional libraries">
<lib name="szip"/>
<lib name="hdf5"/>
<lib name="netcdf"/>
<lib name="cgns"/>
<lib name="gdal"/>
<lib name="adios"/>
<lib name="advio"/>
<lib name="boxlib"/>
<lib name="ccmio"/>
<lib name="cfitsio"/>
<lib name="h5part"/>
<lib name="cgns"/>
<lib name="gdal"/>
<lib name="fastbit"/>
<lib name="ccmio"/>
<lib name="silo"/>
<lib name="advio"/>
<lib name="xdmf"/>
<lib name="mxml"/>
<lib name="adios"/>
<lib name="pyside"/>
<lib name="hdf5"/>
<lib name="h5part"/>
<lib name="manta"/>
<lib name="mpich"/>
<lib name="mxml"/>
<lib name="netcdf"/>
<lib name="pyside"/>
<lib name="silo"/>
<lib name="szip"/>
<lib name="uintah"/>
<lib name="xdmf"/>
<lib name="zlib"/>
</group>
<group name="no-thirdparty" comment="Do not build required 3rd party libraries">
<lib name="no-qt" />
<lib name="no-cmake"/>
<lib name="no-vtk"/>
<lib name="no-python"/>
<lib name="no-pyside"/>
<lib name="no-qt" />
<lib name="no-vtk"/>
</group>
<!-- all io libraries -->
......@@ -96,6 +95,7 @@
<lib name="netcdf"/>
<lib name="silo"/>
<lib name="szip"/>
<lib name="uintah"/>
<lib name="xdmf"/>
</group>
......@@ -115,6 +115,7 @@
<lib name="netcdf"/>
<lib name="silo"/>
<lib name="szip"/>
<lib name="uintah"/>
<lib name="xdmf"/>
<lib name="no-mesa"/>
<lib name="no-qt"/>
......@@ -134,12 +135,11 @@
# Releasibility of these libs is not yet understood
-->
<group name="advanced" comment="Must be manually downloaded">
<lib name="mili"/>
<lib name="hdf4"/>
<lib name="itaps"/>
<!-- <lib name="mdsplus"/> Removed for now by Allen Sanderson-->
<lib name="mili"/>
<lib name="tcmalloc"/>
<lib name="itaps"/>
<lib name="hdf4"/>
<lib name="uintah"/>
</group>
</license>
......@@ -178,34 +178,37 @@
</group>
<group name="optional" comment="All optional libraries">
<lib name="szip"/>
<lib name="netcdf"/>
<lib name="hdf5"/>
<lib name="netcdf"/>
<lib name="szip"/>
<lib name="uintah"/>
</group>
<group name="no-thirdparty" comment="Do not build required 3rd party libraries">
<lib name="no-qt" />
<lib name="no-cmake"/>
<lib name="no-vtk"/>
<lib name="no-python"/>
<lib name="no-qt" />
<lib name="no-vtk"/>
</group>
<!-- nodbio flag -->
<group name="dbio-only" comment="Disables EVERYTHING but I/O.">
<lib name="szip"/>
<lib name="netcdf"/>
<lib name="hdf5"/>
<lib name="netcdf"/>
<lib name="szip"/>
<lib name="uintah"/>
<lib name="no-mesa"/>
<lib name="no-qt"/>
<lib name="no-python"/>
<lib name="no-qt"/>
</group>
<!-- all io libraries -->
<group name="all-io" comment="Build all available I/O libraries">
<lib name="szip"/>
<lib name="netcdf"/>
<lib name="hdf5"/>
<lib name="netcdf"/>
<lib name="szip"/>
<lib name="uintah"/>
</group>
<!-- #all the optional non io libraries -->
<group name="nonio" comment="Build non I/O libraries">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment