[MOAB-dev] r5216 - in MOAB/trunk: itaps/imesh src/moab tools/vtkMOABReader

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-11-16 15:51:43 -0600 (Wed, 16 Nov 2011)
New Revision: 5216

Added:
   MOAB/trunk/itaps/imesh/ScdMeshF77.F
   MOAB/trunk/itaps/imesh/ScdMeshF90.F90
Modified:
   MOAB/trunk/itaps/imesh/Makefile.am
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
   MOAB/trunk/itaps/imesh/iMesh_extensions.h
   MOAB/trunk/src/moab/ScdInterface.hpp
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
Log:
Split the ScdMesh test in itaps/imesh into F77 and F90 tests, to make sure the code is compatible with 
fixed and free source form.  Also fixing ScdBox::num_elements for 2d structured mesh, which wasn't right.

Also adding a small change to vtkMOABReader for handling spectral meshes.

Passes make check in serial and parallel.



Modified: MOAB/trunk/itaps/imesh/Makefile.am
===================================================================
--- MOAB/trunk/itaps/imesh/Makefile.am	2011-11-15 00:24:52 UTC (rev 5215)
+++ MOAB/trunk/itaps/imesh/Makefile.am	2011-11-16 21:51:43 UTC (rev 5216)
@@ -13,7 +13,7 @@
 check_PROGRAMS = testc_cbind MOAB_iMesh_unit_tests MOAB_iMesh_extensions_tests
 
 if ENABLE_FORTRAN
-  check_PROGRAMS += ScdMesh
+  check_PROGRAMS += ScdMeshF90 ScdMeshF77
 endif
 
 EXTRA_DIST = brick.vtk quad9.cub
@@ -59,9 +59,12 @@
 MOAB_iMesh_extensions_tests_SOURCES = MOAB_iMesh_extensions_tests.cpp
 MOAB_iMesh_extensions_tests_DEPENDENCIES = $(TESTDEPS)
 
-ScdMesh_SOURCES = ScdMesh.F90
-ScdMesh_DEPENDENCIES = $(TESTDEPS)
+ScdMeshF90_SOURCES = ScdMeshF90.F90
+ScdMeshF90_DEPENDENCIES = $(TESTDEPS)
 
+ScdMeshF77_SOURCES = ScdMeshF77.F
+ScdMeshF77_DEPENDENCIES = $(TESTDEPS)
+
 lib_LTLIBRARIES = libiMesh.la
 
 libiMesh_la_includedir = $(includedir)

Added: MOAB/trunk/itaps/imesh/ScdMeshF77.F
===================================================================
--- MOAB/trunk/itaps/imesh/ScdMeshF77.F	                        (rev 0)
+++ MOAB/trunk/itaps/imesh/ScdMeshF77.F	2011-11-16 21:51:43 UTC (rev 5216)
@@ -0,0 +1,102 @@
+! MOAB structured mesh extension test
+! 
+! This test also tests fortran free-source format
+!
+
+#define ERROR(rval) if (0 .ne. rval) call exit(1)
+
+      real function reinterpret_ptr(xm, ni, nj, nk)
+      integer ni, nj, nk
+      real xm(ni, nj, nk)
+
+      reinterpret_ptr = 0.0
+      do 10 k = 1, nk
+         do 10 j = 1, nj
+            do 10 i = 1, ni
+               reinterpret_ptr = reinterpret_ptr + xm(i, j, k)
+ 10         continue