changed: rename ewoms to opm-models

cmake/Modules/OpmFind.cmake

@@ -66,10 +66,6 @@ set (_opm_proj_exemptions
   dune-fem
   )
 
-# although a DUNE module, it is delivered in the OPM suite
-set (opm-core_SUITE "opm")
-set (ewoms_SUITE "opm")
-
 # insert this boilerplate whenever we are going to find a new package
 macro (find_and_append_package_to prefix name)
   # special handling for Boost to avoid inadvertedly picking up system
@@ -156,9 +152,6 @@ macro (find_and_append_package_to prefix name)
     if ( (NOT DEFINED ${name}_FOUND AND NOT DEFINED ${NAME}_FOUND )
          OR _search_components GREATER -1)
       string(REGEX MATCH "(dune|opm)-.*" _is_opm ${name})
-      if(NOT _is_opm)
-        string(REGEX MATCH "ewoms" _is_opm ${name})
-      endif()
       if(${name} STREQUAL "ecl")
         # Give us a chance to find ecl installed to CMAKE_INSTALL_PREFIX.
         # We need to deactivate the package registry for this.

cmake/Modules/OpmPackage.cmake

@@ -162,7 +162,7 @@ macro (find_package_deps module)
           # (i.e. if an optional package requests a package to be required,
           # the build will fail if it's not found)
 	  string (REPLACE "REQUIRED" "${_${module}_required}" _args_req "${_${module}_args}")
-          if(_dep MATCHES "opm-" OR _dep MATCHES "ewoms")
+          if(_dep MATCHES "opm-")
             set(deplist ${_dep})
             string(STRIP "${_dep}" _dep)
             string(REPLACE " " ";" deplist "${_dep}")

jenkins/build.sh

@@ -16,7 +16,7 @@ upstreamRev[libecl]=master
 declare -a downstreams
 downstreams=(opm-material
              opm-grid
-             ewoms
+             opm-models
              opm-simulators
              opm-upscaling
              )
@@ -24,7 +24,7 @@ downstreams=(opm-material
 declare -A downstreamRev
 downstreamRev[opm-material]=master
 downstreamRev[opm-grid]=master
-downstreamRev[ewoms]=master
+downstreamRev[opm-models]=master
 downstreamRev[opm-simulators]=master
 downstreamRev[opm-upscaling]=master
 

jenkins/update-opm-tests.sh

@@ -9,7 +9,7 @@ upstreams=(libecl
            opm-common
            opm-material
            opm-grid
-           ewoms
+           opm-models
            opm-simulators
            opm-upscaling
           )
@@ -19,7 +19,7 @@ upstreamRev[libecl]=master
 upstreamRev[opm-common]=master
 upstreamRev[opm-material]=master
 upstreamRev[opm-grid]=master
-upstreamRev[ewoms]=master
+upstreamRev[opm-models]=master
 upstreamRev[opm-simulators]=master
 upstreamRev[opm-upscaling]=master