From c4030da8677f1b30dcb90c6b45e57971cd2605e9 Mon Sep 17 00:00:00 2001 From: James McClure Date: Wed, 8 Sep 2021 16:27:18 -0400 Subject: [PATCH] set defaults for analysis --- analysis/runAnalysis.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/analysis/runAnalysis.cpp b/analysis/runAnalysis.cpp index 86abc7a9..4c82b377 100644 --- a/analysis/runAnalysis.cpp +++ b/analysis/runAnalysis.cpp @@ -624,8 +624,8 @@ runAnalysis::runAnalysis( std::shared_ptr input_db, const RankInfoStru d_N[1] = Dm->Ny; d_N[2] = Dm->Nz; - d_restart_interval = db->getScalar( "restart_interval" ); - d_analysis_interval = db->getScalar( "analysis_interval" ); + d_restart_interval = db->getWithDefault( "restart_interval", 100000 ); + d_analysis_interval = db->getWithDefault( "analysis_interval", 1000 ); d_subphase_analysis_interval = INT_MAX; d_visualization_interval = INT_MAX; d_blobid_interval = INT_MAX; @@ -639,7 +639,7 @@ runAnalysis::runAnalysis( std::shared_ptr input_db, const RankInfoStru d_subphase_analysis_interval = db->getScalar( "subphase_analysis_interval" ); } - auto restart_file = db->getScalar( "restart_file" ); + auto restart_file = db->getWithDefault( "restart_file", "Restart"); d_restartFile = restart_file + "." + rankString; @@ -765,8 +765,8 @@ runAnalysis::runAnalysis( ScaLBL_ColorModel &ColorModel) d_N[1] = ColorModel.Dm->Ny; d_N[2] = ColorModel.Dm->Nz; - d_restart_interval = db->getScalar( "restart_interval" ); - d_analysis_interval = db->getScalar( "analysis_interval" ); + d_restart_interval = db->getWithDefault( "restart_interval", 100000 ); + d_analysis_interval = db->getWithDefault( "analysis_interval", 1000 ); d_subphase_analysis_interval = INT_MAX; d_visualization_interval = INT_MAX; d_blobid_interval = INT_MAX; @@ -780,10 +780,9 @@ runAnalysis::runAnalysis( ScaLBL_ColorModel &ColorModel) d_subphase_analysis_interval = db->getScalar( "subphase_analysis_interval" ); } - auto restart_file = db->getScalar( "restart_file" ); + auto restart_file = db->getWithDefault( "restart_file", "Restart"); d_restartFile = restart_file + "." + rankString; - - + d_rank = d_comm.getRank(); writeIDMap( ID_map_struct(), 0, id_map_filename ); // Initialize IO for silo