added morphopen connected oil option
This commit is contained in:
parent
89461a265c
commit
8822d5036d
@ -451,6 +451,7 @@ void ScaLBL_ColorModel::Run(){
|
|||||||
bool MORPH_ADAPT = false;
|
bool MORPH_ADAPT = false;
|
||||||
bool USE_MORPH = false;
|
bool USE_MORPH = false;
|
||||||
bool USE_SEED = false;
|
bool USE_SEED = false;
|
||||||
|
bool USE_MORPHOPEN_OIL = false;
|
||||||
int analysis_interval = 1000; // number of timesteps in between in situ analysis
|
int analysis_interval = 1000; // number of timesteps in between in situ analysis
|
||||||
int MAX_MORPH_TIMESTEPS = 50000; // maximum number of LBM timesteps to spend in morphological adaptation routine
|
int MAX_MORPH_TIMESTEPS = 50000; // maximum number of LBM timesteps to spend in morphological adaptation routine
|
||||||
int MIN_STEADY_TIMESTEPS = 100000;
|
int MIN_STEADY_TIMESTEPS = 100000;
|
||||||
@ -492,6 +493,10 @@ void ScaLBL_ColorModel::Run(){
|
|||||||
morph_interval = analysis_db->getScalar<int>( "morph_interval" );
|
morph_interval = analysis_db->getScalar<int>( "morph_interval" );
|
||||||
USE_MORPH = true;
|
USE_MORPH = true;
|
||||||
}
|
}
|
||||||
|
if (analysis_db->keyExists( "use_morphopen_oil" )){
|
||||||
|
USE_MORPHOPEN_OIL = analysis_db->getScalar<bool>( "use_morphopen_oil" );
|
||||||
|
USE_MORPH = true;
|
||||||
|
}
|
||||||
if (analysis_db->keyExists( "tolerance" )){
|
if (analysis_db->keyExists( "tolerance" )){
|
||||||
tolerance = analysis_db->getScalar<double>( "tolerance" );
|
tolerance = analysis_db->getScalar<double>( "tolerance" );
|
||||||
}
|
}
|
||||||
@ -656,7 +661,7 @@ void ScaLBL_ColorModel::Run(){
|
|||||||
if ( isSteady ){
|
if ( isSteady ){
|
||||||
MORPH_ADAPT = true;
|
MORPH_ADAPT = true;
|
||||||
CURRENT_MORPH_TIMESTEPS=0;
|
CURRENT_MORPH_TIMESTEPS=0;
|
||||||
delta_volume_target = (volA )*morph_delta; // set target volume change
|
delta_volume_target = Dm->Volume*volA *morph_delta; // set target volume change
|
||||||
Averages->Full();
|
Averages->Full();
|
||||||
Averages->Write(timestep);
|
Averages->Write(timestep);
|
||||||
analysis.WriteVisData( timestep, *Averages, Phi, Pressure, Velocity, fq, Den );
|
analysis.WriteVisData( timestep, *Averages, Phi, Pressure, Velocity, fq, Den );
|
||||||
@ -723,11 +728,15 @@ void ScaLBL_ColorModel::Run(){
|
|||||||
if (MORPH_ADAPT ){
|
if (MORPH_ADAPT ){
|
||||||
CURRENT_MORPH_TIMESTEPS += analysis_interval;
|
CURRENT_MORPH_TIMESTEPS += analysis_interval;
|
||||||
if (USE_SEED){
|
if (USE_SEED){
|
||||||
delta_volume = volA - initial_volume;
|
delta_volume = volA*Dm->Volume - initial_volume;
|
||||||
CURRENT_MORPH_TIMESTEPS += analysis_interval;
|
CURRENT_MORPH_TIMESTEPS += analysis_interval;
|
||||||
double massChange = SeedPhaseField(seed_water);
|
double massChange = SeedPhaseField(seed_water);
|
||||||
if (rank==0) printf("***Seed water in oil %f, volume change %f / %f ***\n", seed_water, delta_volume, delta_volume_target);
|
if (rank==0) printf("***Seed water in oil %f, volume change %f / %f ***\n", seed_water, delta_volume, delta_volume_target);
|
||||||
}
|
}
|
||||||
|
else if (USE_MORPHOPEN_OIL){
|
||||||
|
if (rank==0) printf("***Morphological opening of connected oil, with target volume change ***\n", delta_volume_target);
|
||||||
|
MorphologicalOpening(delta_volume_target);
|
||||||
|
}
|
||||||
else{
|
else{
|
||||||
if (rank==0) printf("***Morphological step with target volume change %f ***\n", delta_volume_target);
|
if (rank==0) printf("***Morphological step with target volume change %f ***\n", delta_volume_target);
|
||||||
//double delta_volume_target = volB - (volA + volB)*TARGET_SATURATION; // change in volume to A
|
//double delta_volume_target = volB - (volA + volB)*TARGET_SATURATION; // change in volume to A
|
||||||
@ -735,13 +744,13 @@ void ScaLBL_ColorModel::Run(){
|
|||||||
}
|
}
|
||||||
if ( (delta_volume - delta_volume_target)/delta_volume_target > 0.0 ){
|
if ( (delta_volume - delta_volume_target)/delta_volume_target > 0.0 ){
|
||||||
MORPH_ADAPT = false;
|
MORPH_ADAPT = false;
|
||||||
initial_volume = volA;
|
initial_volume = volA*Dm->Volume;
|
||||||
delta_volume = 0.0;
|
delta_volume = 0.0;
|
||||||
CURRENT_STEADY_TIMESTEPS=0;
|
CURRENT_STEADY_TIMESTEPS=0;
|
||||||
}
|
}
|
||||||
else if (CURRENT_MORPH_TIMESTEPS > MAX_MORPH_TIMESTEPS) {
|
else if (CURRENT_MORPH_TIMESTEPS > MAX_MORPH_TIMESTEPS) {
|
||||||
delta_volume = 0.0;
|
delta_volume = 0.0;
|
||||||
initial_volume = volA;
|
initial_volume = volA*Dm->Volume;
|
||||||
MORPH_ADAPT = false;
|
MORPH_ADAPT = false;
|
||||||
CURRENT_STEADY_TIMESTEPS=0;
|
CURRENT_STEADY_TIMESTEPS=0;
|
||||||
}
|
}
|
||||||
@ -789,7 +798,9 @@ double ScaLBL_ColorModel::MorphOpenConnected(double target_volume_change){
|
|||||||
int nz = Nz;
|
int nz = Nz;
|
||||||
int n;
|
int n;
|
||||||
int N = nx*ny*nz;
|
int N = nx*ny*nz;
|
||||||
double volume_change;
|
double volume_change=0.0;
|
||||||
|
|
||||||
|
if (target_volume_change > 0.0){
|
||||||
Array<char> id_solid(nx,ny,nz);
|
Array<char> id_solid(nx,ny,nz);
|
||||||
Array<int> phase_label(nx,ny,nz);
|
Array<int> phase_label(nx,ny,nz);
|
||||||
DoubleArray distance(Nx,Ny,Nz);
|
DoubleArray distance(Nx,Ny,Nz);
|
||||||
@ -851,13 +862,10 @@ double ScaLBL_ColorModel::MorphOpenConnected(double target_volume_change){
|
|||||||
}
|
}
|
||||||
CalcDist(distance,id_solid,*Dm);
|
CalcDist(distance,id_solid,*Dm);
|
||||||
|
|
||||||
double SW=0.5;
|
|
||||||
// target water increase in voxels, normalized by connected volume
|
|
||||||
double St = (SW*count_porespace - count_water)/count_porespace;
|
|
||||||
|
|
||||||
signed char water=2;
|
signed char water=2;
|
||||||
signed char notwater=1;
|
signed char notwater=1;
|
||||||
MorphOpen(distance, id_connected, Dm, St, water, notwater);
|
double SW=-(target_volume_change)/count_connected;
|
||||||
|
MorphOpen(distance, id_connected, Dm, SW, water, notwater);
|
||||||
|
|
||||||
for (int k=0; k<nz; k++){
|
for (int k=0; k<nz; k++){
|
||||||
for (int j=0; j<ny; j++){
|
for (int j=0; j<ny; j++){
|
||||||
@ -871,8 +879,6 @@ double ScaLBL_ColorModel::MorphOpenConnected(double target_volume_change){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ScaLBL_CopyToDevice(Phi,phase.data(),N*sizeof(double));
|
ScaLBL_CopyToDevice(Phi,phase.data(),N*sizeof(double));
|
||||||
ScaLBL_PhaseField_Init(dvcMap, Phi, Den, Aq, Bq, 0, ScaLBL_Comm->LastExterior(), Np);
|
ScaLBL_PhaseField_Init(dvcMap, Phi, Den, Aq, Bq, 0, ScaLBL_Comm->LastExterior(), Np);
|
||||||
ScaLBL_PhaseField_Init(dvcMap, Phi, Den, Aq, Bq, ScaLBL_Comm->FirstInterior(), ScaLBL_Comm->LastInterior(), Np);
|
ScaLBL_PhaseField_Init(dvcMap, Phi, Den, Aq, Bq, ScaLBL_Comm->FirstInterior(), ScaLBL_Comm->LastInterior(), Np);
|
||||||
@ -888,6 +894,7 @@ double ScaLBL_ColorModel::MorphOpenConnected(double target_volume_change){
|
|||||||
ScaLBL_SetSlice_z(Phi,-1.0,Nx,Ny,Nz,Nz-3);
|
ScaLBL_SetSlice_z(Phi,-1.0,Nx,Ny,Nz,Nz-3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return(volume_change);
|
return(volume_change);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user