feat(ana3AIMEC): add display labels for runout resolution types

feat(aimec): multi-layer simulation handling and input validation

- Added support for resolving base `resType` to layer-suffixed columns in multi-layer simulations using the new `resolveResTypeColumn` function.
- Introduced `computeBaseResTypeList` to validate and compute base `resType` names available for all simulations.
- Updated `checkAIMECinputs` function to handle both single-layer and multi-layer simulations, with input validation and error handling when `runoutLayer` is not configured.

refactor(aimec, com8MoTPSA): adjust logic and remove redundant parameters

- Removed default fallback logic for `runoutResType` assignments in `ana3AIMEC.py`
- Eliminated `simType` parameter from `copyRawToLayerPeakFiles` in `com8MoTPSA.py`

Author: fso42

avaframe/ana3AIMEC/aimecTools.py

@@ -66,7 +66,7 @@ def fullAimecAnalysis(avalancheDir, cfg, inputDir='', demFileName=''):
                 'demFileName': demFileName}
     pathDict = aimecTools.readAIMECinputs(avalancheDir, pathDict, cfgSetup.getboolean('defineRunoutArea'),
                                           dirName=anaMod)
-    pathDict = aimecTools.checkAIMECinputs(cfgSetup, pathDict)
+    pathDict = aimecTools.checkAIMECinputs(cfgSetup, pathDict, inputsDF)
     log.info("Running ana3AIMEC model on test case DEM \n %s \n with profile \n %s ",
              pathDict['demSource'], pathDict['profileLayer'])
     # Run AIMEC postprocessing
@@ -117,9 +117,10 @@ def mainAIMEC(pathDict, inputsDF, cfg):
     # get hash of the reference
     refSimRowHash = pathDict['refSimRowHash']
     # read reference file and raster and config
-    # use resolved runoutResType from pathDict if available (layer-suffixed for multi-layer)
-    runoutResType = pathDict.get('runoutResType', cfgSetup['runoutResType'])
-    refResultSource = inputsDF.loc[refSimRowHash, runoutResType]
+    runoutResType = pathDict['runoutResType']
+    runoutLayer = pathDict.get('runoutLayer', '')
+    refResTypeCol = aimecTools.resolveResTypeColumn(inputsDF.loc[refSimRowHash], runoutResType, runoutLayer)
+    refResultSource = inputsDF.loc[refSimRowHash, refResTypeCol]
     refRaster = IOf.readRaster(refResultSource)
     refRasterData = refRaster['rasterData']
     refHeader = refRaster['header']
@@ -211,7 +212,14 @@ def mainAIMEC(pathDict, inputsDF, cfg):
         compResTypes1 = cfgPlots['compResType1'].split('|')
         compResTypes2 = cfgPlots['compResType2'].split('|')
         for indRes, compResType in enumerate(compResTypes1):
