69 make all combined version #70
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… multiple parameters user changeable (snapwave_gammaig, snapwave_Tinc2ig, snapwave_shinc2ig,snapwave_finc2ig) as in HurryWave. Added factor to control offshore estimate of IG energy: snapwave_eeinc2ig
- Change default depth of snapwave from 0.01 to 0.001m for more flexibility and accuracy in specifying snapwave_hmin
- Make possible to change the baldock_ratio (default = 0.2 as before)
…'dw'and 'df' if storefw = 1
…waves to his-output as 'dw'and 'df' if storefw = 1 - TODO; still check better whether integrated calculation is correct
- Add Battjes-Janssen 1978 breaking dissipation model for IG waves with 2 options to apply breaking everywhere or where H>gamma*depth, controlled by snapwave_battjesjanssen_opt=1 (default) or 2 - add snapwave_ig_opt to swith between Baldock for IG waves =1 (default) of BattjesJanssen
…previous timestep as in Baldocks formulation and write to sfincs netcdf output - Calculate directionally averaged normalised bed slope betan and write to sfincs netcdf output - Calculate directionally averaged shoaling factor fsh and write to sfincs netcdf output - Make fsh be dependent on one minus the percentage of breaking waves Qb instead of assuming Qb=1 as in Hurrywave implementation - Make coefficients in fsh user changeable and have a minimum value as in Hurrywave implementation -> snapwave_fshfac=1, snapwave_fshexp=15, snapwave_fshalphamin=0.1 - Add a coefficient that controls how much of the incident energy sink ends up as IG wave source -> snapwave_shpercig=0.25 -> meaning that not all dissipated energy goes to the IG frequencies - Bugfix so Hmx_ig is actually controlled by gamma_ig instead of gamma of incident waves - Some intermediate attempts at different options inside Baldock breaker formulation
- add user parameter snapwave_depthforcerelease controlling below what water depth, there will be no inc2ig energy transfer anymore
…gy source is given anymore to IG waves, should become more generalised later
…_snapwave_ig # Conflicts: # source/src/sfincs_lib.f90 # source/third_party_open/netcdf/netcdf4.vcxproj
… monochromatic - Propose tp = snapwave_tpmean*snapwave_Tinc2ig instead of fixed value of 6 - Was needed to read in snapwave_Tinc2ig again because snapwave_data is not available in SFINCS itself
- Add 'srcsh' variable of energy sink incident waves/energy source ig waves to his output, is directionally averaged - Therefore, in snapwave/snapwave_solver.f90 change srcsh into srcsh_local
…o between Tp,inc and Tp,ig: snapwave_Tinc2ig = 7 (default) instead of hardcoded ratio of 6.0 - add quadtree print statements as in main
- remove unused 'igperiod' variable
…sh formula in subroutine 'estimate_shoaling_rate', still with regular Baldock wave dissipation - Option of old fsh formula with BattjesJanssen IG dissiptation is ig_opt = 3
- Reset defaults of shinc2ig and shpercig
- Still have problem at boundaries - Still need to calcullate steepnes, reldepth, depthforcerelease based on weighted nearest offshore wave data
- Use now downwind IG wave height from previous timestep, to evaluate choice still
- if (Sxxprev(itheta)<=0.0) then is enough
- Note the srcsh / Cg(i)
…d values of 8 - Not sure whether all real*8 were needed in the end...
- Still to be reviewed whether method works good like this with all in rms instead of Hm0
… to limit 'inverse' shadow zone for IG waves, induced by the srcsh component
…tions in 1 file (bnd/bhs/btp/bwd/bds) - Same format as SFINCS' netcdfbndbzszifile
- fix some typos
…, especially in case of errors!
…l tstop (plus a little bit with dt), max output was called twice, while only (correctly) allocated for 1 timestep - Solved by not adding 'dtmaxout' in sfincs_lib.f90 if t>t1 - to be discussed whether this is the optimal solution
…which sometimes went wrong - solved by adding parantheses
…-if-the-model-fails' of https://github.com/Deltares/SFINCS into renamed_bins_to_levels
…cdf library (causing in weird error message for user), but do a more clear check on the extension being '.nc' or not. - Therefore error message is adapted
…sing netcdf library (causing in weird error message for user), but do a more clear check on the extension being '.nc' or not." This reverts commit 9bcea17.
…ways-0-even-if-the-model-fails
…-if-the-model-fails' into floodadapt_merge
…into 69-make-all-combined-version
… into 69-make-all-combined-version
- Give actual Debug print statement when dsp/tsp input range is unrealistic and adjusted - Make clear for deburg prints that this is coming from SnapWave
- remove unused snapwave_input
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.