Commit d860bbb7 authored by miller86's avatar miller86

Merging 1.12RC to trunk: adding ability to override env-make var collision...

Merging 1.12RC to trunk: adding ability to override env-make var collision check; fixing material search option for NASTRAN plugin

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7938 18c085ea-50e0-402c-830e-de6fd14e8384
parent a4a0cd59
......@@ -167,6 +167,10 @@
# Remove '==' inside test, as it doesn't work on my machine (it is not
# compliant).
#
# Mark C. Miller, Tue Jul 28 09:37:55 PDT 2009
# Added ability to override env-make var collision test and changed its
# warning message to indicate that.
#
##############################################################################
@SET_MAKE@
......@@ -231,7 +235,7 @@ visitmodule:
check-make-and-env-vars:
@isdbg=$$(echo $(CXXFLAGS) | tr ' ' '\n' | grep -e '-g'); \
if test -z "$$isdbg"; then \
if test -z "$$isdbg" -a -z "$(VISIT_NOCKENV)"; then \
echo "Checking for possible collisions between environment"; \
echo -n "and VisIt's Make variables..."; \
env | cut -d'=' -f1 | sort | uniq > env_vars.txt; \
......@@ -245,10 +249,16 @@ check-make-and-env-vars:
rm -f env_vars.txt make_vars.txt; \
if test -n "$$em_vars"; then \
echo ""; \
echo "The following variables in your environment may collide with"; \
echo "variables in VisIt's Makefiles. Please temporarily remove"; \
echo "using unsetenv (csh) or unset (sh) before proceeding..."; \
echo "The following variables in your environment MAY collide with"; \
echo "variables in VisIt's Makefiles..."; \
echo "------------------------------------------------------------"; \
echo $$em_vars | tr ' ' '\n'; \
echo "------------------------------------------------------------"; \
echo "Please temporarily remove these variables from your enviornment"; \
echo "using unsetenv (csh) or unset (sh) before proceeding. Or,"; \
echo "you may instead and at your own risk, override this error by"; \
echo "adding 'VISIT_NOCKENV=1' to your make command line."; \
echo "(e.g. 'make VISIT_NOCKENV=1')."; \
exit 1; \
else \
echo "OK"; \
......
......@@ -328,6 +328,10 @@ static int Geti(const char *s)
//
// Mark C. Miller, Wed May 13 23:11:27 PDT 2009
// Added support for materials.
//
// Mark C. Miller, Mon Jul 27 20:52:42 PDT 2009
// Moved re-setting of matCountOpt from -1 (which means to search) to
// OUTSIDE of conditional compilation for !mdserver.
// ****************************************************************************
bool
......@@ -890,10 +894,10 @@ avtNASTRANFileFormat::ReadFile(const char *name, int nLines)
#if !defined(MDSERVER)
else
ugrid->Delete();
#endif
if (matCountOpt == -1)
matCountOpt = uniqMatIds.size();
#endif
visitTimer->StopTimer(total, "Loading NASTRAN file");
......
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