From ecffdfa489224a11b394056b6af0e87fb85a012c Mon Sep 17 00:00:00 2001 From: Anna Wirbel Date: Tue, 3 Jun 2025 13:54:25 +0200 Subject: [PATCH 1/2] add old info from computations of already performed sims --- avaframe/in3Utils/cfgUtils.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/avaframe/in3Utils/cfgUtils.py b/avaframe/in3Utils/cfgUtils.py index 54373bdea..6a4329c36 100644 --- a/avaframe/in3Utils/cfgUtils.py +++ b/avaframe/in3Utils/cfgUtils.py @@ -730,6 +730,13 @@ def readConfigurationInfoFromDone(avaDir, specDir='', latest=False): simDF = createConfigurationInfo(avaDir, comModule='com1DFA', standardCfg='', writeCSV=False, specDir=specDir, simNameList=simNameExisting) + # check for allConfigurationsInfo to find computation info and add to info fetched from ini files + if latest == False and isinstance(simDF, pd.DataFrame): + # check if in allConfigurationsInfo also info for existing sims + simDFALL, _ = readAllConfigurationInfo(avaDir, specDir='', configCsvName='allConfigurations') + if isinstance(simDFALL, pd.DataFrame): + simDF = simDF.merge(simDFALL[['nPart', 'timeLoop', 'timeForce', 'timeForceSPH', 'timePos', 'timeNeigh', + 'timeField', 'nSave', 'nIter', 'simName']], how='left', on='simName') return simDF, simNameExisting From cf6945263e3f89320ffa9f12c9d4d801087a3d86 Mon Sep 17 00:00:00 2001 From: Anna Wirbel Date: Tue, 3 Jun 2025 15:05:56 +0200 Subject: [PATCH 2/2] also keep index when merging DFs --- avaframe/in3Utils/cfgUtils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/avaframe/in3Utils/cfgUtils.py b/avaframe/in3Utils/cfgUtils.py index 6a4329c36..a52c50ff0 100644 --- a/avaframe/in3Utils/cfgUtils.py +++ b/avaframe/in3Utils/cfgUtils.py @@ -730,13 +730,15 @@ def readConfigurationInfoFromDone(avaDir, specDir='', latest=False): simDF = createConfigurationInfo(avaDir, comModule='com1DFA', standardCfg='', writeCSV=False, specDir=specDir, simNameList=simNameExisting) + + # check for allConfigurationsInfo to find computation info and add to info fetched from ini files if latest == False and isinstance(simDF, pd.DataFrame): # check if in allConfigurationsInfo also info for existing sims simDFALL, _ = readAllConfigurationInfo(avaDir, specDir='', configCsvName='allConfigurations') if isinstance(simDFALL, pd.DataFrame): - simDF = simDF.merge(simDFALL[['nPart', 'timeLoop', 'timeForce', 'timeForceSPH', 'timePos', 'timeNeigh', - 'timeField', 'nSave', 'nIter', 'simName']], how='left', on='simName') + simDF = simDF.reset_index().merge(simDFALL[['nPart', 'timeLoop', 'timeForce', 'timeForceSPH', 'timePos', 'timeNeigh', + 'timeField', 'nSave', 'nIter', 'simName']], how='left', on='simName').set_index('index') return simDF, simNameExisting