OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 01:31:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed: rename ebos_oilwaterpolymer to ebos_oilwater_polymer

Browse Source 
make it the same as the flow model, allowing simplification
in the buildsystem
This commit is contained in:
Arne Morten Kvarving 2020-11-18 13:06:52 +01:00
parent 10c3f3b438
commit 9ad927799b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -225,8 +225,8 @@ set_property(TARGET moduleVersion PROPERTY POSITION_INDEPENDENT_CODE ON)
# but this is not exposed in a super-build. # but this is not exposed in a super-build.
add_dependencies(moduleVersion opmsimulators) add_dependencies(moduleVersion opmsimulators)
set(COMMON_MODELS brine extbo foam gasoil oilwater polymer solvent) set(COMMON_MODELS brine extbo foam gasoil oilwater oilwater_polymer polymer solvent)
set(FLOW_MODELS blackoil energy oilwater_brine oilwater_polymer oilwater_polymer_injectivity) set(FLOW_MODELS blackoil energy oilwater_brine oilwater_polymer_injectivity)
set(FLOW_TGTS) set(FLOW_TGTS)
foreach(OBJ ${COMMON_MODELS} ${FLOW_MODELS}) foreach(OBJ ${COMMON_MODELS} ${FLOW_MODELS})
@ -343,7 +343,7 @@ endif()
# the research oriented general-purpose ECL simulator ("ebos" == &ecl # the research oriented general-purpose ECL simulator ("ebos" == &ecl
# &black-&oil &simulator) # &black-&oil &simulator)
set(MEBOS_TARGETS "") set(MEBOS_TARGETS "")
set(EBOS_MODELS oilwaterpolymer thermal) set(EBOS_MODELS thermal)
foreach(OBJ ${COMMON_MODELS} blackoil ${EBOS_MODELS}) foreach(OBJ ${COMMON_MODELS} blackoil ${EBOS_MODELS})
add_library(ebos_lib${OBJ} OBJECT EXCLUDE_FROM_ALL ebos/ebos_${OBJ}.cc) add_library(ebos_lib${OBJ} OBJECT EXCLUDE_FROM_ALL ebos/ebos_${OBJ}.cc)
list(APPEND MEBOS_TARGETS $<TARGET_OBJECTS:ebos_lib${OBJ}>) list(APPEND MEBOS_TARGETS $<TARGET_OBJECTS:ebos_lib${OBJ}>)

0
ebos/ebos_oilwaterpolymer.cc → ebos/ebos_oilwater_polymer.cc
View File

0
ebos/ebos_oilwaterpolymer.hh → ebos/ebos_oilwater_polymer.hh
View File

2
ebos/ebos_oilwaterpolymer_main.cc → ebos/ebos_oilwater_polymer_main.cc
View File

@ -29,7 +29,7 @@
*/ */
#include "config.h" #include "config.h"
#include "ebos_oilwaterpolymer.hh" #include "ebos_oilwater_polymer.hh"
int main(int argc, char** argv) int main(int argc, char** argv)
{ {

2
ebos/mebos_main.cc
View File

@ -33,7 +33,7 @@
#include "ebos_blackoil.hh" #include "ebos_blackoil.hh"
#include "ebos_oilwater.hh" #include "ebos_oilwater.hh"
#include "ebos_oilwaterpolymer.hh" #include "ebos_oilwater_polymer.hh"
#include "ebos_gasoil.hh" #include "ebos_gasoil.hh"
// TODO (?): #include "ebos_watergas.hh" // TODO (?): #include "ebos_watergas.hh"
#include "ebos_thermal.hh" #include "ebos_thermal.hh"