Skip to content

Commit 0070c21

Browse files
committed
Add binding model tests to CI
1 parent c8c9c3f commit 0070c21

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,11 @@ jobs:
168168
${BUILD_DIR}/test/testRunner [CI]
169169
- name: Run CI test set II
170170
run: |
171-
${BUILD_DIR}/test/testRunner [CI_sensitivity1]
171+
${BUILD_DIR}/test/testRunner [CI_binding]
172172
- name: Run CI test set III
173+
run: |
174+
${BUILD_DIR}/test/testRunner [CI_sensitivity1]
175+
- name: Run CI test set IV
173176
run: |
174177
${BUILD_DIR}/test/testRunner [CI_sensitivity2]
175178
MacOS:

test/BindingModels.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define CADET_BINDINGTEST_SINGLE_IMPL_NONBNDJACCONST_false(modelName, tagName, postFix, someNonBinding, stateSomeNon, configSomeNon)
3333

3434
#define CADET_BINDINGTEST_SINGLE_IMPL_NONBNDJACCONST_true(modelName, tagName, postFix, someNonBinding, stateSomeNon, configSomeNon) \
35-
TEST_CASE(modelName " binding model consistency of non-binding Jacobian columns" postFix, "[BindingModel],[Jacobian]," tagName) \
35+
TEST_CASE(modelName " binding model consistency of non-binding Jacobian columns" postFix, "[BindingModel],[CI_binding],[Jacobian]," tagName) \
3636
{ \
3737
const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \
3838
const double state3[] = BRACED_INIT_LIST stateSomeNon; \
@@ -68,7 +68,7 @@
6868
#define CADET_BINDINGTEST_SINGLE_IMPL_BNDVSNONBND_false(modelName, tagName, postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon)
6969

7070
#define CADET_BINDINGTEST_SINGLE_IMPL_BNDVSNONBND_true(modelName, tagName, postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon) \
71-
TEST_CASE(modelName " binding model consistency of non-binding vs binding" postFix, "[BindingModel],[Jacobian]," tagName) \
71+
TEST_CASE(modelName " binding model consistency of non-binding vs binding" postFix, "[BindingModel],[CI_binding],[Jacobian]," tagName) \
7272
{ \
7373
const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \
7474
const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \
@@ -115,7 +115,7 @@
115115
* @param cmpBndVsNonbnd Determines whether a test for all-binding vs non-binding variant (Jacobian and residual) is created
116116
*/
117117
#define CADET_BINDINGTEST_SINGLE_IMPL(modelName, tagName, postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon, consInitTol, consInitCheckTol, usesNonBindingLiquidPhase, cmpBndVsNonbnd) \
118-
TEST_CASE(modelName " binding model analytic Jacobian vs AD" postFix, "[Jacobian],[AD],[BindingModel]," tagName) \
118+
TEST_CASE(modelName " binding model analytic Jacobian vs AD" postFix, "[Jacobian],[AD],[BindingModel],[CI_binding]," tagName) \
119119
{ \
120120
const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \
121121
const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \
@@ -180,7 +180,7 @@
180180
#define CADET_BINDINGTEST_MULTI(modelName, extModelName, postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon, extConfigAll, extConfigSomeNon, consInitTol, consInitCheckTol, usesNonBindingLiquidPhase, cmpBndVsNonbnd) \
181181
CADET_BINDINGTEST_SINGLE_IMPL(modelName, "[" modelName "]", postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon, consInitTol, consInitCheckTol, usesNonBindingLiquidPhase, cmpBndVsNonbnd) \
182182
CADET_BINDINGTEST_SINGLE_IMPL(extModelName, "[ExternalFunction],[" extModelName "]", postFix, allBinding, someNonBinding, stateAll, stateSomeNon, extConfigAll, extConfigSomeNon, consInitTol, consInitCheckTol, usesNonBindingLiquidPhase, cmpBndVsNonbnd) \
183-
TEST_CASE(modelName " binding model consistent with externally dependent variant" postFix, "[BindingModel],[ExternalFunction],[" modelName "],[" extModelName "]") \
183+
TEST_CASE(modelName " binding model consistent with externally dependent variant" postFix, "[BindingModel],[CI_binding],[ExternalFunction],[" modelName "],[" extModelName "]") \
184184
{ \
185185
const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \
186186
const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \
@@ -235,7 +235,7 @@
235235
* @param consInitCheckTol Error tolerance for residual check in consistent initialization
236236
*/
237237
#define CADET_BINDINGTEST_ALLBINDING_SINGLE_IMPL(modelName, tagName, allBinding, stateAll, configAll, consInitTol, consInitCheckTol) \
238-
TEST_CASE(modelName " binding model analytic Jacobian vs AD", "[Jacobian],[AD],[BindingModel]," tagName) \
238+
TEST_CASE(modelName " binding model analytic Jacobian vs AD", "[Jacobian],[AD],[BindingModel],[CI_binding]," tagName) \
239239
{ \
240240
const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \
241241
const double state2[] = BRACED_INIT_LIST stateAll; \
@@ -277,7 +277,7 @@
277277
#define CADET_BINDINGTEST_ALLBINDING(modelName, extModelName, allBinding, stateAll, configAll, extConfigAll, consInitTol, consInitCheckTol) \
278278
CADET_BINDINGTEST_ALLBINDING_SINGLE_IMPL(modelName, "[" modelName "]", allBinding, stateAll, configAll, consInitTol, consInitCheckTol) \
279279
CADET_BINDINGTEST_ALLBINDING_SINGLE_IMPL(extModelName, "[ExternalFunction],[" extModelName "]", allBinding, stateAll, extConfigAll, consInitTol, consInitCheckTol) \
280-
TEST_CASE(modelName " binding model consistent with externally dependent variant", "[BindingModel],[ExternalFunction],[" modelName "],[" extModelName "]") \
280+
TEST_CASE(modelName " binding model consistent with externally dependent variant", "[BindingModel],[CI_binding],[ExternalFunction],[" modelName "],[" extModelName "]") \
281281
{ \
282282
const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \
283283
const double state2[] = BRACED_INIT_LIST stateAll; \

0 commit comments

Comments
 (0)