Nonorthogonal with minimal differential operators MMS test.

.pip_install_for_tests.sh

@@ -19,9 +19,8 @@ do
     fi
 done
 
-# Install Hermes-3
-git clone https://github.com/boutproject/xhermes.git
-cd xhermes
-pip3 install --user .
-cd ..
+# Install xBOUT to make sure we get latest master version
+pip3 install  --user git+https://github.com/boutproject/xBOUT.git
+# Install xHermes for Hermes-3 python
+pip3 install  --user git+https://github.com/boutproject/xhermes.git
 

CMakeLists.txt

@@ -245,6 +245,22 @@ if(HERMES_TESTS)
     add_test(NAME hermes_unit_tests COMMAND hermes_unit_tests)
     target_link_libraries(hermes_unit_tests PRIVATE gtest bout++::bout++ hermes-3-lib)
   endif()
+
+# Method of manufactured solutions (MMS) tests
+  option(HERMES_DIVOPS_MMS_TESTS "Build the differential operator MMS tests" ON)
+  if(HERMES_DIVOPS_MMS_TESTS)
+    #TEST_SOURCES=
+    add_executable(hermes_mms_tests
+                   tests/mms/main.cxx)
+                   #${TEST_SOURCES})
+    target_link_libraries(hermes_mms_tests PRIVATE gtest bout++::bout++ hermes-3-lib)
+    add_test(NAME differential_operators_mms_orthogonal
+           WORKING_DIRECTORY tests/mms/
+           COMMAND python3 orthogonal_test.py)
+    add_test(NAME differential_operators_mms_nonorthogonal
+           WORKING_DIRECTORY tests/mms/
+           COMMAND python3 nonorthogonal_test.py)
+  endif()
 endif()
 
 # Compile-time options

docs/sphinx/installation_using_spack.rst

@@ -93,10 +93,14 @@ Make a virtual python environment with
    source /path/to/your-python-env/bin/activate
 
 To install the required python libraries later.
-You should install ``xhermes`` https://github.com/boutproject/xhermes with
+You should install ``xbout`` https://github.com/boutproject/xBOUT 
+and ``xhermes`` https://github.com/boutproject/xhermes with
 
 .. code-block:: bash
 
+   git clone https://github.com/boutproject/xBOUT.git
+   cd xBOUT
+   python3 -m pip install -e .
    git clone https://github.com/boutproject/xhermes.git
    cd xhermes
    python3 -m pip install -e .
@@ -142,7 +146,7 @@ Now we are ready to install Hermes-3. First use
    git clone https://github.com/bendudson/hermes-3.git
    cd hermes-3
 
-Now run
+Now run the configuration command
 
 .. code-block:: bash
 
@@ -161,6 +165,8 @@ Test the install by
    cd build
    ctest
 
+To build in debug mode, use the flag ``-DCMAKE_BUILD_TYPE=Debug`` at the 
+configuration step above.
 Export a line like the following to your python path to make sure that 
 python functions are available for post processing
 

include/div_ops.hxx

@@ -69,6 +69,15 @@ const Field3D Div_a_Grad_perp_upwind_flows(const Field3D& a, const Field3D& f, F
 const Field3D Div_par_K_Grad_par_mod(const Field3D& k, const Field3D& f, Field3D& flow_ylow,
                                      bool bndry_flux = true);
 
+/*!
+ * Div ( a Grad_perp(f) ) -- ∇⊥ ( a ⋅ ∇⊥ f) -- Vorticity
+ *
+ * This version includes corrections for non-orthogonal meshes
+ * in which the g12 and g13 components can be non-zero
+ * i.e. X-Y, X-Z and Y-Z coordinates can all be non-orthogonal.
+ */
+Field3D Div_a_Grad_perp_nonorthog(const Field3D& a, const Field3D& x);
+
 namespace FV {
 
 /// Superbee limiter