Merge branch 'develop' into feature/AddTaperForWaveSolvers

GEOS-DEV · Dec 13, 2024 · 06c5e96 · 06c5e96
2 parents 8bc4980 + da4cd7f
commit 06c5e96
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -330,7 +330,7 @@ jobs:
             DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors"
             DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust"
 
-          - name: Pangea 3 (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10)
+          - name: Pangea 3 CUDA (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10)
             BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema"
             CMAKE_BUILD_TYPE: Release
             BUILD_GENERATOR: "--makefile"

diff --git a/src/coreComponents/mesh/FieldIdentifiers.hpp b/src/coreComponents/mesh/FieldIdentifiers.hpp
@@ -98,11 +98,11 @@ class FieldIdentifiers
  * @brief Get the Location object
  *
  * @param key key used to store the list of fields in the map.
- * @param location mesh location where fields defined by the key provided were registered.
+ * @return mesh location where fields defined by the key provided were registered.
  */
-  void getLocation( string const & key,
-                    FieldLocation & location ) const
+  FieldLocation getLocation( string const & key ) const
   {
+    FieldLocation location{};
     if( key.find( m_locationKeys.nodesKey() ) != string::npos )
     {
       location = FieldLocation::Node;
@@ -123,6 +123,7 @@ class FieldIdentifiers
     {
       GEOS_ERROR( GEOS_FMT( "Invalid key, {}, was provided. Location cannot be retrieved.", key ) );
     }
+    return location;
   }
 
 private:

diff --git a/src/coreComponents/mesh/mpiCommunications/NeighborCommunicator.cpp b/src/coreComponents/mesh/mpiCommunications/NeighborCommunicator.cpp
@@ -511,8 +511,7 @@ int NeighborCommunicator::packCommSizeForSync( FieldIdentifiers const & fieldsTo
 
   for( auto const & iter : fieldsToBeSync.getFields() )
   {
-    FieldLocation location{};
-    fieldsToBeSync.getLocation( iter.first, location );
+    FieldLocation const location = fieldsToBeSync.getLocation( iter.first );
     switch( location )
     {
       case FieldLocation::Node:
@@ -569,8 +568,7 @@ void NeighborCommunicator::packCommBufferForSync( FieldIdentifiers const & field
 
   for( auto const & iter : fieldsToBeSync.getFields() )
   {
-    FieldLocation location{};
-    fieldsToBeSync.getLocation( iter.first, location );
+    FieldLocation const location = fieldsToBeSync.getLocation( iter.first );
     switch( location )
     {
       case FieldLocation::Node:
@@ -628,8 +626,7 @@ void NeighborCommunicator::unpackBufferForSync( FieldIdentifiers const & fieldsT
 
   for( auto const & iter : fieldsToBeSync.getFields() )
   {
-    FieldLocation location{};
-    fieldsToBeSync.getLocation( iter.first, location );
+    FieldLocation const location = fieldsToBeSync.getLocation( iter.first );
     switch( location )
     {
       case FieldLocation::Node:

diff --git a/src/docs/sphinx/developerGuide/Contributing/IntegratedTests.rst b/src/docs/sphinx/developerGuide/Contributing/IntegratedTests.rst
@@ -121,7 +121,7 @@ After building GEOS, the integrated tests can be triggered in the GEOS build dir
 
 
 .. note::
-  The `make_ats_environment` and `ats_run` steps may require internet access to collect python packages and baseline files.
+  The `make ats_environment` and `make ats_run` steps may require internet access to collect python packages and baseline files.
 
 
 .. note::