OilfieldToolsNet/LBPM
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
JamesEMcclure committed 2021-09-09 06:22:36 -04:00
2 parents 3d64e1a8a1 ea987e90d3
commit 68e9548f5b
9 files changed
+918 -609
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

analysis/runAnalysis.cpp
+7 -8
View File
@@ -640,8 +640,8 @@ runAnalysis::runAnalysis( std::shared_ptr<Database> input_db, const RankInfoStru
d_N[1] = Dm->Ny;
d_N[2] = Dm->Nz;
d_restart_interval = db->getScalar<int>( "restart_interval" );
d_analysis_interval = db->getScalar<int>( "analysis_interval" );
d_restart_interval = db->getWithDefault<int>( "restart_interval", 100000 );
d_analysis_interval = db->getWithDefault<int>( "analysis_interval", 1000 );
d_subphase_analysis_interval = INT_MAX;
d_visualization_interval = INT_MAX;
d_blobid_interval = INT_MAX;
@@ -655,7 +655,7 @@ runAnalysis::runAnalysis( std::shared_ptr<Database> input_db, const RankInfoStru
d_subphase_analysis_interval = db->getScalar<int>( "subphase_analysis_interval" );
}
auto restart_file = db->getScalar<std::string>( "restart_file" );
auto restart_file = db->getWithDefault<std::string>( "restart_file", "Restart");
d_restartFile = restart_file + "." + rankString;
@@ -781,8 +781,8 @@ runAnalysis::runAnalysis( ScaLBL_ColorModel &ColorModel)
d_N[1] = ColorModel.Dm->Ny;
d_N[2] = ColorModel.Dm->Nz;
d_restart_interval = db->getScalar<int>( "restart_interval" );
d_analysis_interval = db->getScalar<int>( "analysis_interval" );
d_restart_interval = db->getWithDefault<int>( "restart_interval", 100000 );
d_analysis_interval = db->getWithDefault<int>( "analysis_interval", 1000 );
d_subphase_analysis_interval = INT_MAX;
d_visualization_interval = INT_MAX;
d_blobid_interval = INT_MAX;
@@ -796,10 +796,9 @@ runAnalysis::runAnalysis( ScaLBL_ColorModel &ColorModel)
d_subphase_analysis_interval = db->getScalar<int>( "subphase_analysis_interval" );
}
auto restart_file = db->getScalar<std::string>( "restart_file" );
auto restart_file = db->getWithDefault<std::string>( "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