56 make beta version for release (#58)

Prepare the v2.0.3-Cauberg release of SFINCS! Merged PR of Netcdf4, Netcdf spiderwebs and Quadtree updates, plus some small needed fixes to make it all working. In more detail: * First progress: netcdf data is read. Next step: interpolation in rest of SFINCS * working version of SFINCS with netcdf spiderweb (rainfall not tested yet) * made integers in sfincs_input.f90 temporary again * removed variable SFINCS doesnt need * major update of sfincs_domain and fluxes in case of quadtree * enabled combo of wave makers and subgrid * cosmetic updates * computing combined fluxes after reading restart file * added deallocation of quadtree arrays * cosmetic * Update netcdf4.vcxproj back to 142 (again ....) * storing logicals as ints in netcdf output attributes * Use NETCDF4 + nc_deflate_level * - add netspwfile to output var list * updated documentation for netcdf spiderwebs * - Fix quadtree map nc output file, 'NF90_64BIT_OFFSET' didn't work (/together with NF90_NETCDF4 compression), not sure why was needed * - We also need 'uv_index_u_nmd' and 'uv_index_u_nmu' in sfincs_momentum.f90 for exception (theta<0.9999 .and. .not.advection) for backward compatibility - For now done by always executing if-loops * - In case of inputtype 'asc', we need variable 'kcsg' from initialize_mesh() still in initialize_bathymetry(), because otherwise you loop over all nmax*mmax, which doesn't match with ip - Fixed by making kcsg a general available variable in sfincs_data.f90 * - Needed extra flag check for advection as discussed with Maarten * - V2.0.3-Cauberg! - Replace the (theta<0.9999) by a dedicated flag 'thetasmoothing' - That flag now used in sfincs_domain.f90 to determine whether extra uv indices should be determined, and in sfincs_momentum.f90 for calculating fluxes for smoothing - Redo commit #d2f6820 "Bug fix for theta smoothing [..] smoothing now no longer occurs when neighbors are dry (the way it used to be in old versions)." > was unintentianally removed in PR#47 > solved by adding within if thetasmoothing "if ( kcuv(uv_index_u_nmd(ip))==1 .and. kcuv(uv_index_u_nmu(ip))==1 ) then " * - Making horton infiltration a different option 6 in rstfile, as should have been done so in the first place in commit # 594218b * - Bump version to v2.0.3-Cauberg * - Make spw conversion to utm also available for netspwfile input --------- Co-authored-by: Kees Nederhoff <[email protected]> Co-authored-by: maartenvanormondt <[email protected]> Co-authored-by: David Gutiérrez-Barceló <[email protected]>
Deltares · Nov 9, 2023 · f4aa9fe · f4aa9fe
1 parent 37c1322
commit f4aa9fe
Show file tree

Hide file tree

Showing 22 changed files with 1,660 additions and 1,472 deletions.
diff --git a/README.rst b/README.rst
@@ -54,7 +54,7 @@ SFINCS seeks active contribution from the hydro modelling community, so feel fre
     :alt: Latest developers docs
 
 .. |docs_stable| image:: https://img.shields.io/badge/docs-stable-brightgreen.svg
-    :target: https://sfincs.readthedocs.io/en/v2.0.2_blockhaus_release/
+    :target: https://sfincs.readthedocs.io/en/v2.0.3_cauberg_release/
     :alt: Stable docs last release
 
 .. |license| image:: https://img.shields.io/github/license/Deltares/SFINCS

diff --git a/docs/conf.py b/docs/conf.py
@@ -71,9 +71,9 @@ def setup(app):
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.2_Blockhaus'
+version = '2.0.3_Cauberg'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.2_Blockhaus'
+release = '2.0.3_Cauberg'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/input_forcing.rst b/docs/input_forcing.rst
@@ -249,11 +249,11 @@ Meteo
 
 There are a few different options to specify wind and rain input: 
 
-1) Use a spatially varying spiderweb input (as in Delft3D/Delft3D FM) for forcing tropical cyclones only the wind and pressure input, or for the wind as well as the rain input. 
+1) Use a spatially varying input in a polar coordinate system ('spiderweb'; as in Delft3D/Delft3D FM) for forcing tropical cyclones for wind and pressure input only, or also for rainfal. 
 
-2) Use a spatially varying grid input (as in Delft3D) for u- and v- wind velocities and/or the rain and/or pressure input. 
+2) Use a spatially varying grid input (as in Delft3D) for u- and v- wind velocities and/or the rain and/or pressure input.
 
-3) Use a spatially varying grid input using a netcdf file based on a FEWS input type format for wind, rain and/or atmospheric pressure input.
+3) Use a spatially varying grid input using a netcdf file based on a FEWS input type format for wind, rain, and/or atmospheric pressure input.
 
 4) Use a spatially uniform input for wind and rain, which is faster but also more simplified.
 
@@ -270,15 +270,23 @@ You can know how much rainfall / wind is added to the model in the output by spe
 Spatially varying spiderweb
 ^^^^^^^^^
 
