|
32 | 32 | #define CADET_BINDINGTEST_SINGLE_IMPL_NONBNDJACCONST_false(modelName, tagName, postFix, someNonBinding, stateSomeNon, configSomeNon) |
33 | 33 |
|
34 | 34 | #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) \ |
36 | 36 | { \ |
37 | 37 | const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \ |
38 | 38 | const double state3[] = BRACED_INIT_LIST stateSomeNon; \ |
|
68 | 68 | #define CADET_BINDINGTEST_SINGLE_IMPL_BNDVSNONBND_false(modelName, tagName, postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon) |
69 | 69 |
|
70 | 70 | #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) \ |
72 | 72 | { \ |
73 | 73 | const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \ |
74 | 74 | const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \ |
|
115 | 115 | * @param cmpBndVsNonbnd Determines whether a test for all-binding vs non-binding variant (Jacobian and residual) is created |
116 | 116 | */ |
117 | 117 | #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) \ |
119 | 119 | { \ |
120 | 120 | const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \ |
121 | 121 | const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \ |
|
180 | 180 | #define CADET_BINDINGTEST_MULTI(modelName, extModelName, postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon, extConfigAll, extConfigSomeNon, consInitTol, consInitCheckTol, usesNonBindingLiquidPhase, cmpBndVsNonbnd) \ |
181 | 181 | CADET_BINDINGTEST_SINGLE_IMPL(modelName, "[" modelName "]", postFix, allBinding, someNonBinding, stateAll, stateSomeNon, configAll, configSomeNon, consInitTol, consInitCheckTol, usesNonBindingLiquidPhase, cmpBndVsNonbnd) \ |
182 | 182 | 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 "]") \ |
184 | 184 | { \ |
185 | 185 | const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \ |
186 | 186 | const unsigned int nBound3[] = BRACED_INIT_LIST someNonBinding; \ |
|
235 | 235 | * @param consInitCheckTol Error tolerance for residual check in consistent initialization |
236 | 236 | */ |
237 | 237 | #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) \ |
239 | 239 | { \ |
240 | 240 | const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \ |
241 | 241 | const double state2[] = BRACED_INIT_LIST stateAll; \ |
|
277 | 277 | #define CADET_BINDINGTEST_ALLBINDING(modelName, extModelName, allBinding, stateAll, configAll, extConfigAll, consInitTol, consInitCheckTol) \ |
278 | 278 | CADET_BINDINGTEST_ALLBINDING_SINGLE_IMPL(modelName, "[" modelName "]", allBinding, stateAll, configAll, consInitTol, consInitCheckTol) \ |
279 | 279 | 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 "]") \ |
281 | 281 | { \ |
282 | 282 | const unsigned int nBound2[] = BRACED_INIT_LIST allBinding; \ |
283 | 283 | const double state2[] = BRACED_INIT_LIST stateAll; \ |
|
0 commit comments