aboutsummaryrefslogtreecommitdiff
path: root/fullswof-utils
diff options
context:
space:
mode:
authorPaul Garlick <pgarlick@tourbillion-technology.com>2021-12-02 13:22:31 +0000
committerPaul Garlick <pgarlick@tourbillion-technology.com>2021-12-02 13:22:31 +0000
commita5780b11b15847c612b4825a111ce447bbeeae97 (patch)
tree6d01a94a3907135f49fff374270851bdce4366a0 /fullswof-utils
parentff8b0a4b85b98dd85d868d3e716e13073b11a335 (diff)
downloadfullSWOF-utils-a5780b11b15847c612b4825a111ce447bbeeae97.tar.gz
makeBoundary: Ensure panel regions overlap.
* fullswof-utils/makeBoundary: Adjust array slicing. Remove unnecessary checks for dry nodes.
Diffstat (limited to 'fullswof-utils')
-rwxr-xr-xfullswof-utils/makeBoundary14
1 files changed, 3 insertions, 11 deletions
diff --git a/fullswof-utils/makeBoundary b/fullswof-utils/makeBoundary
index 512a968..87abf44 100755
--- a/fullswof-utils/makeBoundary
+++ b/fullswof-utils/makeBoundary
@@ -221,9 +221,9 @@ xregion = []
zregion = []
zmin = []
for p in range(num_panels):
- # identify regions:
- xregion.append(xin[marker_ind[p]:marker_ind[p+1]])
- zregion.append(zin[marker_ind[p]:marker_ind[p+1]])
+ # identify regions (note regions overlap by one cell):
+ xregion.append(xin[marker_ind[p]:marker_ind[p+1]+1])
+ zregion.append(zin[marker_ind[p]:marker_ind[p+1]+1])
# identify minimum heights within each panel:
zmin.append(zregion[p].min())
@@ -255,14 +255,6 @@ h_i = [[] for _ in range(num_panels)]
K_i = [[] for _ in range(num_panels)]
Q_i = [[] for _ in range(num_panels)]
for p in range(num_panels):
- if p == panel[0]-1 and zregion[p][-1] < zmax:
- # ensure end node in region to the left of channel is dry:
- xregion[p] = np.append(xregion[p], xin[marker_ind[p]])
- zregion[p] = np.append(zregion[p], zin[marker_ind[p]])
- if p == panel[0]+1 and zregion[p][0] < zmax:
- # ensure start node in region to the right of channel is dry:
- xregion[p] = np.insert(xregion[p], 0, xin[marker_ind[p]-1])
- zregion[p] = np.insert(zregion[p], 0, zin[marker_ind[p]-1])
if zmax > zmin[p]:
p_i[p], A_i[p], r_h[p], h_i[p], K_i[p], Q_i[p] = conveyance(
numH,