Skip to content

Commit 883a095

Browse files
committed
CI: move crystallization tests to own testrunner call
1 parent db9d177 commit 883a095

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ jobs:
175175
- name: Run CI test set IV
176176
run: |
177177
${BUILD_DIR}/test/testRunner [CI_sensitivity2]
178+
- name: Run CI test set V
179+
run: |
180+
${BUILD_DIR}/test/testRunner [CI_crystallization]
178181
MacOS:
179182
runs-on: macos-latest
180183
strategy:

test/Crystallization.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const char* getTestDirectory();
2929
/*
3030
* Pure PBM tests
3131
*/
32-
TEST_CASE("Crystallization in a CSTR with initial distribution and growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI]")
32+
TEST_CASE("Crystallization in a CSTR with initial distribution and growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI_crystallization]")
3333
{
3434
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_PBM_growth_benchmark1.json");
3535
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_PBM_growth_benchmark1.h5");
@@ -40,7 +40,7 @@ TEST_CASE("Crystallization in a CSTR with initial distribution and growth", "[Cr
4040
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
4141
}
4242

43-
TEST_CASE("Crystallization in a CSTR with initial distribution and size-dependent growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI]")
43+
TEST_CASE("Crystallization in a CSTR with initial distribution and size-dependent growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI_crystallization]")
4444
{
4545
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_PBM_growthSizeDep_benchmark1.json");
4646
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_PBM_growthSizeDep_benchmark1.h5");
@@ -51,7 +51,7 @@ TEST_CASE("Crystallization in a CSTR with initial distribution and size-dependen
5151
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
5252
}
5353

54-
TEST_CASE("Crystallization in a CSTR with primary nucleation and growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI]")
54+
TEST_CASE("Crystallization in a CSTR with primary nucleation and growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI_crystallization]")
5555
{
5656
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_PBM_primaryNucleationAndGrowth_benchmark1.json");
5757
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_PBM_primaryNucleationAndGrowth_benchmark1.h5");
@@ -62,7 +62,7 @@ TEST_CASE("Crystallization in a CSTR with primary nucleation and growth", "[Crys
6262
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
6363
}
6464

65-
TEST_CASE("Crystallization in a CSTR with primary nucleation, growth and growth rate dispersion", "[Crystallization],[PBM],[Simulation],[Reference],[CI]")
65+
TEST_CASE("Crystallization in a CSTR with primary nucleation, growth and growth rate dispersion", "[Crystallization],[PBM],[Simulation],[Reference],[CI_crystallization]")
6666
{
6767
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_PBM_primaryNucleationGrowthGrowthRateDispersion_benchmark1.json");
6868
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_PBM_primaryNucleationGrowthGrowthRateDispersion_benchmark1.h5");
@@ -73,7 +73,7 @@ TEST_CASE("Crystallization in a CSTR with primary nucleation, growth and growth
7373
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
7474
}
7575

76-
TEST_CASE("Crystallization in a CSTR with primary and secondary nucleation and growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI]")
76+
TEST_CASE("Crystallization in a CSTR with primary and secondary nucleation and growth", "[Crystallization],[PBM],[Simulation],[Reference],[CI_crystallization]")
7777
{
7878
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_PBM_primarySecondaryNucleationAndGrowth_benchmark1.json");
7979
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_PBM_primarySecondaryNucleationAndGrowth_benchmark1.h5");
@@ -84,7 +84,7 @@ TEST_CASE("Crystallization in a CSTR with primary and secondary nucleation and g
8484
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
8585
}
8686

87-
TEST_CASE("Crystallization in a DPFR/LRM with primary and secondary nucleation and growth", "[CrysToFix0],[Crystallization],[PBM],[Simulation],[Reference],[CI]")
87+
TEST_CASE("Crystallization in a DPFR/LRM with primary and secondary nucleation and growth", "[CrysToFix0],[Crystallization],[PBM],[Simulation],[Reference],[CI_crystallization]")
8888
{
8989
const std::string& modelFilePath = std::string("/data/model_cry_DPFR_PBM_primarySecondaryNucleationGrowth_benchmark1.json");
9090
const std::string& refFilePath = std::string("/data/ref_cry_DPFR_PBM_primarySecondaryNucleationGrowth_benchmark1.h5");
@@ -95,7 +95,7 @@ TEST_CASE("Crystallization in a DPFR/LRM with primary and secondary nucleation a
9595
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
9696
}
9797

98-
TEST_CASE("Crystallization Jacobian verification for a CSTR with initial distribution and growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI]")
98+
TEST_CASE("Crystallization Jacobian verification for a CSTR with initial distribution and growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI_crystallization]")
9999
{
100100
// read json model setup file
101101
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_PBM_growth_benchmark1.json");
@@ -113,7 +113,7 @@ TEST_CASE("Crystallization Jacobian verification for a CSTR with initial distrib
113113
cadet::test::column::testJacobianAD(pp_setup, std::numeric_limits<float>::epsilon() * 100.0);
114114
}
115115

116-
TEST_CASE("Crystallization Jacobian verification for a CSTR with initial distribution and size-dependent growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI]")
116+
TEST_CASE("Crystallization Jacobian verification for a CSTR with initial distribution and size-dependent growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI_crystallization]")
117117
{
118118
// read json model setup file
119119
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_PBM_growthSizeDep_benchmark1.json");
@@ -131,7 +131,7 @@ TEST_CASE("Crystallization Jacobian verification for a CSTR with initial distrib
131131
cadet::test::column::testJacobianAD(pp_setup, std::numeric_limits<float>::epsilon() * 100.0);
132132
}
133133

134-
TEST_CASE("Crystallization Jacobian verification for a CSTR with primary nucleation and growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI]")
134+
TEST_CASE("Crystallization Jacobian verification for a CSTR with primary nucleation and growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI_crystallization],[testHere]")
135135
{
136136
// read json model setup file
137137
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_PBM_primaryNucleationAndGrowth_benchmark1.json");
@@ -149,7 +149,7 @@ TEST_CASE("Crystallization Jacobian verification for a CSTR with primary nucleat
149149
cadet::test::column::testJacobianAD(pp_setup, std::numeric_limits<float>::epsilon() * 100.0);
150150
}
151151

152-
TEST_CASE("Crystallization Jacobian verification for a CSTR with primary nucleation, growth and growth rate dispersion", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI]")
152+
TEST_CASE("Crystallization Jacobian verification for a CSTR with primary nucleation, growth and growth rate dispersion", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI_crystallization]")
153153
{
154154
// read json model setup file
155155
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_PBM_primaryNucleationGrowthGrowthRateDispersion_benchmark1.json");
@@ -167,7 +167,7 @@ TEST_CASE("Crystallization Jacobian verification for a CSTR with primary nucleat
167167
cadet::test::column::testJacobianAD(pp_setup, std::numeric_limits<float>::epsilon() * 100.0);
168168
}
169169

170-
TEST_CASE("Crystallization Jacobian verification for a CSTR with primary and secondary nucleation and growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI]")
170+
TEST_CASE("Crystallization Jacobian verification for a CSTR with primary and secondary nucleation and growth", "[Crystallization],[PBM],[UnitOp],[Jacobian],[CI_crystallization]")
171171
{
172172
// read json model setup file
173173
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_PBM_primarySecondaryNucleationAndGrowth_benchmark1.json");
@@ -185,7 +185,7 @@ TEST_CASE("Crystallization Jacobian verification for a CSTR with primary and sec
185185
cadet::test::column::testJacobianAD(pp_setup, std::numeric_limits<float>::epsilon() * 100.0);
186186
}
187187

188-
TEST_CASE("Crystallization Jacobian verification for a DPFR/LRM with primary and secondary nucleation and growth", "[Crystallization1],[UnitOp],[Jacobian],[CI]")
188+
TEST_CASE("Crystallization Jacobian verification for a DPFR/LRM with primary and secondary nucleation and growth", "[Crystallization1],[UnitOp],[Jacobian],[CI_crystallization]")
189189
{
190190
// read json model setup file
191191
const std::string& modelFileRelPath = std::string("/data/model_cry_DPFR_PBM_primarySecondaryNucleationGrowth_benchmark1.json");
@@ -205,7 +205,7 @@ TEST_CASE("Crystallization Jacobian verification for a DPFR/LRM with primary and
205205
/*
206206
* Pure aggregation tests
207207
*/
208-
TEST_CASE("Crystallization Aggregation in a CSTR", "[Crystallization],[Aggregation],[Simulation],[Reference],[CI]")
208+
TEST_CASE("Crystallization Aggregation in a CSTR", "[Crystallization],[Aggregation],[Simulation],[Reference],[CI_crystallization]")
209209
{
210210
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_aggregation_benchmark1.json");
211211
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_aggregation_benchmark1.h5");
@@ -216,7 +216,7 @@ TEST_CASE("Crystallization Aggregation in a CSTR", "[Crystallization],[Aggregati
216216
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
217217
}
218218

219-
TEST_CASE("Crystallization Jacobian verification for Aggregation in a CSTR", "[Crystallization],[Aggregation],[UnitOp],[Jacobian],[CI]")
219+
TEST_CASE("Crystallization Jacobian verification for Aggregation in a CSTR", "[Crystallization],[Aggregation],[UnitOp],[Jacobian],[CI_crystallization]")
220220
{
221221
// read json model setup file
222222
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_aggregation_benchmark1.json");
@@ -235,7 +235,7 @@ TEST_CASE("Crystallization Jacobian verification for Aggregation in a CSTR", "[C
235235
/*
236236
* Pure fragmentation/breakage tests
237237
*/
238-
TEST_CASE("Crystallization Fragmentation in a CSTR", "[Crystallization],[Fragmentation],[Simulation],[Reference],[CI]")
238+
TEST_CASE("Crystallization Fragmentation in a CSTR", "[Crystallization],[Fragmentation],[Simulation],[Reference],[CI_crystallization]")
239239
{
240240
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_fragmentation_benchmark1.json");
241241
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_fragmentation_benchmark1.h5");
@@ -246,7 +246,7 @@ TEST_CASE("Crystallization Fragmentation in a CSTR", "[Crystallization],[Fragmen
246246
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
247247
}
248248

249-
TEST_CASE("Crystallization Jacobian verification for Fragmentation in a CSTR", "[Crystallization],[Fragmentation],[UnitOp],[Jacobian],[CI]")
249+
TEST_CASE("Crystallization Jacobian verification for Fragmentation in a CSTR", "[Crystallization],[Fragmentation],[UnitOp],[Jacobian],[CI_crystallization]")
250250
{
251251
// read json model setup file
252252
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_fragmentation_benchmark1.json");
@@ -265,7 +265,7 @@ TEST_CASE("Crystallization Jacobian verification for Fragmentation in a CSTR", "
265265
/*
266266
* Combined fragmentation, breakage tests
267267
*/
268-
TEST_CASE("Crystallization combined Aggregation and Fragmentation in a CSTR", "[Crystallization],[AggFrag],[Simulation],[Reference],[CI]")
268+
TEST_CASE("Crystallization combined Aggregation and Fragmentation in a CSTR", "[Crystallization],[AggFrag],[Simulation],[Reference],[CI_crystallization]")
269269
{
270270
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_aggFrag_benchmark1.json");
271271
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_aggFrag_benchmark1.h5");
@@ -276,7 +276,7 @@ TEST_CASE("Crystallization combined Aggregation and Fragmentation in a CSTR", "[
276276
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
277277
}
278278

279-
TEST_CASE("Crystallization Jacobian verification for combined Aggregation and Fragmentation in a CSTR", "[Crystallization],[AggFrag],[UnitOp],[Jacobian],[CI]")
279+
TEST_CASE("Crystallization Jacobian verification for combined Aggregation and Fragmentation in a CSTR", "[Crystallization],[AggFrag],[UnitOp],[Jacobian],[CI_crystallization]")
280280
{
281281
// read json model setup file
282282
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_aggFrag_benchmark1.json");
@@ -295,7 +295,7 @@ TEST_CASE("Crystallization Jacobian verification for combined Aggregation and Fr
295295
/*
296296
* Combined PBM, fragmentation, breakage tests
297297
*/
298-
TEST_CASE("Crystallization combined PBM, Aggregation and Fragmentation in a CSTR", "[Crystallization],[PBMAggFrag],[Simulation],[Reference],[CI]")
298+
TEST_CASE("Crystallization combined PBM, Aggregation and Fragmentation in a CSTR", "[Crystallization],[PBMAggFrag],[Simulation],[Reference],[CI_crystallization]")
299299
{
300300
const std::string& modelFilePath = std::string("/data/model_cry_CSTR_PBM_Agg_Frag_benchmark1.json");
301301
const std::string& refFilePath = std::string("/data/ref_cry_CSTR_PBM_Agg_Frag_benchmark1.h5");
@@ -306,7 +306,7 @@ TEST_CASE("Crystallization combined PBM, Aggregation and Fragmentation in a CSTR
306306
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
307307
}
308308

309-
TEST_CASE("Crystallization Jacobian verification for combined PBM, Aggregation and Fragmentation in a CSTR", "[Crystallization],[PBMAggFrag],[UnitOp],[Jacobian],[CI]")
309+
TEST_CASE("Crystallization Jacobian verification for combined PBM, Aggregation and Fragmentation in a CSTR", "[Crystallization],[PBMAggFrag],[UnitOp],[Jacobian],[CI_crystallization]")
310310
{
311311
// read json model setup file
312312
const std::string& modelFileRelPath = std::string("/data/model_cry_CSTR_PBM_Agg_Frag_benchmark1.json");
@@ -325,7 +325,7 @@ TEST_CASE("Crystallization Jacobian verification for combined PBM, Aggregation a
325325
/*
326326
* Combined PBM, aggregation test in a DPFR
327327
*/
328-
TEST_CASE("Crystallization combined PBM and Aggregation in a DPFR", "[Crystallization],[DPFR_PBMAgg],[Simulation],[Reference],[CI]")
328+
TEST_CASE("Crystallization combined PBM and Aggregation in a DPFR", "[Crystallization],[DPFR_PBMAgg],[Simulation],[Reference],[CI_crystallization]")
329329
{
330330
const std::string& modelFilePath = std::string("/data/model_cry_DPFR_PBM_aggregation_benchmark1.json");
331331
const std::string& refFilePath = std::string("/data/ref_cry_DPFR_PBM_aggregation_benchmark1.h5");
@@ -336,7 +336,7 @@ TEST_CASE("Crystallization combined PBM and Aggregation in a DPFR", "[Crystalliz
336336
cadet::test::column::testReferenceBenchmark(modelFilePath, refFilePath, "001", absTol, relTol, disc, false);
337337
}
338338

339-
TEST_CASE("Crystallization Jacobian verification for combined PBM and Aggregation in a DPFR", "[Crystallization],[DPFR_PBMAgg],[UnitOp],[Jacobian],[CI]")
339+
TEST_CASE("Crystallization Jacobian verification for combined PBM and Aggregation in a DPFR", "[Crystallization],[DPFR_PBMAgg],[UnitOp],[Jacobian],[CI_crystallization]")
340340
{
341341
// read json model setup file
342342
const std::string& modelFileRelPath = std::string("/data/model_cry_DPFR_PBM_aggregation_benchmark1.json");

0 commit comments

Comments
 (0)