[MOAB-dev] r5320 - in MOAB/trunk: examples/itaps itaps/imesh src src/io test tools/dagmc
tautges at mcs.anl.gov
tautges at mcs.anl.gov
Fri Jan 13 17:23:22 CST 2012
Author: tautges
Date: 2012-01-13 17:23:22 -0600 (Fri, 13 Jan 2012)
New Revision: 5320
Modified:
MOAB/trunk/examples/itaps/Makefile.am
MOAB/trunk/itaps/imesh/Makefile.am
MOAB/trunk/itaps/imesh/ScdMeshF77.F
MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
MOAB/trunk/src/SparseTag.cpp
MOAB/trunk/src/io/ReadMCNP5.cpp
MOAB/trunk/src/io/ReadNASTRAN.cpp
MOAB/trunk/src/io/ReadNC.cpp
MOAB/trunk/src/io/ReadNCDF.cpp
MOAB/trunk/src/io/WriteTemplate.cpp
MOAB/trunk/test/kd_tree_time.cpp
MOAB/trunk/tools/dagmc/quads_to_tris.cpp
MOAB/trunk/tools/dagmc/test_geom.cc
Log:
Mostly changes to remove compiler warnings when compiling with PGI.
test/kd_tree_time.cpp: adding include, to enable compiling with pgi
itaps/imesh/iMesh_MOAB.cpp: fixing CreateTagWithOptions, which wasn't passing default
value correctly
itaps/imesh/ScdMeshF77.F: had a few ';' characters that caused warnings under PGI
itaps/imesh/Makefile.am, examples/itaps/Makefile.am: adding -I$(top_builddir)/itaps, which is
needed now that we are generating iBase_f.h
src/io/ReadMCNP5.cpp, ReadNASTRAN.cpp: removing a few break statements that are never reached, to get rid
of compile warnings
src/io/ReadNCDF.cpp: adding some code to use a result, to remove a compiler warning
src/io/WriteTemplate.cpp, src/io/ReadNC.cpp: similar
src/SparseTag.cpp: removing a variable, to remove a compiler warning
tools/dagmc/quads_to_tris.cpp: adding some code to remove compiler warning
tools/dagmc/test_geom.cc: increasing tolerance value in comparison, otherwise sometimes
this test fails on comparison to std::numeric_limits<double>::epsilon()
Passes make check in serial and parallel.
Modified: MOAB/trunk/examples/itaps/Makefile.am
===================================================================
--- MOAB/trunk/examples/itaps/Makefile.am 2012-01-13 20:16:48 UTC (rev 5319)
+++ MOAB/trunk/examples/itaps/Makefile.am 2012-01-13 23:23:22 UTC (rev 5320)
@@ -5,10 +5,9 @@
AM_CPPFLAGS += -I$(top_srcdir)/itaps/imesh \
-I$(top_srcdir)/itaps/ \
+ -I$(top_builddir)/itaps \
-I$(top_builddir)/itaps/imesh
-AM_FFLAGS = -fcray-pointer
-
TESTS = $(check_PROGRAMS)
LDADD = $(top_builddir)/itaps/imesh/libiMesh.la $(top_builddir)/src/libMOAB.la ${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}
TESTDEPS = $(top_builddir)/itaps/imesh/libiMesh.la $(top_builddir)/src/libMOAB.la
Modified: MOAB/trunk/itaps/imesh/Makefile.am
===================================================================
--- MOAB/trunk/itaps/imesh/Makefile.am 2012-01-13 20:16:48 UTC (rev 5319)
+++ MOAB/trunk/itaps/imesh/Makefile.am 2012-01-13 23:23:22 UTC (rev 5320)
@@ -7,6 +7,7 @@
-I$(srcdir)/.. \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
+ -I$(top_builddir)/itaps \
-I$(top_srcdir)/test
# stuff for c test program
Modified: MOAB/trunk/itaps/imesh/ScdMeshF77.F
===================================================================
--- MOAB/trunk/itaps/imesh/ScdMeshF77.F 2012-01-13 20:16:48 UTC (rev 5319)
+++ MOAB/trunk/itaps/imesh/ScdMeshF77.F 2012-01-13 23:23:22 UTC (rev 5320)
@@ -56,7 +56,7 @@
global_dims(6)=-1
call iMesh_newMesh('MOAB', mesh, ier)
- ERROR(ier);
+ ERROR(ier)
handle = 0
call iMesh_createStructuredMesh(%VAL(mesh), local_dims,
@@ -68,15 +68,15 @@
ERROR(ier)
call iMesh_getGeometricDimension(%VAL(mesh), geom_dim, ier)
- ERROR(ier);
+ ERROR(ier)
call iMesh_getNumOfType(%VAL(mesh), %VAL(root_set),
More information about the moab-dev
mailing list