From 0a15d6255e109debd32dde037995515309c2de9c Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 18 Aug 2025 12:27:12 +0200 Subject: [PATCH 1/2] Extends search to include realization stage Modifies the search query for vector names to include results from both the 'iteration' and 'realization' stages. It also includes 'simulationtimeseries' as acceptable content. This broadens the scope of the search and ensures more comprehensive results. --- .../Application/Tools/Cloud/RiaSumoConnector.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp index 3bef749e9c7..096eabdb11d 100644 --- a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp +++ b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp @@ -319,10 +319,9 @@ void RiaSumoConnector::requestVectorNamesForEnsemble( const SumoCaseId& caseId, {"term": {"class": "table"}}, {"term": {"_sumo.parent_object.keyword": "%1"}}, {"term": {"fmu.iteration.name.keyword": "%2"}}, - {"term": {"fmu.context.stage.keyword": "iteration"}}, - {"term": {"fmu.aggregation.operation.keyword": "collection"}}, + {"terms": {"fmu.context.stage.keyword": ["iteration", "realization"]}}, {"term": {"data.tagname.keyword": "summary"}}, - {"term": {"data.content.keyword": "timeseries"}} + {"terms": {"data.content.keyword": ["timeseries", "simulationtimeseries"]}} ]} }, "aggs": { From 225576a01268c37269ddafa27da20b93377043bd Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 18 Aug 2025 12:28:33 +0200 Subject: [PATCH 2/2] Improves realization ID retrieval from Sumo Updates the query for retrieving realization IDs from Sumo to include both 'iteration' and 'realization' stages. Also modifies the query to search for both 'timeseries' and 'simulationtimeseries' data content, ensuring that all relevant data is included. The script to extract realization IDs is modified to handle cases where the 'fmu.realization.id' field is present, ensuring correct ID retrieval. --- .../Application/Tools/Cloud/RiaSumoConnector.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp index 096eabdb11d..ba78078310a 100644 --- a/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp +++ b/ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp @@ -386,21 +386,21 @@ void RiaSumoConnector::requestRealizationIdsForEnsemble( const SumoCaseId& caseI {"term": {"class": "table"}}, {"term": {"_sumo.parent_object.keyword": "%1"}}, {"term": {"fmu.iteration.name.keyword": "%2"}}, - {"term": {"fmu.context.stage.keyword": "iteration"}}, - {"term": {"fmu.aggregation.operation.keyword": "collection"}}, + {"terms": {"fmu.context.stage.keyword": ["iteration", "realization"]}}, {"term": {"data.tagname.keyword": "summary"}}, - {"term": {"data.content.keyword": "timeseries"}} + {"terms": {"data.content.keyword": ["timeseries", "simulationtimeseries"]}} ]} }, "aggs": { "realization-ids": { "terms": { - "field": "fmu.aggregation.realization_ids", - "size":1000 + "script": { + "source": "doc.containsKey('fmu.realization.id') ? doc['fmu.realization.id'].value : doc['mu.aggregation.realization_ids'].value" + }, + "size": 1000 } } - }, - "_source": false, + }, "_source": false, "size":0 } )";