Check the grid validity with PSDM validation utils

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added listeners to DBFS tests to check the result output and check the handling of failed power flows [#269](https://github.com/ie3-institute/simona/issues/269)
 - Added DBFS test with participant load and added testing for FinishGridSimulationTrigger [#281](https://github.com/ie3-institute/simona/issues/281)
 - Added Dependabot updates to sphinx/readthedocs dependencies [#448](https://github.com/ie3-institute/simona/issues/448)
+- Check for grid validity with PSDM `ValidationUtils` [#460](https://github.com/ie3-institute/simona/issues/460)
 
 ### Changed
 - Re-organizing test resources into their respective packages [#105](https://github.com/ie3-institute/simona/issues/105)

src/main/scala/edu/ie3/simona/io/grid/GridProvider.scala

@@ -6,10 +6,13 @@
 
 package edu.ie3.simona.io.grid
 
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
+import com.typesafe.scalalogging.LazyLogging
+import edu.ie3.datamodel.io.source.csv.CsvJointGridContainerSource
 import edu.ie3.datamodel.models.input.container.JointGridContainer
+import edu.ie3.datamodel.utils.validation.ValidationUtils
 import edu.ie3.simona.config.SimonaConfig
-import edu.ie3.simona.exceptions.InitializationException
+
+import scala.util.{Failure, Try}
 
 /** Takes [[edu.ie3.simona.config.SimonaConfig.Simona.Input.Grid.Datasource]] as
   * input and provides a [[JointGridContainer]] based on the configuration incl.
@@ -18,7 +21,7 @@ import edu.ie3.simona.exceptions.InitializationException
   * @version 0.1
   * @since 28.04.20
   */
-object GridProvider {
+object GridProvider extends LazyLogging {
 
   def gridFromConfig(
       simulationName: String,
@@ -29,18 +32,20 @@ object GridProvider {
       case GridSourceType.CSV =>
         gridDataSource.csvParams match {
           case Some(params) =>
-            CsvGridSource
-              .readGrid(
-                simulationName,
-                params.csvSep,
-                params.directoryPath,
-                new FileNamingStrategy()
-              )
-              .getOrElse(
-                throw new InitializationException(
-                  "Error while initializing CsvGridSource! Cannot proceed without a valid GridSource!"
+            val jointGridContainer = CsvJointGridContainerSource.read(
+              simulationName,
+              params.csvSep,
+              params.directoryPath
+            )
+
+            Try.apply(ValidationUtils.check(jointGridContainer)) match {
+              case Failure(exception) =>
+                logger.warn(
+                  s"Error while initializing CsvGridSource! Cannot proceed without a valid GridSource!",
+                  exception
                 )
-              )
+            }
+            jointGridContainer
           case None =>
             throw new RuntimeException(
               "CSVGridSource requires csv params to be set!"

src/test/groovy/edu/ie3/simona/model/participant/PvModelIT.groovy

@@ -6,9 +6,9 @@
 
 package edu.ie3.simona.model.participant
 
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
+import edu.ie3.datamodel.io.source.csv.CsvJointGridContainerSource
+import edu.ie3.datamodel.models.input.container.JointGridContainer
 import edu.ie3.datamodel.models.input.system.PvInput
-import edu.ie3.simona.io.grid.CsvGridSource
 import edu.ie3.simona.model.SystemComponent
 import edu.ie3.simona.model.participant.control.QControl
 import edu.ie3.simona.ontology.messages.services.WeatherMessage
@@ -127,9 +127,8 @@ trait PvModelITHelper {
   HashMap<String, PvModel> createPvModels() {
     "load the grid input data from the corresponding resources folder"
 
-    def csvGridSource = CsvGridSource.readGrid("it_grid", ";",
-        this.getClass().getResource("_pv/it/grid_data").file,
-        new FileNamingStrategy())
+    def csvGridSource = CsvJointGridContainerSource.read("it_grid", ";",
+        this.getClass().getResource("_pv/it/grid_data").file)
 
     def simulationStartDate = TimeUtil.withDefaults.toZonedDateTime("2011-01-01 00:00:00")
     def simulationEndDate = TimeUtil.withDefaults.toZonedDateTime("2012-01-01 00:00:00")