-            outAimec.plotMaxValuesComp(pathDict, resAnalysisDF, compResType, compResTypes2[indRes],
+            compResType2 = compResTypes2[indRes]
+            missingCols = [c for c in [compResType, compResType2] if c not in resAnalysisDF.columns]
+            if missingCols:
+                log.warning("Skipping comparison plot %s vs %s: columns %s not available in results "
+                            "(result type not in resTypeList for all simulations)",
+                            compResType, compResType2, missingCols)
+                continue
+            outAimec.plotMaxValuesComp(pathDict, resAnalysisDF, compResType, compResType2,
                                        hue=cfgPlots['scenarioName'])
 
     return rasterTransfo, resAnalysisDF, plotDict, newRasters
@@ -333,13 +341,15 @@ def postProcessAIMEC(cfg, rasterTransfo, pathDict, resAnalysisDF, newRasters, ti
     flagMass = cfgFlags.getboolean('flagMass')
     refSimRowHash = pathDict['refSimRowHash']
     resTypeList = pathDict['resTypeList']
+    runoutLayer = pathDict.get('runoutLayer', '')
 
     # apply domain transformation
     log.info('Analyzing data in path coordinate system')
 
     for resType in resTypeList:
         log.debug("Assigning %s data to deskewed raster" % resType)
-        inputFiles = resAnalysisDF.loc[simRowHash, resType]
+        resTypeCol = aimecTools.resolveResTypeColumn(resAnalysisDF.loc[simRowHash], resType, runoutLayer)
+        inputFiles = resAnalysisDF.loc[simRowHash, resTypeCol]
         if isinstance(inputFiles, pathlib.PurePath):
             rasterData = IOf.readRaster(inputFiles)
             newRaster = aimecTools.transform(rasterData, inputFiles, rasterTransfo, interpMethod)
@@ -382,20 +392,19 @@ def postProcessAIMEC(cfg, rasterTransfo, pathDict, resAnalysisDF, newRasters, ti
                 simRowHash, rasterTransfo, newRaster, resType, resAnalysisDF
             )
 
-    # compute runout based on resolved runoutResType (layer-suffixed for multi-layer)
-    resolvedRunoutResType = pathDict.get('runoutResType', cfgSetup['runoutResType'])
+    # compute runout based on base runoutResType (resolver handles per-row column access)
+    runoutResType = pathDict['runoutResType']
     resAnalysisDF = aimecTools.computeRunOut(cfgSetup, rasterTransfo, resAnalysisDF, newRasters, simRowHash,
-                                            runoutResType=resolvedRunoutResType)
+                                            runoutResType=runoutResType)
     runoutLine = aimecTools.computeRunoutLine(cfgSetup, rasterTransfo, newRasters, simRowHash, 'simulation', name='',
-                                             runoutResType=resolvedRunoutResType)
+                                             runoutResType=runoutResType)
 
     if 'refPoint' in refDataTransformed:
         # compute differences between runout points
         resAnalysisDF = aimecTools.computeRunoutPointDiff(resAnalysisDF, refDataTransformed['refPoint'], simRowHash)
 
     # plot comparison between runout lines
-    resolvedRunoutResType = pathDict.get('runoutResType', cfgSetup['runoutResType'])
-    outAimec.compareRunoutLines(cfgSetup, refDataTransformed, newRasters['newRaster'+resolvedRunoutResType.upper()],
+    outAimec.compareRunoutLines(cfgSetup, refDataTransformed, newRasters['newRaster'+runoutResType.upper()],
                                 runoutLine, rasterTransfo, resAnalysisDF.loc[simRowHash], pathDict)
 
     # analyze distribution of diffs between runout lines

avaframe/ana3AIMEC/ana3AIMEC.py

@@ -10,6 +10,7 @@
 # local modules
 from avaframe.in3Utils import fileHandlerUtils as fU
 from avaframe.in3Utils import cfgUtils
+from avaframe.ana3AIMEC import aimecTools
 
 # create local logger
 # change log level in calling module to DEBUG to see log messages
@@ -147,8 +148,6 @@ def dfaBench2Aimec(avaDir, cfg, simNameRef='', simNameComp=''):
     # Load all infos on comparison module simulations
     compData, resTypeCompList = fU.makeSimFromResDF(avaDir, None, inputDir=inputDirComp, simName=simNameComp)
 
-    resTypeList = list(set(resTypeRefList).intersection(resTypeCompList))
-    pathDict['resTypeList'] = resTypeList
     pathDict['colorParameter'] = colorParameter
     pathDict['refSimRowHash'] = refSimRowHash
     pathDict['refSimName'] = refSimName
@@ -182,6 +181,12 @@ def dfaBench2Aimec(avaDir, cfg, simNameRef='', simNameComp=''):
         message = ('Multiple rows of the dataFrame have the same simulation name.')
         log.warning(message)
 
+    # compute base-name resTypeList and validate via checkAIMECinputs
+    # use raw column-name lists as initial resTypeList (will be overwritten by checkAIMECinputs)
+    resTypeList = list(set(resTypeRefList).intersection(resTypeCompList))
+    pathDict['resTypeList'] = resTypeList
+    pathDict = aimecTools.checkAIMECinputs(cfgSetup, pathDict, inputsDF)
+
     return inputsDF, pathDict
 
 

avaframe/ana3AIMEC/dfa2Aimec.py

@@ -71,7 +71,7 @@ def com8MoTPSAMain(cfgMain, cfgInfo=None):
     com8MoTPSAPostprocess(simDict, cfgMain, inputSimFiles)
 
 
-def copyRawToLayerPeakFiles(workDir, simType, outputDirPeakFile):
+def copyRawToLayerPeakFiles(workDir, outputDirPeakFile):
     """Rename and copy raw MoT-PSA output files to peakFiles with L1/L2 layer naming.
 
     MoT-PSA produces raw suffixes (p1/p2_max, h1/h2_max, s1/s2_max) that map
@@ -84,8 +84,6 @@ def copyRawToLayerPeakFiles(workDir, simType, outputDirPeakFile):
     ----------
     workDir : pathlib.Path
         simulation work directory containing raw MoT-PSA output files
-    simType : str
-        simulation type (e.g. "null", "ent") used in the rename pattern
     outputDirPeakFile : pathlib.Path
         target directory for renamed peak files
     """
@@ -97,18 +95,11 @@ def copyRawToLayerPeakFiles(workDir, simType, outputDirPeakFile):
     ]
     for globPattern, rawL1, rawL2, resType in layerRenameMap:
         rawFiles = list(workDir.glob(globPattern))
