Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj =================================================================== diff -u -rc94d3446132ca2723b97de5ec56a47e9e76738be -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision c94d3446132ca2723b97de5ec56a47e9e76738be) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -85,13 +85,12 @@ - - - + + @@ -102,8 +101,8 @@ - - + + @@ -132,8 +131,8 @@ - - + + @@ -163,8 +162,8 @@ - - + + @@ -187,8 +186,8 @@ - - + + Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/Readme.rtf =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/Readme.rtf (.../Readme.rtf) (revision 8a4a7ff34fc3908f5fb572cb860502d5677042cc) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/Readme.rtf (.../Readme.rtf) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -126,7 +126,7 @@ \par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 Het HRD bestand ( \hich\af31506\dbch\af31505\loch\f31506 Hydraulic Region Database\hich\af31506\dbch\af31505\loch\f31506 , }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 {\*\bkmkstart OLE_LINK3}{\*\bkmkstart OLE_LINK4} -\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v01.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 +\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 {\*\bkmkend OLE_LINK3}{\*\bkmkend OLE_LINK4}\loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 ) bevat }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 voor een tr\hich\af31506\dbch\af31505\loch\f31506 aject of een set van trajecten de \hich\af31506\dbch\af31505\loch\f31506 hydraulische belastingdata\hich\af31506\dbch\af31505\loch\f31506 per locatie in dat traject}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 @@ -186,7 +186,7 @@ \b\fs26\cf18\lang2057\langfe2052\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31502\dbch\af31501\loch\f31502 Instellingenbestand (config) \par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 Het instellingenbestand -{\*\bkmkstart OLE_LINK5}{\*\bkmkstart OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 (\loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v01.config.sqlite\loch\af31506\dbch\af31505\hich\f31506 \'94 +{\*\bkmkstart OLE_LINK5}{\*\bkmkstart OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 (\loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v02.config.sqlite\loch\af31506\dbch\af31505\hich\f31506 \'94 \hich\af31506\dbch\af31505\loch\f31506 ) {\*\bkmkend OLE_LINK5}{\*\bkmkend OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 beschrijft met welke rekeninstellingen Ringtoets de berekeningen moet uitvoeren,\hich\af31506\dbch\af31505\loch\f31506 gegeven een geselecteerde locatie en berekeningstype (voor een waterstandsberekening zijn vaak andere instellingen nodig dan voor het bepalen van belastingen bij bekledingen). }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid12722462 @@ -208,7 +208,7 @@ \b\lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 Koppel}{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid9002866\charrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 met HRD bestand}{ \rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 :}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 \hich\af31506\dbch\af31505\loch\f31506 Maak nu in het toegevoegde traject een koppeling met het HRD bestand (\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 -\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v01.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \loch\af31506\dbch\af31505\hich\f31506 \'94\hich\af31506\dbch\af31505\loch\f31506 uit dit zip-bestand op de locatie uit stap 1 +\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \loch\af31506\dbch\af31505\hich\f31506 \'94\hich\af31506\dbch\af31505\loch\f31506 uit dit zip-bestand op de locatie uit stap 1 \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 ). Doe dit door rechts te klikken op het \'93\hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 Hydraulische randvoorwaarden\'94\loch\f31506 element onder het toegevoegde traject in de projectboom in Ringtoets (zie ook onderstaande figuur). \par }\pard\plain \ltrpar\qc \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 @@ -7381,4 +7381,4 @@ 7f5a4a97d201feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file +0000000000000000000000000000000000000000000000000105000000000000}} Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/WBI2017_IJsselmeer_12-2_v01.config.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/WBI2017_IJsselmeer_12-2_v01.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/WBI2017_IJsselmeer_12-2_v02.config.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/WBI2017_IJsselmeer_12-2_v02.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Grasbekleding erosie kruin en binnentalud/hlcd.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/Readme.rtf =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/Readme.rtf (.../Readme.rtf) (revision 8a4a7ff34fc3908f5fb572cb860502d5677042cc) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/Readme.rtf (.../Readme.rtf) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -126,7 +126,7 @@ \par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 Het HRD bestand ( \hich\af31506\dbch\af31505\loch\f31506 Hydraulic Region Database\hich\af31506\dbch\af31505\loch\f31506 , }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 {\*\bkmkstart OLE_LINK3}{\*\bkmkstart OLE_LINK4} -\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v01.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 +\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 {\*\bkmkend OLE_LINK3}{\*\bkmkend OLE_LINK4}\loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 ) bevat }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 voor een tr\hich\af31506\dbch\af31505\loch\f31506 aject of een set van trajecten de \hich\af31506\dbch\af31505\loch\f31506 hydraulische belastingdata\hich\af31506\dbch\af31505\loch\f31506 per locatie in dat traject}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 @@ -186,7 +186,7 @@ \b\fs26\cf18\lang2057\langfe2052\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31502\dbch\af31501\loch\f31502 Instellingenbestand (config) \par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 Het instellingenbestand -{\*\bkmkstart OLE_LINK5}{\*\bkmkstart OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 (\loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v01.config.sqlite\loch\af31506\dbch\af31505\hich\f31506 \'94 +{\*\bkmkstart OLE_LINK5}{\*\bkmkstart OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 (\loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v02.config.sqlite\loch\af31506\dbch\af31505\hich\f31506 \'94 \hich\af31506\dbch\af31505\loch\f31506 ) {\*\bkmkend OLE_LINK5}{\*\bkmkend OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 beschrijft met welke rekeninstellingen Ringtoets de berekeningen moet uitvoeren,\hich\af31506\dbch\af31505\loch\f31506 gegeven een geselecteerde locatie en berekeningstype (voor een waterstandsberekening zijn vaak andere instellingen nodig dan voor het bepalen van belastingen bij bekledingen). }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid12722462 @@ -208,7 +208,7 @@ \b\lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 Koppel}{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid9002866\charrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 met HRD bestand}{ \rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 :}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 \hich\af31506\dbch\af31505\loch\f31506 Maak nu in het toegevoegde traject een koppeling met het HRD bestand (\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 -\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v01.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \loch\af31506\dbch\af31505\hich\f31506 \'94\hich\af31506\dbch\af31505\loch\f31506 uit dit zip-bestand op de locatie uit stap 1 +\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_12-2_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \loch\af31506\dbch\af31505\hich\f31506 \'94\hich\af31506\dbch\af31505\loch\f31506 uit dit zip-bestand op de locatie uit stap 1 \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 ). Doe dit door rechts te klikken op het \'93\hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 Hydraulische randvoorwaarden\'94\loch\f31506 element onder het toegevoegde traject in de projectboom in Ringtoets (zie ook onderstaande figuur). \par }\pard\plain \ltrpar\qc \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 @@ -7381,4 +7381,4 @@ 7f5a4a97d201feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file +0000000000000000000000000000000000000000000000000105000000000000}} Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/WBI2017_IJsselmeer_12-2_v01.config.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/WBI2017_IJsselmeer_12-2_v01.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/WBI2017_IJsselmeer_12-2_v02.config.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/WBI2017_IJsselmeer_12-2_v02.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/hlcd.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/Readme.rtf =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/Readme.rtf (.../Readme.rtf) (revision 8a4a7ff34fc3908f5fb572cb860502d5677042cc) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/Readme.rtf (.../Readme.rtf) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -126,7 +126,7 @@ \par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 Het HRD bestand ( \hich\af31506\dbch\af31505\loch\f31506 Hydraulic Region Database\hich\af31506\dbch\af31505\loch\f31506 , }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 {\*\bkmkstart OLE_LINK3}{\*\bkmkstart OLE_LINK4} -\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_13-6_v01.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 +\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_13-6_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 {\*\bkmkend OLE_LINK3}{\*\bkmkend OLE_LINK4}\loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 ) bevat }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 voor een tr\hich\af31506\dbch\af31505\loch\f31506 aject of een set van trajecten de \hich\af31506\dbch\af31505\loch\f31506 hydraulische belastingdata\hich\af31506\dbch\af31505\loch\f31506 per locatie in dat traject}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 @@ -186,7 +186,7 @@ \b\fs26\cf18\lang2057\langfe2052\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31502\dbch\af31501\loch\f31502 Instellingenbestand (config) \par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 Het instellingenbestand -{\*\bkmkstart OLE_LINK5}{\*\bkmkstart OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 (\loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_13-6_v01.config.sqlite\loch\af31506\dbch\af31505\hich\f31506 \'94 +{\*\bkmkstart OLE_LINK5}{\*\bkmkstart OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 (\loch\af31506\dbch\af31505\hich\f31506 \'93\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_13-6_v02.config.sqlite\loch\af31506\dbch\af31505\hich\f31506 \'94 \hich\af31506\dbch\af31505\loch\f31506 ) {\*\bkmkend OLE_LINK5}{\*\bkmkend OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 beschrijft met welke rekeninstellingen Ringtoets de berekeningen moet uitvoeren,\hich\af31506\dbch\af31505\loch\f31506 gegeven een geselecteerde locatie en berekeningstype (voor een waterstandsberekening zijn vaak andere instellingen nodig dan voor het bepalen van belastingen bij bekledingen). }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid12722462 @@ -208,7 +208,7 @@ \b\lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 Koppel}{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid9002866\charrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 met HRD bestand}{ \rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 :}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \hich\af31506\dbch\af31505\loch\f31506 \hich\af31506\dbch\af31505\loch\f31506 Maak nu in het toegevoegde traject een koppeling met het HRD bestand (\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866\charrsid11208 -\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_13-6_v01.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \loch\af31506\dbch\af31505\hich\f31506 \'94\hich\af31506\dbch\af31505\loch\f31506 uit dit zip-bestand op de locatie uit stap 1 +\hich\af31506\dbch\af31505\loch\f31506 WBI2017_IJsselmeer_13-6_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid9002866 \loch\af31506\dbch\af31505\hich\f31506 \'94\hich\af31506\dbch\af31505\loch\f31506 uit dit zip-bestand op de locatie uit stap 1 \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 ). Doe dit door rechts te klikken op het \'93\hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 Hydraulische randvoorwaarden\'94\loch\f31506 element onder het toegevoegde traject in de projectboom in Ringtoets (zie ook onderstaande figuur). \par }\pard\plain \ltrpar\qc \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9002866 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 @@ -7381,4 +7381,4 @@ 7f5a4a97d201feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file +0000000000000000000000000000000000000000000000000105000000000000}} Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/WBI2017_IJsselmeer_13-6_v01.config.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/WBI2017_IJsselmeer_13-6_v01.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/WBI2017_IJsselmeer_13-6_v02.config.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/WBI2017_IJsselmeer_13-6_v02.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 13-6 - Kunstwerken - Sas sluis/hlcd.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/Readme.rtf =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/Readme.rtf (.../Readme.rtf) (revision 8a4a7ff34fc3908f5fb572cb860502d5677042cc) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/Readme.rtf (.../Readme.rtf) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -120,7 +120,7 @@ \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 Het HRD bestand (}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid12722462\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 Hydraulic Region Database}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 , }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid6032792 {\*\bkmkstart OLE_LINK3}{\*\bkmkstart OLE_LINK4}\loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 -\lang1043\langfe2052\langnp1043\insrsid11208\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_Bovenrijn_52-2_v01.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid6032792 {\*\bkmkend OLE_LINK3}{\*\bkmkend OLE_LINK4} +\lang1043\langfe2052\langnp1043\insrsid11208\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_Bovenrijn_52-2_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid6032792 {\*\bkmkend OLE_LINK3}{\*\bkmkend OLE_LINK4} \loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 ) bevat statistische informatie. }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208 \hich\af31506\dbch\af31505\loch\f31506 Deze inform\hich\af31506\dbch\af31505\loch\f31506 atie kan door Hydra-Ring (rekenhart van Ringtoets) worden gebruikt tijdens een berekening. Omdat het om veel informatie gaat, is een HRD bestand niet landsdekkend. Per gebied is er een apart HRD bestand beschikbaar waarin informatie is opgenomen die relev @@ -154,7 +154,7 @@ \par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12722462 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208 \hich\af31506\dbch\af31505\loch\f31506 Het in\hich\af31506\dbch\af31505\loch\f31506 stellingenbestand {\*\bkmkstart OLE_LINK5}{\*\bkmkstart OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 (}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid12015445 \loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 -\ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_Bovenrijn_52-2_v01.config.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid12015445 \loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 +\ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_Bovenrijn_52-2_v02.config.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid12015445 \loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11208 \hich\af31506\dbch\af31505\loch\f31506 ) {\*\bkmkend OLE_LINK5}{\*\bkmkend OLE_LINK6}\hich\af31506\dbch\af31505\loch\f31506 beschrijft met welke rekeninstellingen Ringtoets de berekeningen moet uitvoeren gegeven een geselecteerde locatie en berekeningstype (voor een waterstandsberekening zijn vaak ande\hich\af31506\dbch\af31505\loch\f31506 re instellingen nodig dan voor het bepalen van belastingen bij bekledingen). }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid12722462\charrsid12722462 @@ -177,7 +177,7 @@ \b\lang1043\langfe2052\langnp1043\insrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 Koppel}{\rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid6634065\charrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 met HRD bestand}{ \rtlch\fcs1 \af0 \ltrch\fcs0 \b\lang1043\langfe2052\langnp1043\insrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 :}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid6634065 \hich\af31506\dbch\af31505\loch\f31506 }{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 Maak nu in het toeg\hich\af31506\dbch\af31505\loch\f31506 evoegde traject een koppeling met het HRD bestand (}{\rtlch\fcs1 \af0 \ltrch\fcs0 -\lang1043\langfe2052\langnp1043\insrsid11170890 \loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid6448798\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_Bovenrijn_52-2_v01.sqlite}{\rtlch\fcs1 \af0 +\lang1043\langfe2052\langnp1043\insrsid11170890 \loch\af31506\dbch\af31505\hich\f31506 \'93}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid6448798\charrsid11208 \hich\af31506\dbch\af31505\loch\f31506 WBI2017_Bovenrijn_52-2_v02.sqlite}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid11170890 \loch\af31506\dbch\af31505\hich\f31506 \'94}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid16320058 \hich\af31506\dbch\af31505\loch\f31506 uit dit zip-bestand op de locatie uit stap 1}{\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid15872886 \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 ). Doe dit door rechts te klikken op het \'93\loch\f31506 \hich\f31506 Hydraulische randvoorwaarden\'94\loch\f31506 element onder het toegevoegde traject in de projectboom in Ringtoets (zie o\hich\af31506\dbch\af31505\loch\f31506 ok onderstaande figuur).}{\rtlch\fcs1 \af0 \ltrch\fcs0 @@ -7350,4 +7350,4 @@ a7e53734d201feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file +0000000000000000000000000000000000000000000000000105000000000000}} Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/WBI2017_Bovenrijn_52-2_v01.config.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/WBI2017_Bovenrijn_52-2_v01.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/WBI2017_Bovenrijn_52-2_v02.config.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/WBI2017_Bovenrijn_52-2_v02.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 52-2 - Kunstwerken - Coupure worp/hlcd.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification.wxs =================================================================== diff -u -rff41a4df81fabad5ed7e37bdbc140f70161acbf8 -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification.wxs (.../InstallationVerification.wxs) (revision ff41a4df81fabad5ed7e37bdbc140f70161acbf8) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification.wxs (.../InstallationVerification.wxs) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -6,10 +6,10 @@ - + - + Index: Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification/WBI2017_IJsselmeer_12-2_v01.config.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification/WBI2017_IJsselmeer_12-2_v01.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification/WBI2017_IJsselmeer_12-2_v02.config.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification/WBI2017_IJsselmeer_12-2_v02.sqlite =================================================================== diff -u Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/InstallationVerification/hlcd.sqlite =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -515,7 +515,7 @@ private IList GetForlandModelsConfiguration() { var orderDictionaries = new List(); - foreach (HydraRingCalculationInput input in hydraRingInputs.Where(i => i.ForelandsPoints.Any())) + foreach (HydraRingCalculationInput input in hydraRingInputs.Where(i => i.ForelandsPoints.Any() || i.BreakWater != null)) { FailureMechanismDefaults failureMechanismDefaults = failureMechanismDefaultsProvider.GetFailureMechanismDefaults(input.FailureMechanismType); orderDictionaries.Add(new OrderedDictionary Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -rbdb164e866b612ba16bbe82aa181dfc7010c7e2b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision bdb164e866b612ba16bbe82aa181dfc7010c7e2b) @@ -87,12 +87,16 @@ } [Test] - public void WriteDatabaseCreationScript_SingleHydraRingCalculationInputAddedToConfiguration_WritesExpectedCreationScript() + [TestCase(true, true)] + [TestCase(true, false)] + [TestCase(false, true)] + [TestCase(false, false)] + public void WriteDatabaseCreationScript_SingleHydraRingCalculationInput_WritesExpectedCreationScript(bool withForeland, bool withBreakWater) { // Setup var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.Model); - hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004) + hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004, withForeland, withBreakWater) { DesignTablesSetting = new DesignTablesSetting(6.6, 7.7), NumericsSettings = new Dictionary @@ -104,6 +108,17 @@ TimeIntegrationSetting = new TimeIntegrationSetting(3) }); + string expectedForelandModelsScript = withForeland || withBreakWater + ? "INSERT INTO [ForelandModels] VALUES (1, 1, 3);" + Environment.NewLine + : string.Empty; + string expectedForelandsScript = withForeland + ? "INSERT INTO [Forelands] VALUES (1, 1, 1.1, 2.2);" + Environment.NewLine + + "INSERT INTO [Forelands] VALUES (1, 2, 2.2, 3.3);" + Environment.NewLine + : string.Empty; + string expectedBreakWatersScript = withBreakWater + ? "INSERT INTO [Breakwaters] VALUES (1, 1, 99.9);" + Environment.NewLine + : string.Empty; + string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + "INSERT INTO [HydraulicModels] VALUES (1, 2, 'WTI 2017');" + Environment.NewLine + Environment.NewLine + @@ -155,11 +170,10 @@ "INSERT INTO [Profiles] VALUES (1, 2, 11.1, 22.2);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [ForelandModels];" + Environment.NewLine + - "INSERT INTO [ForelandModels] VALUES (1, 1, 3);" + Environment.NewLine + + expectedForelandModelsScript + Environment.NewLine + "DELETE FROM [Forelands];" + Environment.NewLine + - "INSERT INTO [Forelands] VALUES (1, 1, 1.1, 2.2);" + Environment.NewLine + - "INSERT INTO [Forelands] VALUES (1, 2, 2.2, 3.3);" + Environment.NewLine + + expectedForelandsScript + Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + @@ -178,7 +192,7 @@ "INSERT INTO [Projects] VALUES (1, 'WTI 2017', 'Ringtoets calculation');" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Breakwaters];" + Environment.NewLine + - "INSERT INTO [Breakwaters] VALUES (1, 1, 99.9);" + Environment.NewLine; + expectedBreakWatersScript; string databaseFilePath = Path.Combine(hydraRingDirectory, "temp.db"); using (new FileDisposeHelper(databaseFilePath)) @@ -193,7 +207,7 @@ } [Test] - public void WriteDatabaseCreationScript_MultipleHydraRingCalculationInputsAddedToConfiguration_WritesExpectedCreationScript() + public void WriteDatabaseCreationScript_MultipleHydraRingCalculationInputs_WritesExpectedCreationScript() { // Setup var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.Model); @@ -377,11 +391,16 @@ private class HydraRingCalculationInputImplementation : HydraRingCalculationInput { private readonly int sectionId; + private readonly bool withForeland; + private readonly bool withBreakWater; private HydraRingFailureMechanismType failureMechanismType; - public HydraRingCalculationInputImplementation(int sectionId, int hydraulicBoundaryLocationId) : base(hydraulicBoundaryLocationId) + public HydraRingCalculationInputImplementation(int sectionId, int hydraulicBoundaryLocationId, bool withForeland = true, bool withBreakWater = true) + : base(hydraulicBoundaryLocationId) { this.sectionId = sectionId; + this.withForeland = withForeland; + this.withBreakWater = withBreakWater; failureMechanismType = HydraRingFailureMechanismType.AssessmentLevel; } @@ -451,16 +470,21 @@ { get { - yield return new HydraRingForelandPoint(1.1, 2.2); - yield return new HydraRingForelandPoint(2.2, 3.3); + if (withForeland) + { + yield return new HydraRingForelandPoint(1.1, 2.2); + yield return new HydraRingForelandPoint(2.2, 3.3); + } } } public override HydraRingBreakWater BreakWater { get { - return new HydraRingBreakWater(1, 99.9); + return withBreakWater + ? new HydraRingBreakWater(1, 99.9) + : null; } }