From 29d184131da46c52b385361d69b94e66014dee96 Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Fri, 8 Nov 2024 12:42:39 +0100 Subject: [PATCH] Correctly mark data files with ODBL and DBCL license tests/wells_no_perforation.data and tests/msw.data were falsely marked as GPLv3, the rest was missing lincense marks. --- tests/TESTTIMER.DATA | 6 ++++++ tests/TESTWELLMODEL.DATA | 6 ++++++ tests/capillary.DATA | 6 ++++++ tests/capillarySwatinit.DATA | 6 ++++++ tests/capillary_overlap.DATA | 6 ++++++ tests/deadfluids.DATA | 6 ++++++ tests/equil_base.DATA | 6 ++++++ tests/equil_capillary.DATA | 6 ++++++ tests/equil_capillary_overlap.DATA | 6 ++++++ tests/equil_capillary_swatinit.DATA | 6 ++++++ tests/equil_co2store_go.DATA | 6 ++++++ tests/equil_co2store_gw.DATA | 6 ++++++ tests/equil_deadfluids.DATA | 6 ++++++ tests/equil_humidwetgas.DATA | 6 ++++++ tests/equil_liveoil.DATA | 6 ++++++ tests/equil_liveoil_grid.DATA | 6 ++++++ tests/equil_pbvd_and_pdvd.DATA | 6 ++++++ tests/equil_rsvd_and_rvvd.DATA | 6 ++++++ tests/equil_rsvd_and_rvvd_and_rvwvd.DATA | 6 ++++++ tests/equil_wetgas.DATA | 6 ++++++ tests/liveoil.DATA | 6 ++++++ tests/msw.data | 20 ++++---------------- tests/relpermDiagnostics.DATA | 6 ++++++ tests/satfuncEPS_B.DATA | 6 ++++++ tests/testBlackoilState3.DATA | 6 ++++++ tests/testFluid.DATA | 6 ++++++ tests/wells_group.data | 6 ++++++ tests/wells_manager_data.data | 6 ++++++ tests/wells_manager_data_expanded.data | 6 ++++++ tests/wells_manager_data_wellSTOP.data | 6 ++++++ tests/wells_no_perforation.data | 20 ++++---------------- tests/wells_stopped.data | 6 ++++++ tests/wetgas.DATA | 6 ++++++ 33 files changed, 194 insertions(+), 32 deletions(-) diff --git a/tests/TESTTIMER.DATA b/tests/TESTTIMER.DATA index 24381c835..a59001ac5 100644 --- a/tests/TESTTIMER.DATA +++ b/tests/TESTTIMER.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC START diff --git a/tests/TESTWELLMODEL.DATA b/tests/TESTWELLMODEL.DATA index 796b4ff68..4cff82bfb 100644 --- a/tests/TESTWELLMODEL.DATA +++ b/tests/TESTWELLMODEL.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC DIMENS diff --git a/tests/capillary.DATA b/tests/capillary.DATA index 063db39fe..19e5268ce 100644 --- a/tests/capillary.DATA +++ b/tests/capillary.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + -- Most of the following sections are not actually needed by the test, -- but it is required by the Eclipse reference manual that they are -- present. Also, the higher level opm-parser classes diff --git a/tests/capillarySwatinit.DATA b/tests/capillarySwatinit.DATA index f4e693a58..30cef5ffb 100644 --- a/tests/capillarySwatinit.DATA +++ b/tests/capillarySwatinit.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + -- Most of the following sections are not actually needed by the test, -- but it is required by the Eclipse reference manual that they are -- present. Also, the higher level opm-parser classes diff --git a/tests/capillary_overlap.DATA b/tests/capillary_overlap.DATA index b59e42202..fc7a6e2e1 100644 --- a/tests/capillary_overlap.DATA +++ b/tests/capillary_overlap.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/deadfluids.DATA b/tests/deadfluids.DATA index 04264774e..2bcd37763 100644 --- a/tests/deadfluids.DATA +++ b/tests/deadfluids.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + -- Most of the following sections are not actually needed by the test, -- but it is required by the Eclipse reference manual that they are -- present. Also, the higher level opm-parser classes diff --git a/tests/equil_base.DATA b/tests/equil_base.DATA index 91b13c2db..204009785 100644 --- a/tests/equil_base.DATA +++ b/tests/equil_base.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC WATER diff --git a/tests/equil_capillary.DATA b/tests/equil_capillary.DATA index e53401b3e..a45eabeeb 100644 --- a/tests/equil_capillary.DATA +++ b/tests/equil_capillary.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + -- Most of the following sections are not actually needed by the test, -- but it is required by the Eclipse reference manual that they are -- present. Also, the higher level opm-parser classes diff --git a/tests/equil_capillary_overlap.DATA b/tests/equil_capillary_overlap.DATA index 1c5791afd..68bf403b3 100644 --- a/tests/equil_capillary_overlap.DATA +++ b/tests/equil_capillary_overlap.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_capillary_swatinit.DATA b/tests/equil_capillary_swatinit.DATA index 73a259286..8013ac142 100644 --- a/tests/equil_capillary_swatinit.DATA +++ b/tests/equil_capillary_swatinit.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + -- Most of the following sections are not actually needed by the test, -- but it is required by the Eclipse reference manual that they are -- present. Also, the higher level opm-parser classes diff --git a/tests/equil_co2store_go.DATA b/tests/equil_co2store_go.DATA index 2ff8efcd0..734beddd0 100644 --- a/tests/equil_co2store_go.DATA +++ b/tests/equil_co2store_go.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_co2store_gw.DATA b/tests/equil_co2store_gw.DATA index 6122549ed..61b44e254 100644 --- a/tests/equil_co2store_gw.DATA +++ b/tests/equil_co2store_gw.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_deadfluids.DATA b/tests/equil_deadfluids.DATA index f33f1a2f5..f7e845763 100644 --- a/tests/equil_deadfluids.DATA +++ b/tests/equil_deadfluids.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + -- Most of the following sections are not actually needed by the test, -- but it is required by the Eclipse reference manual that they are -- present. Also, the higher level opm-parser classes diff --git a/tests/equil_humidwetgas.DATA b/tests/equil_humidwetgas.DATA index 1b9109ae2..2965c88ee 100644 --- a/tests/equil_humidwetgas.DATA +++ b/tests/equil_humidwetgas.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_liveoil.DATA b/tests/equil_liveoil.DATA index c64bcbe37..0fbdc630b 100644 --- a/tests/equil_liveoil.DATA +++ b/tests/equil_liveoil.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_liveoil_grid.DATA b/tests/equil_liveoil_grid.DATA index 92e503c5c..170d2d7a8 100644 --- a/tests/equil_liveoil_grid.DATA +++ b/tests/equil_liveoil_grid.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + WATER OIL GAS diff --git a/tests/equil_pbvd_and_pdvd.DATA b/tests/equil_pbvd_and_pdvd.DATA index 78093c16e..c2b434e1c 100644 --- a/tests/equil_pbvd_and_pdvd.DATA +++ b/tests/equil_pbvd_and_pdvd.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_rsvd_and_rvvd.DATA b/tests/equil_rsvd_and_rvvd.DATA index 2b1d091c8..7d362e90b 100644 --- a/tests/equil_rsvd_and_rvvd.DATA +++ b/tests/equil_rsvd_and_rvvd.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_rsvd_and_rvvd_and_rvwvd.DATA b/tests/equil_rsvd_and_rvvd_and_rvwvd.DATA index 1d8af4166..dc8f6b634 100644 --- a/tests/equil_rsvd_and_rvvd_and_rvwvd.DATA +++ b/tests/equil_rsvd_and_rvvd_and_rvwvd.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/equil_wetgas.DATA b/tests/equil_wetgas.DATA index 9cf0c5eb8..7623d0721 100644 --- a/tests/equil_wetgas.DATA +++ b/tests/equil_wetgas.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/liveoil.DATA b/tests/liveoil.DATA index 47a24abac..3ad36f26d 100644 --- a/tests/liveoil.DATA +++ b/tests/liveoil.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC TABDIMS diff --git a/tests/msw.data b/tests/msw.data index 2640613f6..d321ac430 100644 --- a/tests/msw.data +++ b/tests/msw.data @@ -1,23 +1,11 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ -- Copyright 2015 SINTEF ICT, Applied Mathematics. -- Copyright 2016 Statoil ASA. --- This file is part of the Open Porous Media project (OPM). - --- OPM is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. - --- OPM is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. - --- You should have received a copy of the GNU General Public License --- along with OPM. If not, see . - - -- geophysics and fluid properties are copied from Norne RUNSPEC diff --git a/tests/relpermDiagnostics.DATA b/tests/relpermDiagnostics.DATA index 30b3555de..d24bffc68 100644 --- a/tests/relpermDiagnostics.DATA +++ b/tests/relpermDiagnostics.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC diff --git a/tests/satfuncEPS_B.DATA b/tests/satfuncEPS_B.DATA index 38f430f87..076da6454 100644 --- a/tests/satfuncEPS_B.DATA +++ b/tests/satfuncEPS_B.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + NOECHO RUNSPEC ====== diff --git a/tests/testBlackoilState3.DATA b/tests/testBlackoilState3.DATA index 27834606a..5eb918ab0 100644 --- a/tests/testBlackoilState3.DATA +++ b/tests/testBlackoilState3.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC TITLE diff --git a/tests/testFluid.DATA b/tests/testFluid.DATA index 78c598cca..ab87c38fe 100644 --- a/tests/testFluid.DATA +++ b/tests/testFluid.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + OIL WATER GAS diff --git a/tests/wells_group.data b/tests/wells_group.data index a8eca07f9..2c603d291 100644 --- a/tests/wells_group.data +++ b/tests/wells_group.data @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC OIL diff --git a/tests/wells_manager_data.data b/tests/wells_manager_data.data index 707f7749b..5dc5d48b9 100644 --- a/tests/wells_manager_data.data +++ b/tests/wells_manager_data.data @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC OIL diff --git a/tests/wells_manager_data_expanded.data b/tests/wells_manager_data_expanded.data index 3f39fa849..12ad1c612 100644 --- a/tests/wells_manager_data_expanded.data +++ b/tests/wells_manager_data_expanded.data @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + OIL GAS WATER diff --git a/tests/wells_manager_data_wellSTOP.data b/tests/wells_manager_data_wellSTOP.data index 635a1893b..cd8947eca 100644 --- a/tests/wells_manager_data_wellSTOP.data +++ b/tests/wells_manager_data_wellSTOP.data @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC OIL diff --git a/tests/wells_no_perforation.data b/tests/wells_no_perforation.data index b7d6ef838..3327585c8 100644 --- a/tests/wells_no_perforation.data +++ b/tests/wells_no_perforation.data @@ -1,23 +1,11 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ -- Copyright 2015 SINTEF ICT, Applied Mathematics. -- Copyright 2016 Statoil ASA. --- This file is part of the Open Porous Media project (OPM). - --- OPM is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. - --- OPM is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. - --- You should have received a copy of the GNU General Public License --- along with OPM. If not, see . - - -- geophysics and fluid properties are copied from Norne RUNSPEC diff --git a/tests/wells_stopped.data b/tests/wells_stopped.data index 609da7267..644d2d8db 100644 --- a/tests/wells_stopped.data +++ b/tests/wells_stopped.data @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC OIL diff --git a/tests/wetgas.DATA b/tests/wetgas.DATA index 04183d90f..b59d042e7 100644 --- a/tests/wetgas.DATA +++ b/tests/wetgas.DATA @@ -1,3 +1,9 @@ +-- This reservoir simulation deck is made available under the Open Database +-- License: http://opendatacommons.org/licenses/odbl/1.0/. Any rights in +-- individual contents of the database are licensed under the Database Contents +-- License: http://opendatacommons.org/licenses/dbcl/1.0/ + + RUNSPEC TABDIMS