Make field SPATIAL_METHOD in particle discretization mandatory

Author: jbreue16

src/libcadet/model/particle/GeneralRateParticle.cpp

@@ -116,16 +116,11 @@ namespace model
 
 		paramProvider.pushScope("discretization");
 
-		if (paramProvider.exists("SPATIAL_METHOD"))
-		{
-			const std::string parSpatialMethod = paramProvider.getString("SPATIAL_METHOD");
-			if (parSpatialMethod != "DG")
-				throw InvalidParameterException("Unsupported SPATIAL_METHOD '" + parSpatialMethod + "' for GeneralRateParticle. Only 'DG' is supported for now.");
-
+		const std::string parSpatialMethod = paramProvider.getString("SPATIAL_METHOD");
+		if (parSpatialMethod == "DG")
 			_parDiffOp = new parts::ParticleDiffusionOperatorDG();
-		}
 		else
-			_parDiffOp = new parts::ParticleDiffusionOperatorDG();
+			throw InvalidParameterException("Unsupported SPATIAL_METHOD '" + parSpatialMethod + "' for GeneralRateParticle. Only 'DG' and 'FV' are supported.");
 
 		paramProvider.popScope();
 

test/JsonTestModels.cpp

@@ -776,6 +776,7 @@ cadet::JsonParameterProvider createPulseInjectionColumn(const std::string& uoTyp
 				json disc;
 				json parDisc;
 				disc["SPATIAL_METHOD"] = spatialMethod;
+				parDisc["SPATIAL_METHOD"] = spatialMethod;
 
 				if (spatialMethod == "FV")
 				{
@@ -787,6 +788,7 @@ cadet::JsonParameterProvider createPulseInjectionColumn(const std::string& uoTyp
 
 					disc["NCOL"] = 10;
 					parDisc["NPAR"] = 4;
+					parDisc["SPATIAL_METHOD"] = spatialMethod;
 
 					disc["MAX_KRYLOV"] = 0;
 					disc["GS_TYPE"] = 1;
@@ -1078,6 +1080,7 @@ json createLinearBenchmarkColumnJson(bool dynamicBinding, bool nonBinding, const
 		json disc;
 		json parDisc;
 		disc["SPATIAL_METHOD"] = spatialMethod;
+		parDisc["SPATIAL_METHOD"] = spatialMethod;
 		if (model2D)
 			disc["RADIAL_DISC_TYPE"] = "EQUIDISTANT";
 

test/data/model_COL1D_GRM_dynLin_1comp_sensbenchmark2.json

@@ -72,6 +72,9 @@
       "VELOCITY": 0.000575,
       "particle_type_000": {
         "PARTICLE_TYPE": "GENERAL_RATE_PARTICLE",
+        "PAR_GEOM": [
+          "SPHERE"
+        ],
         "INIT_CP": [
           0.0
         ],
@@ -100,13 +103,9 @@
           ]
         },
         "discretization": {
-          "NPAR": 2,
-          "PAR_BOUNDARY_ORDER": 2,
+          "SPATIAL_METHOD": "DG",
           "PAR_DISC_TYPE": [
             "EQUIDISTANT_PAR"
-          ],
-          "PAR_GEOM": [
-            "SPHERE"
           ]
         }
       },

test/data/model_COL2D_GRM2Zone_noRadVar_SMA_LWE.json

@@ -235,11 +235,12 @@
                         10.0
                     ]
                 },
-                "discretization": {
-                    "PAR_DISC_TYPE": "EQUIDISTANT_PAR",
-                    "PAR_NELEM": 1,
-                    "PAR_POLYDEG": 3
-                }
+              "discretization": {
+                "SPATIAL_METHOD": "DG",
+                "PAR_DISC_TYPE": "EQUIDISTANT_PAR",
+                "PAR_NELEM": 1,
+                "PAR_POLYDEG": 3
+              }
             }
         },
         "unit_001": {

test/data/model_COL2D_GRMsd3Zone2ParType_dynLin_1Comp_benchmark1.json

@@ -231,13 +231,14 @@
                     "LIN_KA": 35.5,
                     "LIN_KD": 1.0
                 },
-                "discretization": {
-                    "PAR_DISC_TYPE": [
-                        "EQUIDISTANT_PAR"
-                    ],
-                    "PAR_NELEM": 1,
-                    "PAR_POLYDEG": 3
-                }
+              "discretization": {
+                "SPATIAL_METHOD": "DG",
+                "PAR_DISC_TYPE": [
+                  "EQUIDISTANT_PAR"
+                ],
+                "PAR_NELEM": 1,
+                "PAR_POLYDEG": 3
+              }
             },
             "particle_type_001": {
                 "ADSORPTION_MODEL": "LINEAR",