diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 252657d7..27230a9d 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -150,6 +150,7 @@ list (APPEND MAIN_SOURCE_FILES
# originally generated with the command:
# find tests -name '*.cpp' -a ! -wholename '*/not-unit/*' -printf '\t%p\n' | sort
list (APPEND TEST_SOURCE_FILES
+ tests/test_writenumwells.cpp
tests/test_EclipseWriter.cpp
tests/test_compressedpropertyaccess.cpp
tests/test_spline.cpp
@@ -211,6 +212,7 @@ list (APPEND TEST_DATA_FILES
tests/satfuncEPS_D.DATA
tests/testBlackoilState1.DATA
tests/testBlackoilState2.DATA
+ tests/testBlackoilState3.DATA
tests/wells_manager_data.data
tests/wells_manager_data_expanded.data
tests/wells_manager_data_wellSTOP.data
diff --git a/tests/testBlackoilState3.DATA b/tests/testBlackoilState3.DATA
new file mode 100644
index 00000000..8b067f88
--- /dev/null
+++ b/tests/testBlackoilState3.DATA
@@ -0,0 +1,119 @@
+RUNSPEC
+
+TITLE
+UNIT TEST
+
+
+START
+1 NOV 1979 /
+
+OIL
+GAS
+WATER
+
+
+METRIC
+
+DIMENS
+ 10 10 10 /
+
+GRID
+DXV
+10*10 /
+
+DYV
+10*10 /
+
+DZV
+10*10 /
+
+DEPTHZ
+121*1000 /
+/
+
+
+
+
+SCHEDULE
+
+
+RPTSCHED
+ RESTART=2/
+
+DATES
+ 1 DES 1979/
+/
+
+WELSPECS
+ 'OP_1' 'OP' 9 9 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+ 'OP_2' 'OP' 8 8 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+ 'OP_3' 'OP' 7 7 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+/
+
+COMPDAT
+ 'OP_1' 9 9 1 1 'OPEN' 1* 32.948 0.311 3047.839 1* 1* 'X' 22.100 /
+ 'OP_1' 9 9 2 2 'OPEN' 1* 46.825 0.311 4332.346 1* 1* 'X' 22.123 /
+ 'OP_1' 9 9 3 3 'OPEN' 1* 51.867 0.311 4799.764 1* 1* 'X' 22.143 /
+ 'OP_1' 9 9 4 4 'OPEN' 1* 34.243 0.311 3169.482 1* 1* 'X' 22.166 /
+ 'OP_1' 9 9 5 5 'OPEN' 1* 36.435 0.311 3375.309 1* 1* 'X' 22.262 /
+ 'OP_1' 9 9 6 6 'OPEN' 1* 39.630 0.311 3672.067 1* 1* 'X' 22.283 /
+ 'OP_1' 9 9 7 7 'OPEN' 1* 33.975 0.311 3148.671 1* 1* 'X' 22.307 /
+ 'OP_1' 9 9 8 8 'OPEN' 1* 24.869 0.311 2305.242 1* 1* 'X' 22.329 /
+ 'OP_1' 9 9 9 9 'OPEN' 1* 38.301 0.311 3551.043 1* 1* 'X' 22.351 /
+ 'OP_1' 9 9 10 10 'OPEN' 1* 6.642 0.311 615.914 1* 1* 'X' 22.372 /
+ 'OP_2' 8 8 1 3 'OPEN' 1* 1.168 0.311 107.872 1* 1* 'Y' 21.925 /
+ 'OP_2' 8 7 3 3 'OPEN' 1* 15.071 0.311 1391.859 1* 1* 'Y' 21.920 /
+ 'OP_2' 8 7 3 6 'OPEN' 1* 6.242 0.311 576.458 1* 1* 'Y' 21.915 /
+ 'OP_3' 7 7 1 1 'OPEN' 1* 27.412 0.311 2445.337 1* 1* 'Y' 18.521 /
+ 'OP_3' 7 7 2 2 'OPEN' 1* 55.195 0.311 4923.842 1* 1* 'Y' 18.524 /
+ 'OP_3' 7 7 3 3 'OPEN' 1* 18.032 0.311 1608.615 1* 1* 'Y' 18.526 /
+ 'OP_3' 7 7 4 4 'OPEN' 1* 56.817 0.311 5047.177 1* 1* 'Y' 18.155 /
+ 'OP_3' 7 7 5 5 'OPEN' 1* 4.728 0.311 420.067 1* 1* 'Y' 18.162 /
+/
+
+DATES
+ 1 JUN 1980/
+/
+
+
+WELSPECS
+ 'OP_4' 'OP' 2 2 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+ 'OP_5' 'OP' 5 4 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+ 'OP_6' 'OP' 8 2 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+/
+
+COMPDAT
+ 'OP_4' 2 2 1 10 'OPEN' 1* 6.642 0.311 615.914 1* 1* 'X' 22.372 /
+ 'OP_5' 5 4 1 3 'OPEN' 1* 1.168 0.311 107.872 1* 1* 'Y' 21.925 /
+ 'OP_6' 8 2 1 3 'OPEN' 1* 27.412 0.311 2445.337 1* 1* 'Y' 18.521 /
+ 'OP_6' 8 3 3 3 'OPEN' 1* 55.195 0.311 4923.842 1* 1* 'Y' 18.524 /
+ 'OP_6' 8 4 3 3 'OPEN' 1* 18.032 0.311 1608.615 1* 1* 'Y' 18.526 /
+ 'OP_6' 8 5 3 5 'OPEN' 1* 56.817 0.311 5047.177 1* 1* 'Y' 18.155 /
+ 'OP_6' 8 5 5 6 'OPEN' 1* 4.728 0.311 420.067 1* 1* 'Y' 18.162 /
+/
+
+DATES
+ 1 NOV 1980/
+/
+
+WELSPECS
+ 'WI_1' 'WI' 3 3 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+ 'WI_2' 'WI' 3 9 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+ 'WI_3' 'WI' 3 6 1* 'OIL' 1* 1* 1* 1* 1* 1* 1* /
+/
+
+COMPDAT
+ 'WI_1' 3 3 1 10 'OPEN' 1* 6.642 0.311 615.914 1* 1* 'X' 22.372 /
+ 'WI_2' 3 9 1 7 'OPEN' 1* 1.168 0.311 107.872 1* 1* 'Y' 21.925 /
+ 'WI_3' 3 6 1 3 'OPEN' 1* 27.412 0.311 2445.337 1* 1* 'Y' 18.521 /
+/
+
+
+
+
+DATES
+ 1 NOV 1982/
+/
+
+END
+
diff --git a/tests/test_writenumwells.cpp b/tests/test_writenumwells.cpp
new file mode 100644
index 00000000..6094612a
--- /dev/null
+++ b/tests/test_writenumwells.cpp
@@ -0,0 +1,194 @@
+
+/*
+ Copyright 2014 Statoil IT
+ 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 .
+*/
+#include "config.h"
+
+#if HAVE_DYNAMIC_BOOST_TEST
+#define BOOST_TEST_DYN_LINK
+#endif
+
+#define BOOST_TEST_MODULE EclipseWriter
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+// ERT stuff
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+
+void verifyWellState(const std::string& rst_filename,
+ Opm::EclipseGridConstPtr ecl_grid,
+ Opm::ScheduleConstPtr schedule) {
+
+ well_info_type * well_info = well_info_alloc(ecl_grid->c_ptr());
+ well_info_load_rstfile(well_info, rst_filename.c_str(), false);
+
+ //Verify numwells
+ int numwells = well_info_get_num_wells(well_info);
+ BOOST_CHECK(numwells == (int)schedule->numWells());
+
+ std::vector wells = schedule->getWells();
+
+ for (int i = 0; i < numwells; ++i) {
+
+ //Verify wellnames
+ const char * wellname = well_info_iget_well_name(well_info, i);
+ Opm::WellConstPtr well = wells.at(i);
+ BOOST_CHECK(wellname == well->name());
+
+ // Verify well-head position data
+ well_ts_type * well_ts = well_info_get_ts(well_info , wellname);
+ well_state_type * well_state = well_ts_iget_state(well_ts, 0);
+ const well_conn_type * well_head = well_state_get_wellhead(well_state, ECL_GRID_GLOBAL_GRID);
+ BOOST_CHECK(well_conn_get_i(well_head) == well->getHeadI());
+ BOOST_CHECK(well_conn_get_j(well_head) == well->getHeadJ());
+
+ for (int j = 0; j < well_ts_get_size(well_ts); ++j) {
+ well_state_type * well_state = well_ts_iget_state(well_ts, j);
+
+ //Verify welltype
+ int ert_well_type = well_state_get_type(well_state);
+ WellType welltype = well->isProducer(j) ? PRODUCER : INJECTOR;
+ Opm::WellInjector::TypeEnum injectortype = well->getInjectionProperties(j).injectorType;
+ int ecl_converted_welltype = Opm::EclipseWriter::eclipseWellTypeMask(welltype, injectortype);
+ int ert_converted_welltype = well_state_translate_ecl_type_int(ecl_converted_welltype);
+ BOOST_CHECK(ert_well_type == ert_converted_welltype);
+
+ //Verify wellstatus
+ int ert_well_status = well_state_is_open(well_state) ? 1 : 0;
+
+ Opm::WellCommon::StatusEnum status = well->getStatus(j);
+ int wellstatus = Opm::EclipseWriter::eclipseWellStatusMask(status);
+
+ BOOST_CHECK(ert_well_status == wellstatus);
+
+ //Verify number of completion connections
+ const well_conn_collection_type * well_connections = well_state_get_global_connections( well_state );
+ size_t num_wellconnections = well_conn_collection_get_size(well_connections);
+
+ int report_nr = well_state_get_report_nr(well_state);
+ Opm::CompletionSetConstPtr completions_set = well->getCompletions((size_t)report_nr);
+
+ BOOST_CHECK(num_wellconnections == completions_set->size());
+
+ //Verify coordinates for each completion connection
+ for (size_t k = 0; k < num_wellconnections; ++k) {
+ const well_conn_type * well_connection = well_conn_collection_iget_const(well_connections , k);
+
+ Opm::CompletionConstPtr completion = completions_set->get(k);
+
+ BOOST_CHECK(well_conn_get_i(well_connection) == completion->getI());
+ BOOST_CHECK(well_conn_get_j(well_connection) == completion->getJ());
+ BOOST_CHECK(well_conn_get_k(well_connection) == completion->getK());
+ }
+ }
+ }
+
+ well_info_free(well_info);
+}
+
+
+std::shared_ptr createBlackOilState(Opm::EclipseGridConstPtr eclGrid) {
+
+ std::shared_ptr ourFineGridManagerPtr(new Opm::GridManager(eclGrid));
+ std::shared_ptr blackoilState(new Opm::BlackoilState);
+ blackoilState->init(*ourFineGridManagerPtr->c_grid(), 3);
+
+ return blackoilState;
+}
+
+
+Opm::DeckConstPtr createDeck(const std::string& eclipse_data_filename) {
+ Opm::ParserPtr parser(new Opm::Parser());
+ Opm::ParserLogPtr parserLog(new Opm::ParserLog);
+ Opm::DeckConstPtr deck = parser->parseFile(eclipse_data_filename, true, parserLog);
+
+ return deck;
+}
+
+
+Opm::EclipseWriterPtr createEclipseWriter(Opm::DeckConstPtr deck,
+ Opm::EclipseStatePtr eclipseState,
+ std::string& eclipse_data_filename) {
+
+ Opm::parameter::ParameterGroup params;
+ params.insertParameter("deck_filename", eclipse_data_filename);
+
+ const Opm::PhaseUsage phaseUsage = Opm::phaseUsageFromDeck(deck);
+
+ Opm::EclipseWriterPtr eclWriter(new Opm::EclipseWriter(params,
+ eclipseState,
+ phaseUsage,
+ eclipseState->getEclipseGrid()->getCartesianSize(),
+ 0));
+ return eclWriter;
+}
+
+
+BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo)
+{
+ std::string eclipse_data_filename = "testBlackoilState3.DATA";
+ std::string eclipse_restart_filename = "TESTBLACKOILSTATE3.UNRST";
+
+ test_work_area_type * test_area = test_work_area_alloc("TEST_EclipseWriteNumWells");
+ test_work_area_copy_file(test_area, eclipse_data_filename.c_str());
+
+ Opm::DeckConstPtr deck = createDeck(eclipse_data_filename);
+ Opm::EclipseStatePtr eclipseState(new Opm::EclipseState(deck));
+ Opm::EclipseWriterPtr eclipseWriter = createEclipseWriter(deck, eclipseState, eclipse_data_filename);
+
+ std::shared_ptr simTimer( new Opm::SimulatorTimer() );
+ simTimer->init(eclipseState->getSchedule()->getTimeMap());
+
+ eclipseWriter->writeInit(*simTimer);
+
+ std::shared_ptr wellState(new Opm::WellState());
+ std::shared_ptr blackoilState = createBlackOilState(eclipseState->getEclipseGrid());
+ wellState->init(0, *blackoilState);
+
+ int countTimeStep = eclipseState->getSchedule()->getTimeMap()->numTimesteps();
+
+ for(int timestep=0; timestep <= countTimeStep; ++timestep){
+ simTimer->setCurrentStepNum(timestep);
+ eclipseWriter->writeTimeStep(*simTimer, *blackoilState, *wellState);
+ }
+
+ verifyWellState(eclipse_restart_filename, eclipseState->getEclipseGrid(), eclipseState->getSchedule());
+
+ test_work_area_free(test_area);
+}