From 5128d9f43e3fab3b7ddd3edf76ead0f484716c16 Mon Sep 17 00:00:00 2001
From: Felix Weinhardt <felixw@picard.iws.uni-stuttgart.de>
Date: Thu, 8 Nov 2018 15:48:36 +0100
Subject: [PATCH] [1pncmin] tests changed
created folder:
- nonisothermal
note: for now there is now isothermal, but in order to rename the files main.cc problem.hh etc. the foldernames should specify whats going on in the test
---
.../1pncmin/implicit/CMakeLists.txt | 22 +------------------
.../implicit/nonisothermal/CMakeLists.txt | 20 +++++++++++++++++
.../main.cc} | 2 +-
.../{ => nonisothermal}/modifiedcao.hh | 0
.../params.input} | 0
.../problem.hh} | 4 ++--
.../reaction.hh} | 0
.../spatialparams.hh} | 0
...h.vtu => test_1pncminni_box-reference.vtu} | 0
9 files changed, 24 insertions(+), 24 deletions(-)
create mode 100644 test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
rename test/porousmediumflow/1pncmin/implicit/{test_1pncminni_fv.cc => nonisothermal/main.cc} (99%)
rename test/porousmediumflow/1pncmin/implicit/{ => nonisothermal}/modifiedcao.hh (100%)
rename test/porousmediumflow/1pncmin/implicit/{test_1pncminni_fv.input => nonisothermal/params.input} (100%)
rename test/porousmediumflow/1pncmin/implicit/{thermochemproblem.hh => nonisothermal/problem.hh} (99%)
rename test/porousmediumflow/1pncmin/implicit/{thermochemreaction.hh => nonisothermal/reaction.hh} (100%)
rename test/porousmediumflow/1pncmin/implicit/{thermochemspatialparams.hh => nonisothermal/spatialparams.hh} (100%)
rename test/references/{test_1pncmin-00064_batch.vtu => test_1pncminni_box-reference.vtu} (100%)
diff --git a/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
index b65a2eeb7d..79466ced7f 100644
--- a/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
@@ -1,21 +1 @@
-add_input_file_links()
-
-dune_add_test(NAME test_1pncminni_box
- SOURCES test_1pncminni_fv.cc
- COMPILE_DEFINITIONS TYPETAG=ThermoChemBox
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_1pncmin-00064_batch.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1pncmintest_batch_box-00065.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncminni_box test_1pncminni_fv.input -Problem.Name 1pncmintest_batch_box"
- --zeroThreshold {"precipVolFrac_CaOH2":5e-6})
-
-#install sources
-install(FILES
-modifiedcao.hh
-modifiedsteamn2cao2h2.hh
-thermochemproblem.hh
-thermochemspatialparams.hh
-thermochemreaction.hh
-test_1pncminni_fv.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/1pncmin)
+add_subdirectory("nonisothermal")
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
new file mode 100644
index 0000000000..0f9f73e76b
--- /dev/null
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_input_file_links()
+
+dune_add_test(NAME test_1pncminni_box
+ SOURCES main.cc
+ COMPILE_DEFINITIONS TYPETAG=ThermoChemBox
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_1pncminni_box-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_1pncminni_box-00065.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncminni_box params.input -Problem.Name test_1pncminni_box"
+ --zeroThreshold {"precipVolFrac_CaOH2":5e-6})
+
+#install sources
+install(FILES
+modifiedcao.hh
+problem.hh
+spatialparams.hh
+reaction.hh
+main.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/1pncmin/implicit/nonisothermal)
diff --git a/test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.cc b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
similarity index 99%
rename from test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.cc
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
index d6218e0144..ca43aac356 100644
--- a/test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.cc
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
@@ -38,7 +38,7 @@
#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/grid/gridmanager.hh>
-#include "thermochemproblem.hh"
+#include "problem.hh"
/*!
* \brief Provides an interface for customizing error messages associated with
diff --git a/test/porousmediumflow/1pncmin/implicit/modifiedcao.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/modifiedcao.hh
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/modifiedcao.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/modifiedcao.hh
diff --git a/test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.input b/test/porousmediumflow/1pncmin/implicit/nonisothermal/params.input
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/test_1pncminni_fv.input
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/params.input
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
similarity index 99%
rename from test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
index 3da3bb8f1a..d5c25b0c48 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
@@ -38,8 +38,8 @@
#include <dumux/material/components/cao2h2.hh>
#include <dumux/material/solidsystems/compositionalsolidphase.hh>
-#include "thermochemspatialparams.hh"
-#include "thermochemreaction.hh"
+#include "spatialparams.hh"
+#include "reaction.hh"
#include "modifiedcao.hh"
namespace Dumux {
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemreaction.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/reaction.hh
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/thermochemreaction.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/reaction.hh
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh
similarity index 100%
rename from test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
rename to test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh
diff --git a/test/references/test_1pncmin-00064_batch.vtu b/test/references/test_1pncminni_box-reference.vtu
similarity index 100%
rename from test/references/test_1pncmin-00064_batch.vtu
rename to test/references/test_1pncminni_box-reference.vtu
--
GitLab