Fix testcases with the new inflow BC. This includes:

- Usage of numdiff program rather than diff. This is because with the new inflow-model, some eorrors change slightly. We now compare with an absolute tolerance of 1E-10 because that works fine
- Installation of numdiff within Dockerfile
- Minor style changes in all input files

Dockerfile

@@ -24,6 +24,11 @@ RUN cd /usr/local && \
     tar -xf gmsh-${GMSH_VERSION}-Linux64-sdk.tgz
 ENV PATH=/usr/local/gmsh-${GMSH_VERSION}-Linux64-sdk/bin:$PATH
 
+# Install additional programs
+RUN apt-get update && apt-get install -y \
+    # someotherpackages \
+    numdiff
+
 # Install any needed packages specified in requirements.txt
 # RUN pip install --trusted-host pypi.python.org -r requirements.txt
 COPY requirements.txt /tmp/

tests/coupled/inputs/1_coeffs_sources_rot_p1p1p1p1p1_stab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": -10.0
+    theta_w: 1.0
+    v_t: -10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "0"

tests/coupled/inputs/1_coeffs_sources_rot_p2p2p2p2p2_stab.yml

@@ -64,13 +64,19 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": -10.0
+    theta_w: 1.0
+    v_t: -10
+    v_n: 0
+    p_w: 0
+    gamma: 0
+
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
+
 
 # heat source
 heat_source: "0"

tests/coupled/test_coupled_convergence.py

@@ -24,11 +24,20 @@ class TestCoupledConvergence(object):
 
     def compare_errors(self, errorsfile, ref_errorsfile):
         """
-        Check against reference errors.
+        Check against reference errors. Compares absolute differences.
+        Absolute Error allowed: ``1E-10``
         Return exception if diff returns with !=0
+        A comparison for complete equalness can be obtained with:
+
+        .. code-block:: python
+
+            subprocess.check_call([
+                "diff", "-u", "--strip-trailing-cr", errorsfile, ref_errorsfile
+            ], cwd=self.working_dir)
         """
         subprocess.check_call([
-            "diff", "-u", "--strip-trailing-cr", errorsfile, ref_errorsfile
+            "numdiff", "-s", "\"\n\r ,\"", "-a", "1E-10",
+            errorsfile, ref_errorsfile
         ], cwd=self.working_dir)
 
     # @pytest.fixture(scope="module", autouse=True)

tests/heat/inputs/01_coeffs_p1p1_stab.yml

@@ -62,13 +62,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": 10.0
+    theta_w: 1.0
+    v_t: 10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/heat/inputs/01_coeffs_p1p2_nostab.yml

@@ -62,13 +62,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": 10.0
+    theta_w: 1.0
+    v_t: 10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/heat/inputs/01_coeffs_p2p2_stab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": 10.0
+    theta_w: 1.0
+    v_t: 10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/heat/inputs/01_nocoeffs_p1p2_nostab.yml

@@ -62,13 +62,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": 10.0
+    theta_w: 1.0
+    v_t: 10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/heat/inputs/10_coeffs_p2p2_stab.yml

@@ -62,13 +62,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": 10.0
+    theta_w: 1.0
+    v_t: 10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/heat/test_heat_convergence.py

@@ -24,11 +24,20 @@ class TestHeatConvergence(object):
 
     def compare_errors(self, errorsfile, ref_errorsfile):
         """
-        Check against reference errors.
+        Check against reference errors. Compares absolute differences.
+        Absolute Error allowed: ``1E-10``
         Return exception if diff returns with !=0
+        A comparison for complete equalness can be obtained with:
+
+        .. code-block:: python
+
+            subprocess.check_call([
+                "diff", "-u", "--strip-trailing-cr", errorsfile, ref_errorsfile
+            ], cwd=self.working_dir)
         """
         subprocess.check_call([
-            "diff", "-u", "--strip-trailing-cr", errorsfile, ref_errorsfile
+            "numdiff", "-s", "\"\n\r ,\"", "-a", "1E-10",
+            errorsfile, ref_errorsfile
         ], cwd=self.working_dir)
 
     # @pytest.fixture(scope="module", autouse=True)

tests/stress/inputs/01_nosource_rot_p1p1p1_stab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": -10.0
+    theta_w: 1.0
+    v_t: -10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/stress/inputs/01_source_norot_p1p1p1_stab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": 0.0
+    theta_w: 1.0
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/stress/inputs/01_source_rot_p1p1p1_stab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": -10.0
+    theta_w: 1.0
+    v_t: -10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/stress/inputs/01_source_rot_p1p2p4_nostab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": -10.0
+    theta_w: 1.0
+    v_t: -10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/stress/inputs/01_source_rot_p2p2p2_stab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": -10.0
+    theta_w: 1.0
+    v_t: -10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/stress/inputs/10_source_rot_p1p1p1_stab.yml

@@ -64,13 +64,17 @@ xi_tilde: 1.0
 
 bcs:
   3000:
-    "name": "inner"
-    "theta_w": 1.0
-    "v_t": -10.0
+    theta_w: 1.0
+    v_t: -10
+    v_n: 0
+    p_w: 0
+    gamma: 0
   3100:
-    "name": "outer"
-    "theta_w": 0.5
-    "v_t": 0.0
+    theta_w: 0.5
+    v_t: 0
+    v_n: 0
+    p_w: 0
+    gamma: 0
 
 # heat source
 heat_source: "2.0 - 1.0 * pow(sqrt(pow(x[0],2)+pow(x[1],2)),2)"

tests/stress/test_stress_convergence.py

@@ -24,11 +24,20 @@ class TestStressConvergence(object):
 
     def compare_errors(self, errorsfile, ref_errorsfile):
         """
-        Check against reference errors.
+        Check against reference errors. Compares absolute differences.
+        Absolute Error allowed: ``1E-10``
         Return exception if diff returns with !=0
+        A comparison for complete equalness can be obtained with:
+
+        .. code-block:: python
+
+            subprocess.check_call([
+                "diff", "-u", "--strip-trailing-cr", errorsfile, ref_errorsfile
+            ], cwd=self.working_dir)
         """
         subprocess.check_call([
-            "diff", "-u", "--strip-trailing-cr", errorsfile, ref_errorsfile
+            "numdiff", "-s", "\"\n\r ,\"", "-a", "1E-10",
+            errorsfile, ref_errorsfile
         ], cwd=self.working_dir)
 
     # @pytest.fixture(scope="module", autouse=True)