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

add image seq checks

Browse Source
This commit is contained in:
James E McClure
2019-08-18 09:44:48 -04:00
parent 7f4f87ee79
commit 0f3f68d149
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
models/ColorModel.cpp
View File

@@ -455,6 +455,7 @@ void ScaLBL_ColorModel::Run(){
int IMAGE_INDEX = 0;
int IMAGE_COUNT = 0;
std::vector<std::string> ImageList;
bool SET_CAPILLARY_NUMBER = false;
bool MORPH_ADAPT = false;
@@ -487,6 +488,7 @@ void ScaLBL_ColorModel::Run(){
USE_DIRECT = true;
ImageList = color_db->getVector<std::string>( "image_sequence");
IMAGE_INDEX = color_db->getWithDefault<int>( "image_index", 0 );
IMAGE_COUNT = ImageList.size();
}
else if (protocol == "seed water"){
morph_delta = 0.05;
@@ -800,9 +802,15 @@ void ScaLBL_ColorModel::Run(){
if (USE_DIRECT){
// Use image sequence
std::string next_image = ImageList[IMAGE_INDEX];
if (rank==0) printf("***Loading next image in sequence (%i): %s ***\n", next_image);
ImageInit(next_image);
IMAGE_INDEX++;
if (IMAGE_INDEX < IMAGE_COUNT){
if (rank==0) printf("***Loading next image in sequence (%i): %s ***\n", next_image);
ImageInit(next_image);
IMAGE_INDEX++;
}
else{
if (rank==0) printf("Finished simulating image sequence \n");
timestep = timestepMax;
}
}
else if (USE_SEED){
delta_volume = volA*Dm->Volume - initial_volume;