Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

80 add option for netcdf infiltration quadtree file input #81

Draft
wants to merge 33 commits into
base: main
Choose a base branch
from
Draft

80 add option for netcdf infiltration quadtree file input #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f4a9903
- Make sfincs_infiltration F90 including setting Preprocess="preproce…
Leynse Apr 1, 2024
8100fb5
- Move all original infiltration type options to sfincs_infiltration.…
Leynse Apr 1, 2024
c844de1
- Add option to specify a 'netinfiltrationfile'
Leynse Apr 1, 2024
413d692
- First implementation that should be able to read a netinfiltrationf…
Leynse Apr 1, 2024
6e8885a
- Add option to try implementation first for simpler cna method
Leynse Apr 2, 2024
1e4d9ec
- First version without previous timestep dependency
Leynse Apr 4, 2024
08b91f7
- Solved so we can use the mean gamma again, issue was het H(k) is se…
Leynse Apr 4, 2024
ef60bd1
- Bit cleanup, and move back 'Make sure DoverE is filled based on pre…
Leynse Apr 4, 2024
d577d54
- Hprev should be based on full E, not ee(itheta), now result is same…
Leynse Apr 5, 2024
b24e87a
- Clean up by changing H to inout, so that we don't have to determine…
Leynse Apr 5, 2024
d5b5a63
- Change water depth for warning limited depth in Herbers calculation…
Leynse Apr 5, 2024
46bdd02
- Put the whole determination of the IG source term in a new subrouti…
Leynse Apr 5, 2024
c77075d
- Some style cleanup
Leynse Apr 8, 2024
43623b7
- New implementation where IG source/sink term is first determined pr…
Leynse Apr 8, 2024
7f09dec
- First significant speedup by putting ' do itheta = 1, ntheta' loop …
Leynse Apr 8, 2024
89eb173
save intermediate attempts:
Leynse Apr 8, 2024
c4906cb
- In iteration loop, save a little bit of computation time by updatin…
Leynse Apr 8, 2024
6c04c50
- Rename all references to 'srcsh' to more descriptive 'srcig'
Leynse Apr 8, 2024
0294561
- Do actually limit the depth to 5m, not only warning
Leynse Apr 8, 2024
ec6e818
Added text
Leynse Apr 8, 2024
04a8e61
Combine loops
Leynse Apr 8, 2024
d55cf87
- depth needed to be inout to be able to change it
Leynse Apr 9, 2024
f3c6925
Revert "Combine loops"
Leynse Apr 9, 2024
f46e1e4
- Determinen above, so that we can correctly allocatie nmindbnd
Leynse Apr 9, 2024
e571ae6
- Update H(k) in first sweep of first iteration, so that in first tim…
Leynse Apr 9, 2024
decc4f0
- Fix quadtree hmax output
Leynse Apr 22, 2024
80651d0
- Allocate vars in sfincs_domain
Leynse Apr 25, 2024
9d09a34
- Remove double write cuminf
Leynse Apr 25, 2024
e546e5f
- Cumprcp is already in meterds now !? > so then no conversion from m…
Leynse Apr 25, 2024
0dcf919
- Fix missing point_prcp because of meteo3d that was turned to false
Leynse Apr 25, 2024
e173662
- remove in the end not needed check (bit unclear, but works)
Leynse Apr 25, 2024
8a1020e
- Index was wrong in wavemaker for case subgrid
Leynse Apr 25, 2024
f6387f0
- Merge '82 overcome dependency snapwave ig source term on previous t…
Leynse Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion source/sfincs_lib/sfincs_lib.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,15 @@
<File RelativePath="..\src\sfincs_discharges.f90"/>
<File RelativePath="..\src\sfincs_domain.f90"/>
<File RelativePath="..\src\sfincs_error.f90"/>
<File RelativePath="..\src\sfincs_infiltration.f90"/>
<File RelativePath="..\src\sfincs_infiltration.F90">
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
<File RelativePath="..\src\sfincs_input.f90"/>
<File RelativePath="..\src\sfincs_lib.f90"/>
<File RelativePath="..\src\sfincs_meteo.f90"/>
Expand Down
2 changes: 1 addition & 1 deletion source/src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ libsfincs_la_SOURCES = \
sfincs_output.f90 \
sfincs_momentum.f90 \
sfincs_wavemaker.f90 \
sfincs_infiltration.f90 \
sfincs_infiltration.F90 \
sfincs_lib.f90 \
sfincs_bmi.f90

Expand Down
6 changes: 6 additions & 0 deletions source/src/quadtree.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,13 +852,19 @@ subroutine find_uv_points_intersected_by_polyline(uv_indices,vertices,nint,xpol,
do m = m0, m1
do n = n0, n1
!
! First check whether point is on the quadtree grid at all
nm = find_quadtree_cell_by_index(n, m, iref)
!
if (nm==0) then
cycle
endif
!
! Second check is whether it is on the active SFINCS mask
nm = index_sfincs_in_quadtree(nm)
!
if (nm==0) then
cycle
endif
!
! Right (same level or coarser)
!
Expand Down
3 changes: 2 additions & 1 deletion source/src/sfincs_data.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ module sfincs_data
character*256 :: netampfile
character*256 :: netamprfile
character*256 :: netspwfile
character*256 :: netinfiltrationfile
character*256 :: scsfile
character*256 :: smaxfile
character*256 :: sefffile
Expand Down Expand Up @@ -532,7 +533,7 @@ module sfincs_data
real*4, dimension(:), allocatable :: cg
real*4, dimension(:), allocatable :: qb
real*4, dimension(:), allocatable :: betamean
real*4, dimension(:), allocatable :: srcsh
real*4, dimension(:), allocatable :: srcig
real*4, dimension(:), allocatable :: alphaig

! real*4, dimension(:), allocatable :: tauwavv
Expand Down
Loading