Skip to content

Commit ef50fcb

Browse files
rrsettgastAlgiane
rrsettgast
authored and
Algiane
committed
chore: Change GEOSX to GEOS in a bunch of places (#3219)
* GEOSX_USE to GEOS_USE * GEOSX_ENABLE to GEOS_ENABLE * GEOSX_LA to GEOS_LA * GEOSX_TPL to GEOS_TPL * GEOSX_ to GEOS_ excluding .py and .msub * change version number
1 parent a8609e2 commit ef50fcb

File tree

1,280 files changed

+7283
-5621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,280 files changed

+7283
-5621
lines changed

‎.github/workflows/build_and_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ jobs:
149149
150150
COMMIT=${{ github.event.pull_request.head.sha }}
151151
SHORT_COMMIT=${COMMIT:0:7}
152-
script_args+=(--install-dir-basename GEOSX-${SHORT_COMMIT})
152+
script_args+=(--install-dir-basename GEOS-${SHORT_COMMIT})
153153
154154
# All the data exchanged with the docker container is eventually meant to be sent to the cloud.
155155
if [[ ! -z "${{ inputs.GCP_BUCKET }}" ]]; then
156156
if [ "${{ inputs.BUILD_TYPE }}" = "build" ]; then
157-
DATA_BASENAME=GEOSX-and-TPL-${SHORT_COMMIT}.tar.gz
157+
DATA_BASENAME=GEOS-and-TPL-${SHORT_COMMIT}.tar.gz
158158
elif [ "${{ inputs.BUILD_TYPE }}" = "integrated_tests" ]; then
159159
DATA_BASENAME=integratedTests-pr${{ github.event.number }}-${{ github.run_number }}-${SHORT_COMMIT}.tar.gz
160160
script_args+=(--run-integrated-tests)

‎COPYRIGHT

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
Intellectual Property Notice
22
----------------------------
3-
GEOSX is licensed under the GNU Lesser General Public License, Version 2.1.
3+
GEOS is licensed under the GNU Lesser General Public License, Version 2.1.
44
See the toplevel LICENSE file for details.
55

6-
Copyrights and patents in the GEOSX project are retained by individual
7-
contributors. The following copyright applies to each file in the GEOSX
6+
Copyrights and patents in the GEOS project are retained by individual
7+
contributors. The following copyright applies to each file in the GEOS
88
distribution, unless otherwise stated in the file:
99

10-
* Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
11-
* Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
12-
* Copyright (c) 2018-2020 TotalEnergies
13-
* Copyright (c) 2019- GEOSX Contributors
10+
* Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
11+
* Copyright (c) 2018-2024 Total, S.A
12+
* Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
13+
* Copyright (c) 2018-2024 Chevron
14+
* Copyright (c) 2019- GEOS/GEOSX Contributors
1415
* All rights reserved
1516

16-
No copyright assignment is required to contribute to GEOSX. See the
17+
No copyright assignment is required to contribute to GEOS. See the
1718
toplevel CONTRIBUTORS file for a list of contributors.
1819

1920

‎examples/ObjectCatalog/Base.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
* ------------------------------------------------------------------------------------------------------------
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*
5-
* Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
6-
* Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
7-
* Copyright (c) 2018-2020 Total, S.A
8-
* Copyright (c) 2019- GEOSX Contributors
5+
* Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
6+
* Copyright (c) 2018-2024 Total, S.A
7+
* Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
8+
* Copyright (c) 2018-2024 Chevron
9+
* Copyright (c) 2019- GEOS/GEOSX Contributors
910
* All rights reserved
1011
*
1112
* See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

‎examples/ObjectCatalog/Derived1.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
* ------------------------------------------------------------------------------------------------------------
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*
5-
* Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
6-
* Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
7-
* Copyright (c) 2018-2020 Total, S.A
8-
* Copyright (c) 2019- GEOSX Contributors
5+
* Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
6+
* Copyright (c) 2018-2024 Total, S.A
7+
* Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
8+
* Copyright (c) 2018-2024 Chevron
9+
* Copyright (c) 2019- GEOS/GEOSX Contributors
910
* All rights reserved
1011
*
1112
* See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

‎examples/ObjectCatalog/Derived1.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
* ------------------------------------------------------------------------------------------------------------
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*
5-
* Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
6-
* Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
7-
* Copyright (c) 2018-2020 Total, S.A
8-
* Copyright (c) 2019- GEOSX Contributors
5+
* Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
6+
* Copyright (c) 2018-2024 Total, S.A
7+
* Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
8+
* Copyright (c) 2018-2024 Chevron
9+
* Copyright (c) 2019- GEOS/GEOSX Contributors
910
* All rights reserved
1011
*
1112
* See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

‎examples/ObjectCatalog/Derived2.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.
1212
* ------------------------------------------------------------------------------------------------------------
1313
*/
14+
1415
#include "Derived2.hpp"
1516

1617

‎examples/ObjectCatalog/Derived2.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
* ------------------------------------------------------------------------------------------------------------
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*
5-
* Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
6-
* Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
7-
* Copyright (c) 2018-2020 Total, S.A
8-
* Copyright (c) 2019- GEOSX Contributors
5+
* Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
6+
* Copyright (c) 2018-2024 Total, S.A
7+
* Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
8+
* Copyright (c) 2018-2024 Chevron
9+
* Copyright (c) 2019- GEOS/GEOSX Contributors
910
* All rights reserved
1011
*
1112
* See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

‎examples/ObjectCatalog/main.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
* ------------------------------------------------------------------------------------------------------------
33
* SPDX-License-Identifier: LGPL-2.1-only
44
*
5-
* Copyright (c) 2018-2020 Lawrence Livermore National Security LLC
6-
* Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University
7-
* Copyright (c) 2018-2020 Total, S.A
8-
* Copyright (c) 2019- GEOSX Contributors
5+
* Copyright (c) 2016-2024 Lawrence Livermore National Security LLC
6+
* Copyright (c) 2018-2024 Total, S.A
7+
* Copyright (c) 2018-2024 The Board of Trustees of the Leland Stanford Junior University
8+
* Copyright (c) 2018-2024 Chevron
9+
* Copyright (c) 2019- GEOS/GEOSX Contributors
910
* All rights reserved
1011
*
1112
* See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details.

‎host-configs/LBL/[email protected]

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ set(MPI_Fortran_COMPILER ${MPI_HOME}/bin/mpifort CACHE PATH "")
2424
set(MPIEXEC /usr/bin/srun CACHE PATH "")
2525
set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
2626

27-
set(GEOSX_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-gcc\@8.1.0-release-24-07-20" CACHE PATH "" )
27+
set(GEOS_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-gcc\@8.1.0-release-24-07-20" CACHE PATH "" )
2828

2929

30-
set(GEOSX_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
31-
set(GEOSX_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
30+
set(GEOS_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
31+
set(GEOS_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
3232

3333
set(ENABLE_SPHINX_EXECUTABLE OFF CACHE BOOL "")
3434
set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")

‎host-configs/LBL/cori-intel.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ set(MPI_Fortran_COMPILER "ftn" CACHE PATH "" FORCE)
2424
set(MPIEXEC "/usr/bin/srun" CACHE PATH "")
2525
set(MPIEXEC_NUMPROC_FLAG "-n" CACHE STRING "")
2626

27-
set(GEOSX_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-intel-release-22-07-20" CACHE PATH "" )
27+
set(GEOS_TPL_DIR "/global/project/projectdirs/m1411/GEOSX/tpls/install-cori-intel-release-22-07-20" CACHE PATH "" )
2828

29-
set(GEOSX_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
30-
set(GEOSX_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
29+
set(GEOS_LINK_PREPEND_FLAG "-Wl,--whole-archive" CACHE STRING "" FORCE)
30+
set(GEOS_LINK_POSTPEND_FLAG "-Wl,--no-whole-archive" CACHE STRING "" FORCE)
3131

3232
set(ENABLE_SPHINX_EXECUTABLE OFF CACHE BOOL "")
3333
set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")

0 commit comments

Comments
 (0)