-The option of forcing spiderweb files is only relevant for tropical cyclones, best is to put grid units in the same projected coordinate reference system (UTM zone) as the SFINCS grid.
-For generation of these spiderweb files use Deltares' Wind Enhancement Scheme tool (WES, see https://content.oss.deltares.nl/delft3d/manuals/Delft3D-WES_User_Manual.pdf or OET Matlab equivalent) or get in touch.
+The option of forcing spiderweb files is only relevant for tropical cyclones, as these time and spatially varying wind fields are constructed and written in a polar coordinate system.
+For generation of these spiderweb files use Deltares' Wind Enhancement Scheme tool (WES, see https://content.oss.deltares.nl/delft3d/manuals/Delft3D-WES_User_Manual.pdf, OET Matlab equivalent, the Coastal Hazards Toolkit or other methods). If you have issues with the generation of a spiderweb, feel free to get in touch.
+There are two options for spatially varying spiderweb. There is the 'traditional' ASCII format and the netcdf option. Both options support the possibility to include rainfall too.
 
-**Spiderweb-input:**
+**Spiderweb-input-ascii:**
 
 .. code-block:: text
 
 	spwfile = tropical_cyclone.spw
 
+**Spiderweb-input-netcdf:**
+
+.. code-block:: text
+
+	netspwfile = tropical_cyclone.nc
+
+
 
 Spatially varying gridded
 ^^^^^^^^^

diff --git a/source/LICENSING CONDITIONS for Free Trial Copy.txt b/source/LICENSING CONDITIONS for Free Trial Copy.txt
@@ -3,7 +3,7 @@ For the Free Trial Copy
 
 Read this agreement
 
-This is a legal agreement between the prospective user, either an individual or an entity, (hereafter: Licensee) and Stichting Deltares hereafter: Deltares. This Software [SFINCS v2.0.2 Blockhaus release 09-06-2023] is provided to you on the suspensive condition that you accept the following agreement. You are not allowed to copy, distribute, install or use the software without an agreement with Deltares. If you do not agree to the terms of this agreement, you must promptly stop installing this software and/or do not download the software from our site. Any further actions with respect to the software without an agreement with Deltares are in violation of copyright law.  Downloading, installation and/or use of the Software implies acceptance of this agreement.
+This is a legal agreement between the prospective user, either an individual or an entity, (hereafter: Licensee) and Stichting Deltares hereafter: Deltares. This Software [SFINCS v2.0.3 Cauberg release 15-11-2023] is provided to you on the suspensive condition that you accept the following agreement. You are not allowed to copy, distribute, install or use the software without an agreement with Deltares. If you do not agree to the terms of this agreement, you must promptly stop installing this software and/or do not download the software from our site. Any further actions with respect to the software without an agreement with Deltares are in violation of copyright law.  Downloading, installation and/or use of the Software implies acceptance of this agreement.
 
 
 Article 1: Evaluation license

diff --git a/source/sfincs/sfincs.vfproj.leijnse.user b/source/sfincs/sfincs.vfproj.leijnse.user
@@ -3,5 +3,5 @@
 	<Configurations>
 		<Configuration Name="Debug|Win32"/>
 		<Configuration Name="Release|Win32"/>
-		<Configuration Name="Debug|x64" CommandArguments="sfincs.inp -autostartstop -t 1" WorkingDirectory="d:\tmp\Flifs\workDir\"/>
-		<Configuration Name="Release|x64" WorkingDirectory="d:\temporary_model_runs\CDR_TC\Charleston_subgrid_example_basicforcing\"/></Configurations></VisualStudioUserFile>
+		<Configuration Name="Debug|x64" CommandArguments="sfincs.inp -autostartstop -t 1" WorkingDirectory="d:\repos\SFINCS_testbed_branch\sfincs_testbed_v2.0.3_alpha_03112023\models\03_Application\Hernani2D_advection\Input\"/>
+		<Configuration Name="Release|x64" WorkingDirectory="d:\repos\SFINCS_testbed_branch\sfincs_testbed_v2.0.3_alpha_03112023\models\03_Application\Puget_Sound_2020\Input\"/></Configurations></VisualStudioUserFile>
diff --git a/source/sfincs/x64/Release/LICENSING CONDITIONS for Free Trial Copy.txt b/source/sfincs/x64/Release/LICENSING CONDITIONS for Free Trial Copy.txt
@@ -3,7 +3,7 @@ For the Free Trial Copy
 
 Read this agreement
 
-This is a legal agreement between the prospective user, either an individual or an entity, (hereafter: Licensee) and Stichting Deltares hereafter: Deltares. This Software [SFINCS v2.0.2 Blockhaus release 09-06-2023] is provided to you on the suspensive condition that you accept the following agreement. You are not allowed to copy, distribute, install or use the software without an agreement with Deltares. If you do not agree to the terms of this agreement, you must promptly stop installing this software and/or do not download the software from our site. Any further actions with respect to the software without an agreement with Deltares are in violation of copyright law.  Downloading, installation and/or use of the Software implies acceptance of this agreement.
+This is a legal agreement between the prospective user, either an individual or an entity, (hereafter: Licensee) and Stichting Deltares hereafter: Deltares. This Software [SFINCS v2.0.3 Cauberg release 15-11-2023] is provided to you on the suspensive condition that you accept the following agreement. You are not allowed to copy, distribute, install or use the software without an agreement with Deltares. If you do not agree to the terms of this agreement, you must promptly stop installing this software and/or do not download the software from our site. Any further actions with respect to the software without an agreement with Deltares are in violation of copyright law.  Downloading, installation and/or use of the Software implies acceptance of this agreement.
 
 
 Article 1: Evaluation license