Add eddy_mv and chan2d short_test (#582)

Author: stgeke

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "examples"]
+	path = examples
+	url = https://github.com/Nek5000/NekExamples

.travis.yml

@@ -13,16 +13,14 @@ env:
 
     - TEST_CASE=FsHydro::test_PnPn2_Parallel
 
-    # - TEST_CASE=Benard_Ray9::test_PnPn_Parallel
-    # - TEST_CASE=Benard_Ray9::test_PnPn2_Parallel
-
     - TEST_CASE=Eddy_EddyUv::test_PnPn_Parallel
     - TEST_CASE=Eddy_LegacySize::test_PnPn2_Parallel
     - TEST_CASE=Eddy_Rich::test_PnPn2_Parallel
+    - TEST_CASE=eddy_mv::test_PnPn_Parallel
 
     - TEST_CASE=Ethier::test_PnPn_Parallel
     - TEST_CASE=Ethier::test_PnPn2_Parallel
-#    - TEST_CASE=Ethier::test_PnPn2_Parallel PPLIST="PARRSB DPROCMAP" PARALLEL_PROCS=3 
+#    - TEST_CASE=Ethier::test_PnPn2_Parallel PARALLEL_PROCS=3 
 
     - TEST_CASE=KovStokes::test_PnPn2_Parallel
     - TEST_CASE=KovStokes::test_PnPn_Parallel
@@ -46,6 +44,8 @@ env:
     - TEST_CASE=lpm_one::test_PnPn_Parallel
     - TEST_CASE=lpm_two::test_PnPn_Parallel
 
+    - TEST_CASE=chan2d::test_PnPn_Parallel
+
 before_install: 
   - export ROOT_DIR=`pwd`
 

core/plan4.f

@@ -60,6 +60,7 @@ subroutine plan4 (igeom)
          call bcdirvc  (vx,vy,vz,v1mask,v2mask,v3mask) 
 
          ! compute pressure
+         call copy(prlag,pr,ntot1)
          if (icalld.eq.0) tpres=0.0
          icalld=icalld+1
          npres=icalld

examples

@@ -269,6 +269,55 @@ def test_PnPn2_Parallel(self):
     def tearDown(self):
         self.move_logs()
 
+
+#####################################################################
+
+class eddy_mv(NekTestCase):
+    example_subdir  = 'eddy_mv'
+    case_name        = 'eddy_mv'
+
+    def setUp(self):
+
+        # Default SIZE parameters. Can be overridden in test cases
+        self.size_params = dict(
+            ldim      = '2',
+            lx1       = '10',
+            lxd       = '14',
+            lx2       = 'lx1-0',
+            lelg      = '256',
+            lx1m      = 'lx1'
+        )
+
+        self.build_tools(['genmap'])
+        self.run_genmap()
+
+    @pn_pn_parallel
+    def test_PnPn_Parallel(self):
+        self.config_size()
+        self.build_nek()
+        self.run_nek(step_limit=None)
+
+        xerr = self.get_value_from_log('X err', column=-5, row=-1)
+        self.assertAlmostEqualDelayed(xerr, target_val=5.164689E-04, delta=1E-05, label='X err')
+
+        self.assertDelayedFailures()
+
+    @pn_pn_2_parallel
+    def test_PnPn2_Parallel(self):
+        self.size_params['lx2'] = 'lx1-2'
+        self.config_size()
+        self.build_nek()
+        self.run_nek(step_limit=None)
+
+        xerr = self.get_value_from_log('X err', column=-5, row=-1)
+        self.assertAlmostEqualDelayed(xerr, target_val=5.370512E-04, delta=1E-05, label='X err')
+
+        self.assertDelayedFailures()
+
+    def tearDown(self):
+        self.move_logs()
+
+
 #####################################################################
 
 class Eddy_LegacySize(NekTestCase):
@@ -1198,6 +1247,41 @@ def test_PnPn_Parallel(self):
     def tearDown(self):
         self.move_logs()
 
+#####################################################################
+
+class chan2d(NekTestCase):
+    example_subdir  = 'chan2d'
+    case_name        = 'chan2d'
+
+    def setUp(self):
+
+        # Default SIZE parameters. Can be overridden in test cases
+        self.size_params = dict(
+            ldim      = '2',
+            lx1       = '8',
+            lxd       = '12',
+            lx2       = 'lx1-0',
+            lelg      = '96',
+            lx1m      = 'lx1'
+        )
+
+        self.build_tools(['genmap'])
+        self.run_genmap()
+
+    @pn_pn_parallel
+    def test_PnPn_Parallel(self):
+        self.config_size()
+        self.build_nek()
+        self.run_nek(step_limit=None)
+
+        xerr = self.get_value_from_log('X err', column=-3, row=-1)
+        self.assertAlmostEqualDelayed(xerr, target_val=1.0005e-08, delta=1E-09, label='X err')
+
+        self.assertDelayedFailures()
+
+    def tearDown(self):
+        self.move_logs()
+
 ###############################################################
 
 if __name__ == '__main__':
@@ -1232,7 +1316,8 @@ def tearDown(self):
                Eddy_Neknek,
                Eddy_NeknekU,
                Eddy_EddyUv,
-               Eddy_LegacySize, 
+               Eddy_LegacySize,
+               eddy_mv, 
                Benard_Ray9, 
                KovStokes, 
                LowMachTest, 
@@ -1245,7 +1330,8 @@ def tearDown(self):
                IO_Test,
                InclDef,
                lpm_one,  
-               lpm_two   
+               lpm_two,
+               chan2d   
                ) 
 
     suite = unittest.TestSuite([unittest.TestLoader().loadTestsFromTestCase(t) for t in testList])