From d75fbbceb09343e76cf64158b9eb0bf6651e45c1 Mon Sep 17 00:00:00 2001
From: David Deepwell <ddeepwel@uwaterloo.ca>
Date: Wed, 22 Jul 2020 13:02:14 -0400
Subject: [PATCH] Fix writing diagnostics errors and modify the boundary mask
Modify the mask to not map with the side bump. The induced
vortices form near the crest of the bump and were previously
within the mask at the beginning of their formation.
The boundary layer doesn't track with the bump, so we don't need
to worry about it there.
---
.../wave_reader_side/wave_reader_side.cpp | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/cases/wave_reader_side/wave_reader_side.cpp b/src/cases/wave_reader_side/wave_reader_side.cpp
index 72b0b0e..d23927a 100644
--- a/src/cases/wave_reader_side/wave_reader_side.cpp
+++ b/src/cases/wave_reader_side/wave_reader_side.cpp
@@ -597,7 +597,8 @@ class userControl : public BaseCase {
// layer, so mask out this region.
double dz = Lz/Nz;
*boundary_mask = 0.25*( (1 + tanh( ((MinZ + Lz - bl_width) - (*zgrid)(ii,jj,kk))/(0.25*bl_width)))) * // flat wall boundary
- (1 + tanh( ((*zgrid)(ii,jj,kk) - (MinZ + bl_width + topo(ii)))/(0.25*bl_width))); // Bumpy wall boundary
+ //(1 + tanh( ((*zgrid)(ii,jj,kk) - (MinZ + bl_width + topo(ii)))/(0.25*bl_width))); // Bumpy wall boundary, with bump
+ (1 + tanh( ((*zgrid)(ii,jj,kk) - (MinZ + bl_width + 0))/(0.25*bl_width))); // Bumpy wall boundary, without the bump
Array<double,1> const & qz = *get_quad_z(); // Keep reference to z-quadrature weights
for (int i = boundary_mask_2d->lbound(firstDim); i <= boundary_mask_2d->ubound(firstDim); i++) {
for (int k = boundary_mask_2d->lbound(thirdDim); k <= boundary_mask_2d->ubound(thirdDim); k++) {
@@ -951,21 +952,21 @@ class userControl : public BaseCase {
add_diagnostic("eta10high",eta10high,header,line);
add_diagnostic("eta10ot",eta10ot,header,line);
- add_diagnostic("eta30low",eta10low,header,line);
- add_diagnostic("eta30high",eta10high,header,line);
- add_diagnostic("eta30ot",eta10ot,header,line);
+ add_diagnostic("eta30low",eta30low,header,line);
+ add_diagnostic("eta30high",eta30high,header,line);
+ add_diagnostic("eta30ot",eta30ot,header,line);
- add_diagnostic("eta50low",eta10low,header,line);
- add_diagnostic("eta50high",eta10high,header,line);
- add_diagnostic("eta50ot",eta10ot,header,line);
+ add_diagnostic("eta50low",eta50low,header,line);
+ add_diagnostic("eta50high",eta50high,header,line);
+ add_diagnostic("eta50ot",eta50ot,header,line);
- add_diagnostic("eta70low",eta10low,header,line);
- add_diagnostic("eta70high",eta10high,header,line);
- add_diagnostic("eta70ot",eta10ot,header,line);
+ add_diagnostic("eta70low",eta70low,header,line);
+ add_diagnostic("eta70high",eta70high,header,line);
+ add_diagnostic("eta70ot",eta70ot,header,line);
- add_diagnostic("eta90low",eta10low,header,line);
- add_diagnostic("eta90high",eta10high,header,line);
- add_diagnostic("eta90ot",eta10ot,header,line);
+ add_diagnostic("eta90low",eta90low,header,line);
+ add_diagnostic("eta90high",eta90high,header,line);
+ add_diagnostic("eta90ot",eta90ot,header,line);
// Write to file
--
GitLab