Commit 0ee656ae authored by brugger's avatar brugger

1) I corrected a bug with build_visit so that it would build uintah properly

   on linux.

2) I updated the surface config site file to use mfem 3.0.1 and nektar++.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@25722 18c085ea-50e0-402c-830e-de6fd14e8384
parent 43555cd6
......@@ -177,13 +177,20 @@ ITAPS_LINK_DIRECTORIES(GRUMMP ${VISITHOME}/itaps/1.4/GRUMMP/0.6.5/${VISITARCH}/l
##
## MFEM
##
VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/3.0/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/3.0.1/${VISITARCH})
##
## Mili
##
VISIT_OPTION_DEFAULT(VISIT_MILI_DIR ${VISITHOME}/mili/13.1.1-patch/${VISITARCH})
##
## Nektar++
##
SETUP_APP_VERSION(NEKTAR++ 4.0.1)
VISIT_OPTION_DEFAULT(VISIT_NEKTAR++_DIR ${VISITHOME}/nektar++/${NEKTAR++_VERSION}/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_NEKTAR++_LIBDEP /usr/lib z TYPE STRING)
##
## PySide
##
......
......@@ -283,21 +283,24 @@ function build_uintah
else
info "Invoking command to configure UINTAH"
info "../src/configure CXX=\"$PAR_COMPILER_CXX\" CC=\"$PAR_COMPILER\" \
info "../src/configure CXX=\"$CXX_COMPILER\" CC=\"$C_COMPILER\" \
CFLAGS=\"$CFLAGS $C_OPT_FLAGS\" CXXFLAGS=\"$CXXFLAGS $CXX_OPT_FLAGS\" \
MPI_EXTRA_LIB_FLAG=\"$PAR_LIBRARY_NAMES\" \
$FORTRANARGS \
--prefix=\"$VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH\" \
${cf_build_type} \
--enable-optimize"
--enable-optimize \
--with-mpi="${PAR_INCLUDE_DIR}/.." "
sh -c "../src/configure CXX=\"$PAR_COMPILER_CXX\" CC=\"$PAR_COMPILER\" \
sh -c "../src/configure CXX=\"$CXX_COMPILER\" CC=\"$C_COMPILER\" \
CFLAGS=\"$CFLAGS $C_OPT_FLAGS\" CXXFLAGS=\"$CXXFLAGS $CXX_OPT_FLAGS\" \
MPI_EXTRA_LIB_FLAG=\"$PAR_LIBRARY_NAMES\" \
$FORTRANARGS \
--prefix=\"$VISITDIR/uintah/$UINTAH_VERSION/$VISITARCH\" \
${cf_build_type} \
--enable-optimize"
--enable-optimize \
--with-mpi="${PAR_INCLUDE_DIR}/.." "
fi
......
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