Skip to content

Rr/bugfix/unst 9327 additional rr testcases #324

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

Open
geertprinsen wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Rr/bugfix/unst 9327 additional rr testcases #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f007dd9
Added RR testcases SCS, Sacramento, HBV, LGSI, NWRW, specials, and ad…
geertprinsen Oct 21, 2025
717df8e
Updated XML files for RR testbench
geertprinsen Oct 22, 2025
b108847
Merge branch 'main' into rr/bugfix/UNST-9327-AdditionalRRTestcases
FlorisBuwaldaDeltares Oct 22, 2025
fc5d54e
Added adjustment of dimr_testbench_table.csv for additional testcase…
geertprinsen Oct 23, 2025
d839954
Updated xml path version timestamps, to include latest version of tes…
geertprinsen Nov 7, 2025
4afbba9
Update dimr_drr_specials.xml and sobek_3b.fnm Minio files
geertprinsen Nov 11, 2025
f3cd657
Update dimr_drr_specials.xml timestamps after adding industry.3b file…
geertprinsen Nov 11, 2025
ee767fa
Small updated unpaved.xml, specials.xml, testcases Minio.
geertprinsen Nov 13, 2025
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,7 @@ src/**/FortranCInterface.h
/ci/DIMRset_delivery/venv/**
/ci/teamcity/Delft3D/target/**
**/result_doc/**
/nieuweTestcase.txt
/test/deltares_testbench/upload_new_testcase.bat
/test/deltares_testbench/update_reference.bat
/test/deltares_testbench/RUN_TESTBENCH.BAT
Comment on lines +52 to +55
Copy link
Contributor

@FlorisBuwaldaDeltares FlorisBuwaldaDeltares Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

de .gitignore is handig als je aan het werk bent, maar we willen deze changes niet in de repository ;)

10 changes: 10 additions & 0 deletions ci/teamcity/Delft3D/vars/dimr_testbench_table.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@ drr walrus,dimr/dimr_drr_walrus_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALS
drr walrus,dimr/dimr_drr_walrus_win64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr scs,dimr/dimr_drr_scs_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr scs,dimr/dimr_drr_scs_win64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr sacramento,dimr/dimr_drr_sacramento_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr sacramento,dimr/dimr_drr_sacramento_win64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr hbv,dimr/dimr_drr_hbv_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr hbv,dimr/dimr_drr_hbv_win64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr nwrw,dimr/dimr_drr_nwrw_urban_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr nwrw,dimr/dimr_drr_nwrw_urban_win64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr lgsi,dimr/dimr_drr_lgsi_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr lgsi,dimr/dimr_drr_lgsi_win64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr specials,dimr/dimr_drr_specials_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
drr specials,dimr/dimr_drr_specials_win64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,
dwaq drtc,dimr/dimr_dwaq_drtc_lnx64.xml,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,TRUE,FALSE,TRUE,TRUE,
dwaq drtc,dimr/dimr_dwaq_drtc_win64.xml,TRUE,TRUE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,TRUE,FALSE,TRUE,TRUE,
dwaves,dimr/dimr_dwaves_lnx64.xml,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,
Expand Down
93 changes: 93 additions & 0 deletions test/deltares_testbench/configs/dimr/dimr_drr_hbv_lnx64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<deltaresTestbench_v3 xmlns="http://schemas.deltares.nl/deltaresTestbench_v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://schemas.deltares.nl/deltaresTestbench_v3 http://content.oss.deltares.nl/schemas/deltaresTestbench_v3-2.00.xsd">
<!--
Basic Linux configuration file
-->
<config>
<localPaths>
<testCasesDir>./data/cases</testCasesDir>
<enginesDir>./data/engines</enginesDir>
<referenceDir>./data/reference_results</referenceDir>
</localPaths>
<locations>
<location name="reference_results">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="cases">
<credential ref="commandline"/>
<root>{server_base_url}/cases</root>
</location>
<location name="reference_engines">
<credential ref="commandline"/>
<root>{server_base_url}/references/bin</root>
</location>
<location name="engines_to_compare">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="local">
<root>./data/engines</root>
</location>
</locations>
</config>
<!--
Programs
-->
<programs>
<!--
The order is important. Start with the following programs:
command_prompt
mpi
-->
<program name="command_prompt">
<path>/bin/bash</path>
<arguments>
<argument>-c</argument>
</arguments>
</program>
<program name="dimr" logOutputToFile="true" programStringRemoveQuotes="true" addSearchPaths="true" excludeSearchPathsContaining="share/delft3d/esmf">
<location ref="reference_engines" type="reference">
<from>lnx64</from>
</location>
<location ref="local" type="check">
<from>teamcity_artifacts/lnx64</from> <!-- just the first part of the directory structure, wil be file by TeamCity -->
</location>
<path>bin/dimr</path>
<environments>
<!-- <environment name="D3D_HOME" type="path">[programpath(dimr)]/../..</environment> -->
<!-- <environment name="ARCH" type="raw">lnx64</environment> -->
<environment name="OMP_NUM_THREADS" type="raw">1</environment>
<!-- <environment name="LD_PRELOAD" type="path">[programpath(dimr)]/../lib/libmkl_core.so</environment> -->
</environments>
</program>
</programs>
<!--
default testCases
-->
<defaultTestCases>
<testCase name="drr_default">
<programs>
<program ref="dimr">
<arguments>
<argument>dimr.xml</argument>
</arguments>
</program>
</programs>
<location ref="reference_results" type="reference">
<from>win64</from>
</location>
<location ref="cases" type="input">
<from>.</from>
</location>
<maxRunTime>60.0</maxRunTime> <!-- seconds -->
</testCase>
</defaultTestCases>
<!--
testCases
-->
<xi:include href="../include/dimr_drr_hbv.xml"/>
</deltaresTestbench_v3>
89 changes: 89 additions & 0 deletions test/deltares_testbench/configs/dimr/dimr_drr_hbv_win64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<deltaresTestbench_v3 xmlns="http://schemas.deltares.nl/deltaresTestbench_v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://schemas.deltares.nl/deltaresTestbench_v3 http://content.oss.deltares.nl/schemas/deltaresTestbench_v3-2.00.xsd">
<!--
Basic Windows configuration file: For "wes" (Wind Enhanced Scheme)
-->
<config>
<localPaths>
<testCasesDir>./data/cases</testCasesDir>
<enginesDir>./data/engines</enginesDir>
<referenceDir>./data/reference_results</referenceDir>
</localPaths>
<locations>
<location name="reference_engines">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="reference_results">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="cases">
<credential ref="commandline"/>
<root>{server_base_url}/cases</root>
</location>
<location name="engines_to_compare">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="local">
<root>./data/engines</root>
</location>
</locations>
</config>
<!--
Programs
-->
<programs>
<!--
The order is important. Start with the following programs:
command_prompt
mpi
-->
<program name="command_prompt">
<path>cmd</path>
<arguments>
<argument>/C</argument>
</arguments>
</program>
<program name="dimr" logOutputToFile="true" programStringRemoveQuotes="true" addSearchPaths="true">
<path>bin/run_dimr.bat</path>
<shell ref="command_prompt"/>
<location ref="reference_engines" type="reference">
<from>win64</from>
</location>
<location ref="engines_to_compare" type="check">
<from>teamcity_artifacts/x64</from>
</location>
</program>
</programs>
<!--
default testCases
-->
<defaultTestCases>
<testCase name="drr_default">
<programs>
<program ref="dimr">
<arguments>
<argument>dimr.xml</argument>
</arguments>
</program>
</programs>
<location ref="reference_results" type="reference">
<from>win64</from>
</location>
<location ref="cases" type="input">
<from>.</from>
</location>
<maxRunTime>60.0</maxRunTime>
<!-- seconds -->
</testCase>
</defaultTestCases>
<!--
testCases
-->
<xi:include href="../include/dimr_drr_hbv.xml"/>
</deltaresTestbench_v3>
93 changes: 93 additions & 0 deletions test/deltares_testbench/configs/dimr/dimr_drr_lgsi_lnx64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<deltaresTestbench_v3 xmlns="http://schemas.deltares.nl/deltaresTestbench_v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://schemas.deltares.nl/deltaresTestbench_v3 http://content.oss.deltares.nl/schemas/deltaresTestbench_v3-2.00.xsd">
<!--
Basic Linux configuration file
-->
<config>
<localPaths>
<testCasesDir>./data/cases</testCasesDir>
<enginesDir>./data/engines</enginesDir>
<referenceDir>./data/reference_results</referenceDir>
</localPaths>
<locations>
<location name="reference_results">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="cases">
<credential ref="commandline"/>
<root>{server_base_url}/cases</root>
</location>
<location name="reference_engines">
<credential ref="commandline"/>
<root>{server_base_url}/references/bin</root>
</location>
<location name="engines_to_compare">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="local">
<root>./data/engines</root>
</location>
</locations>
</config>
<!--
Programs
-->
<programs>
<!--
The order is important. Start with the following programs:
command_prompt
mpi
-->
<program name="command_prompt">
<path>/bin/bash</path>
<arguments>
<argument>-c</argument>
</arguments>
</program>
<program name="dimr" logOutputToFile="true" programStringRemoveQuotes="true" addSearchPaths="true" excludeSearchPathsContaining="share/delft3d/esmf">
<location ref="reference_engines" type="reference">
<from>lnx64</from>
</location>
<location ref="local" type="check">
<from>teamcity_artifacts/lnx64</from> <!-- just the first part of the directory structure, wil be file by TeamCity -->
</location>
<path>bin/dimr</path>
<environments>
<!-- <environment name="D3D_HOME" type="path">[programpath(dimr)]/../..</environment> -->
<!-- <environment name="ARCH" type="raw">lnx64</environment> -->
<environment name="OMP_NUM_THREADS" type="raw">1</environment>
<!-- <environment name="LD_PRELOAD" type="path">[programpath(dimr)]/../lib/libmkl_core.so</environment> -->
</environments>
</program>
</programs>
<!--
default testCases
-->
<defaultTestCases>
<testCase name="drr_default">
<programs>
<program ref="dimr">
<arguments>
<argument>dimr.xml</argument>
</arguments>
</program>
</programs>
<location ref="reference_results" type="reference">
<from>win64</from>
</location>
<location ref="cases" type="input">
<from>.</from>
</location>
<maxRunTime>60.0</maxRunTime> <!-- seconds -->
</testCase>
</defaultTestCases>
<!--
testCases
-->
<xi:include href="../include/dimr_drr_lgsi.xml"/>
</deltaresTestbench_v3>
89 changes: 89 additions & 0 deletions test/deltares_testbench/configs/dimr/dimr_drr_lgsi_win64.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<deltaresTestbench_v3 xmlns="http://schemas.deltares.nl/deltaresTestbench_v3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://schemas.deltares.nl/deltaresTestbench_v3 http://content.oss.deltares.nl/schemas/deltaresTestbench_v3-2.00.xsd">
<!--
Basic Windows configuration file: For "wes" (Wind Enhanced Scheme)
-->
<config>
<localPaths>
<testCasesDir>./data/cases</testCasesDir>
<enginesDir>./data/engines</enginesDir>
<referenceDir>./data/reference_results</referenceDir>
</localPaths>
<locations>
<location name="reference_engines">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="reference_results">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="cases">
<credential ref="commandline"/>
<root>{server_base_url}/cases</root>
</location>
<location name="engines_to_compare">
<credential ref="commandline"/>
<root>{server_base_url}/references</root>
</location>
<location name="local">
<root>./data/engines</root>
</location>
</locations>
</config>
<!--
Programs
-->
<programs>
<!--
The order is important. Start with the following programs:
command_prompt
mpi
-->
<program name="command_prompt">
<path>cmd</path>
<arguments>
<argument>/C</argument>
</arguments>
</program>
<program name="dimr" logOutputToFile="true" programStringRemoveQuotes="true" addSearchPaths="true">
<path>bin/run_dimr.bat</path>
<shell ref="command_prompt"/>
<location ref="reference_engines" type="reference">
<from>win64</from>
</location>
<location ref="engines_to_compare" type="check">
<from>teamcity_artifacts/x64</from>
</location>
</program>
</programs>
<!--
default testCases
-->
<defaultTestCases>
<testCase name="drr_default">
<programs>
<program ref="dimr">
<arguments>
<argument>dimr.xml</argument>
</arguments>
</program>
</programs>
<location ref="reference_results" type="reference">
<from>win64</from>
</location>
<location ref="cases" type="input">
<from>.</from>
</location>
<maxRunTime>60.0</maxRunTime>
<!-- seconds -->
</testCase>
</defaultTestCases>
<!--
testCases
-->
<xi:include href="../include/dimr_drr_lgsi.xml"/>
</deltaresTestbench_v3>
Loading