Merge branch 'numpy-swig' into gh-3451

* numpy-swig:
  Added more mentions of the SuperTensor tests and corrected the number of typemaps and tests (currently 1427 unit tests passed with 'make test': 372+324+324+324+40+19+24)
  Added mention of the SuperTensor tests in the README file
  Removed 'static' keyword from pyfragments.swg altoghether. I've had the following errors In function ‘SWIG_AsVal_long’: error: initialiser element is not constant In function ‘SWIG_AsVal_unsigned_SS_long’: error: initialiser element is not constant, BOTH in Windows/MinGW and Linux when compiling with gcc
  Added tests for 4D tensors. Now using a consistant cubes,slices,rows,columns index order everywhere.
  cleaned-up loop indexes in Tensor.cxx
  cosmetic changes to numpy.i
  Fixed the capsule / cobject memory destructor. Added types to deal with lists of arrays and lists of tensors as input and inplace types.
  removed the note about testResize1 failing in testArray.py
  fixed the testResize1 test in testArray.py -- Changed order of the resize arguments in Array2.h and replaced len(XXXnumpyarray) with XXXnumpyarray.size
  Minor adjustments to numpy.i
  Updated numpy.i testing documentation
  Updated the numpy.i documentation
  Initialize all DATA_TYPE* data_temp variables to NULL
  Added Egor's ARGOUTVIEWM_ARRAY3 typemaps
  Re-instated a Python 3 fix
  Removed doc from list of sub-directories
  Upgrade numpy.i
  Got rid of a unit test

Conflicts:
	doc/sphinxext
	doc/swig/test/testFortran.py

1 files changed, 12 insertions, 9 deletions

diff --git a/doc/swig/test/testFortran.py b/doc/swig/test/testFortran.py
index ae7415d50..2175ad1bf 100644
--- a/doc/swig/test/testFortran.py
+++ b/doc/swig/test/testFortran.py
@@ -24,16 +24,19 @@ class FortranTestCase(unittest.TestCase):
         self.typeStr  = "double"
         self.typeCode = "d"
 
-    # Test (type* IN_FARRAY2, int DIM1, int DIM2) typemap
-    def testSecondElementContiguous(self):
-        "Test luSplit function with a Fortran-array"
-        print(self.typeStr, "... ", end=' ', file=sys.stderr)
-        second = Fortran.__dict__[self.typeStr + "SecondElement"]
-        matrix = np.arange(9).reshape(3, 3).astype(self.typeCode)
-        self.assertEquals(second(matrix), 3)
+    # This test used to work before the update to avoid deprecated code.  Now it
+    # doesn't work.  As best I can tell, it never should have worked, so I am
+    # commenting it out.  --WFS
+    # def testSecondElementContiguous(self):
+    #     "Test Fortran matrix initialized from reshaped default array"
+    #     print >>sys.stderr, self.typeStr, "... ",
+    #     second = Fortran.__dict__[self.typeStr + "SecondElement"]
+    #     matrix = np.arange(9).reshape(3, 3).astype(self.typeCode)
+    #     self.assertEquals(second(matrix), 3)
 
+    # Test (type* IN_FARRAY2, int DIM1, int DIM2) typemap
     def testSecondElementFortran(self):
-        "Test luSplit function with a Fortran-array"
+        "Test Fortran matrix initialized from reshaped NumPy fortranarray"
         print(self.typeStr, "... ", end=' ', file=sys.stderr)
         second = Fortran.__dict__[self.typeStr + "SecondElement"]
         matrix = np.asfortranarray(np.arange(9).reshape(3, 3),
@@ -41,7 +44,7 @@ class FortranTestCase(unittest.TestCase):
         self.assertEquals(second(matrix), 3)
 
     def testSecondElementObject(self):
-        "Test luSplit function with a Fortran-array"
+        "Test Fortran matrix initialized from nested list fortranarray"
         print(self.typeStr, "... ", end=' ', file=sys.stderr)
         second = Fortran.__dict__[self.typeStr + "SecondElement"]
         matrix = np.asfortranarray([[0,1,2],[3,4,5],[6,7,8]], self.typeCode)