clean-up after rebase

This commit is contained in:
Tor Harald Sandve 2020-01-09 09:32:24 +01:00
parent 19a40c6047
commit 8b93953ef5
2 changed files with 31 additions and 0 deletions

View File

@ -297,3 +297,10 @@ endif()
if (OPM_ENABLE_PYTHON)
add_subdirectory(python)
endif()
# must link libraries after target 'flow' has been defined
if(CUDA_FOUND)
target_link_libraries( opmsimulators ${CUDA_cublas_LIBRARY} )
target_link_libraries( opmsimulators ${CUDA_cusparse_LIBRARY} )
endif()

View File

@ -3421,6 +3421,30 @@ void pack(const BrineDensityTable& data,
pack(data.getBrineDensityColumn(), buffer, position, comm);
}
void pack(const SummaryNode& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.keyword(), buffer, position, comm);
pack(data.category(), buffer, position, comm);
pack(data.location(), buffer, position, comm) ;
pack(data.type(), buffer, position, comm);
pack(data.namedEntity(), buffer, position, comm);
pack(data.number(), buffer, position, comm);
pack(data.isUserDefined(), buffer, position, comm);
}
void pack(const SummaryConfig& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getKwds(), buffer, position, comm);
pack(data.getShortKwds(), buffer, position, comm);
pack(data.getSmryKwds(), buffer, position, comm);
}
/// unpack routines
template<class T>