From d6a8647ee1d0fd4f8ef30a079b7526ede60aa0c4 Mon Sep 17 00:00:00 2001 From: James McClure Date: Fri, 17 Apr 2020 12:21:29 -0400 Subject: [PATCH] cannot exclude inlet / outlet without screwing up topology --- analysis/SubPhase.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/analysis/SubPhase.cpp b/analysis/SubPhase.cpp index 7ef8194b..2a5e3350 100644 --- a/analysis/SubPhase.cpp +++ b/analysis/SubPhase.cpp @@ -161,12 +161,12 @@ void SubPhase::Basic(){ // If external boundary conditions are set, do not average over the inlet kmin=1; kmax=Nz-1; imin=jmin=1; - // If inlet/outlet layers exist use these as default + /*// If inlet/outlet layers exist use these as default if (Dm->inlet_layers_x > 0) imin = Dm->inlet_layers_x; if (Dm->inlet_layers_y > 0) jmin = Dm->inlet_layers_y; if (Dm->inlet_layers_z > 0 && Dm->kproc() == 0) kmin += Dm->inlet_layers_z; if (Dm->outlet_layers_z > 0 && Dm->kproc() == Dm->nprocz()-1) kmax -= Dm->outlet_layers_z; - + */ nb.reset(); wb.reset(); double count_w = 0.0; @@ -376,16 +376,17 @@ void SubPhase::Full(){ // If external boundary conditions are set, do not average over the inlet kmin=1; kmax=Nz-1; - if (Dm->BoundaryCondition > 0 && Dm->BoundaryCondition != 5 && Dm->kproc() == 0) kmin=4; + /*if (Dm->BoundaryCondition > 0 && Dm->BoundaryCondition != 5 && Dm->kproc() == 0) kmin=4; if (Dm->BoundaryCondition > 0 && Dm->BoundaryCondition != 5 && Dm->kproc() == Dm->nprocz()-1) kmax=Nz-4; - + */ imin=jmin=1; - // If inlet layers exist use these as default + /*// If inlet layers exist use these as default + * NOTE -- excluding inlet / outlet will screw up topological averages!!! if (Dm->inlet_layers_x > 0) imin = Dm->inlet_layers_x; if (Dm->inlet_layers_y > 0) jmin = Dm->inlet_layers_y; if (Dm->inlet_layers_z > 0 && Dm->kproc() == 0) kmin += Dm->inlet_layers_z; if (Dm->outlet_layers_z > 0 && Dm->kproc() == Dm->nprocz()-1) kmax -= Dm->outlet_layers_z; - + */ nd.reset(); nc.reset(); wd.reset(); wc.reset(); iwn.reset(); iwnc.reset(); Dm->CommunicateMeshHalo(Phi);