Merge pull request #63 from Nek5000/master

Replacing chnnel2D with dfh_cav to add tempersture adjoint (Nek5000#337)

.travis.yml

@@ -38,8 +38,8 @@ env:
 
     - TEST_CASE=MvCylCvode::test_PnPn_Parallel_Steps1e3   IFMPI=true F77=mpif77 CC=mpicc PPLIST="$PPLIST CVODE"
 
-    - TEST_CASE=LinChan_Dir::test_PnPn2_Parallel   IFMPI=true F77=mpif77 CC=mpicc
-    - TEST_CASE=LinChan_Adj::test_PnPn2_Parallel   IFMPI=true F77=mpif77 CC=mpicc
+    - TEST_CASE=LinCav_Dir::test_PnPn2_Parallel   IFMPI=true F77=mpif77 CC=mpicc
+    - TEST_CASE=LinCav_Adj::test_PnPn2_Parallel   IFMPI=true F77=mpif77 CC=mpicc
 
 before_install: 
   - export ROOT_DIR=`pwd`

short_tests/NekTests.py

@@ -939,19 +939,19 @@ def tearDown(self):
         self.move_logs()
 
 ####################################################################
-#  channel2D; lin_chan_dir.par, lin_chan_adj.par
+#  dfh_cav; lin_dfh_cav_dir.par, lin_dfh_cav_adj.par
 ####################################################################
-class LinChan_Dir(NekTestCase):
-    example_subdir = 'channel2D'
-    case_name = 'lin_chan_dir'
+class LinCav_Dir(NekTestCase):
+    example_subdir = 'dfh_cav'
+    case_name = 'lin_dfh_cav_dir'
 
     def setUp(self):
         self.size_params = dict(
             ldim      = '2',
-            lx1       = '10',
-            lxd       = '15',
+            lx1       = '9',
+            lxd       = '13',
             lx2       = 'lx1-2',
-            lelg      = '50',
+            lelg      = '500',
             lpelt     = 'lelt',
         )
 
@@ -962,40 +962,40 @@ def setUp(self):
     def test_PnPn2_Serial(self):
         self.size_params['lx2'] = 'lx1-2'
         self.config_size()
-        self.build_nek(usr_file='lin_chan')
+        self.build_nek(usr_file='lin_dfh_cav')
         self.run_nek(step_limit=None)
 
         omega = self.get_value_from_log('Energy', column=-3, row=-1)
-        self.assertAlmostEqualDelayed(omega, target_val=-1.2337E-03, delta=2E-06, label='growth rate')
+        self.assertAlmostEqualDelayed(omega, target_val=-7.57304E-03, delta=1E-06, label='growth rate')
 
         self.assertDelayedFailures()
 
     @pn_pn_2_parallel
     def test_PnPn2_Parallel(self):
         self.size_params['lx2'] = 'lx1-2'
         self.config_size()
-        self.build_nek(usr_file='lin_chan')
+        self.build_nek(usr_file='lin_dfh_cav')
         self.run_nek(step_limit=None)  
 
         omega = self.get_value_from_log('Energy', column=-3, row=-1)
-        self.assertAlmostEqualDelayed(omega, target_val=-1.2337E-03, delta=2E-06, label='growth rate')
+        self.assertAlmostEqualDelayed(omega, target_val=-7.57304E-03, delta=1E-06, label='growth rate')
 
         self.assertDelayedFailures()
 
     def tearDown(self):
         self.move_logs()
 
-class LinChan_Adj(NekTestCase):
-    example_subdir = 'channel2D'
-    case_name = 'lin_chan_adj'
+class LinCav_Adj(NekTestCase):
+    example_subdir = 'dfh_cav'
+    case_name = 'lin_dfh_cav_adj'
 
     def setUp(self):
         self.size_params = dict(
             ldim      = '2',
-            lx1       = '10',
-            lxd       = '15',
+            lx1       = '9',
+            lxd       = '13',
             lx2       = 'lx1-2',
-            lelg      = '50',
+            lelg      = '500',
             lpelt     = 'lelt',
         )
 
@@ -1006,23 +1006,23 @@ def setUp(self):
     def test_PnPn2_Serial(self):
         self.size_params['lx2'] = 'lx1-2'
         self.config_size()
-        self.build_nek(usr_file='lin_chan')
+        self.build_nek(usr_file='lin_dfh_cav')
         self.run_nek(step_limit=None)
 
         omega = self.get_value_from_log('Energy', column=-3, row=-1)
-        self.assertAlmostEqualDelayed(omega, target_val=-1.2337E-03, delta=2E-06, label='growth rate')
+        self.assertAlmostEqualDelayed(omega, target_val=-7.57304E-03, delta=1E-06, label='growth rate')
 
         self.assertDelayedFailures()
 
     @pn_pn_2_parallel
     def test_PnPn2_Parallel(self):
         self.size_params['lx2'] = 'lx1-2'
         self.config_size()
-        self.build_nek(usr_file='lin_chan')
+        self.build_nek(usr_file='lin_dfh_cav')
         self.run_nek(step_limit=None)  
 
         omega = self.get_value_from_log('Energy', column=-3, row=-1)
-        self.assertAlmostEqualDelayed(omega, target_val=-1.2337E-03, delta=2E-06, label='growth rate')
+        self.assertAlmostEqualDelayed(omega, target_val=-7.57304E-03, delta=1E-06, label='growth rate')
 
         self.assertDelayedFailures()
 

short_tests/channel2D/SIZE → short_tests/dfh_cav/SIZE

@@ -10,11 +10,11 @@ c
 
       ! BASIC
       parameter (ldim=2)               ! domain dimension (2 or 3)
-      parameter (lx1=10)               ! p-order (avoid uneven and values <6)
-      parameter (lxd=15)               ! p-order for over-integration (dealiasing) 
+      parameter (lx1=9)                ! p-order (avoid uneven and values <6)
+      parameter (lxd=13)               ! p-order for over-integration (dealiasing) 
       parameter (lx2=lx1-2)            ! p-order for pressure (lx1 or lx1-2)
 
-      parameter (lelg=50)              ! max total number of elements
+      parameter (lelg=500)           ! max total number of elements
       parameter (lpmin=1)              ! min MPI ranks
       parameter (lpmax=1024)           ! max MPI ranks
       parameter (ldimt=1)              ! max auxiliary fields (temperature + scalars)