-        # Replace raw L1 suffix with L1 layer + resType (e.g. null_psa_p1_max -> null_psa_L1_ppr)
+        # Replace raw suffixes with layer naming (e.g. p1_max -> L1_ppr, p2_max -> L2_ppr)
         targetFiles = [
-            pathlib.Path(str(f.name).replace(
-                "%s_psa_%s" % (simType, rawL1), "%s_psa_L1_%s" % (simType, resType)))
+            pathlib.Path(str(f.name).replace(rawL1, "L1_%s" % resType).replace(rawL2, "L2_%s" % resType))
             for f in rawFiles
         ]
-        # Replace raw L2 suffix with L2 layer + resType (e.g. null_psa_p2_max -> null_psa_L2_ppr)
-        targetFiles = [
-            pathlib.Path(str(f).replace(
-                "%s_psa_%s" % (simType, rawL2), "%s_psa_L2_%s" % (simType, resType)))
-            for f in targetFiles
-        ]
         # Prepend output directory and copy
         targetFiles = [outputDirPeakFile / f for f in targetFiles]
         for source, target in zip(rawFiles, targetFiles):
@@ -124,7 +115,7 @@ def com8MoTPSAPostprocess(simDict, cfgMain, inputSimFiles):
     Parameters
     ----------
     simDict : dict
-        simulation dictionary keyed by simKey, each value contains "simType"
+        simulation dictionary
     cfgMain : configparser.ConfigParser
         main AvaFrame configuration (avalancheDir, plot flags)
     inputSimFiles : dict
@@ -140,14 +131,11 @@ def com8MoTPSAPostprocess(simDict, cfgMain, inputSimFiles):
     for key in simDict:
         workDir = pathlib.Path(avalancheDir) / "Work" / "com8MoTPSA" / str(key)
 
-        # identify simType
-        simType = simDict[key]["simType"]
-
         # Copy DataTime.txt
         dataTimeFile = workDir / "DataTime.txt"
         shutil.copy2(dataTimeFile, outputDir / (str(key) + "_DataTime.txt"))
 
-        copyRawToLayerPeakFiles(workDir, simType, outputDirPeakFile)
+        copyRawToLayerPeakFiles(workDir, outputDirPeakFile)
 
     # create plots and report
     modName = __name__.split(".")[-1]

avaframe/com8MoTPSA/com8MoTPSA.py

@@ -669,7 +669,7 @@ def makeSimFromResDF(avaDir, comModule, inputDir="", simName=""):
         dataframe with for each simulation, the full file path, file name, release area scenario,
         simulation type (null, entres, etc.), model type (dfa, ref, etc.), simID,
         path to result files (ppr, pft, etc.), simulation name,
-        cell size and optional name of avalanche, optional time step
+        cell size and optional name of avalanche, optional time step, layer name
     resTypeListAll: list
         list of res types available for all simulations
     """