STK: Snapshot 07-30-24 12:54 from Sierra 5.21.2-577-g3d37b272

trilinos · Jul 30, 2024 · 26636fd · 26636fd
1 parent ffd77bc
commit 26636fd
Show file tree

Hide file tree

Showing 787 changed files with 16,502 additions and 8,706 deletions.
diff --git a/packages/krino/CMakeLists.txt b/packages/krino/CMakeLists.txt
@@ -1,13 +1,20 @@
 
-message("Building Krino as a Trilinos package")
-TRIBITS_PACKAGE(Krino)
+IF(COMMAND TRIBITS_PACKAGE_DECL)
+    message("Building Krino as a Trilinos package")
+    TRIBITS_PACKAGE(Krino)
 
-TRIBITS_ADD_DEBUG_OPTION()
-TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION()
+    TRIBITS_ADD_DEBUG_OPTION()
+    TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION()
 
-if (${${PROJECT_NAME}_ENABLE_Krino})
-  add_subdirectory(krino)
-  add_subdirectory(delete_small_elements)
-endif()
+    if (${${PROJECT_NAME}_ENABLE_Krino})
+      add_subdirectory(krino)
+      add_subdirectory(delete_small_elements)
+    endif()
+
+    TRIBITS_PACKAGE_POSTPROCESS()
+ELSE()
+    MESSAGE("*** Building Krino as a stand-alone cmake package. ***")
+
+    include(SierraCmakeCode.cmake)
+ENDIF()
 
-TRIBITS_PACKAGE_POSTPROCESS()
diff --git a/packages/krino/cmake_install_test/load_gcc_modules b/packages/krino/cmake_install_test/load_gcc_modules
@@ -1,30 +1,12 @@
 #!/bin/bash
 
-source /projects/sems/modulefiles/utils/sems-modules-init.sh
-
-module load sems-cmake/3.24.3
-module load sems-gcc/8.3.0
-module load sems-metis/5.1.0
-
-export BLAS_LIBRARIES=${BLAS_LIBRARIES:-/usr/lib64/libblas.so}
-export LAPACK_LIBRARIES=${LAPACK_LIBRARIES:-/usr/lib64/liblapack.so}
-
-module load sems-openmpi/1.10.7
-module load sems-hdf5/1.10.7
-module load sems-netcdf-c/4.7.3
-module load sems-parmetis/4.0.3
-module load sems-parallel-netcdf/1.12.1
-
-
-
-### Corresponding CDE v3 modules -- as of 2/6/23 these gave link errors
-#module load cde/v3/cmake/3.23.1
-#module load cde/v3/gcc/10.3.0
-#module load cde/v3/openmpi/4.1.2-gcc-10.3.0
-#module load cde/v3/netlib-lapack/3.10.1-gcc-10.3.0
-#module load cde/v3/hdf5/1.10.6-gcc-10.3.0-openmpi-4.1.2
-#module load cde/v3/netcdf-c/4.8.1-gcc-10.3.0-openmpi-4.1.2
-#module load cde/v3/parallel-netcdf/1.12.2-gcc-10.3.0-openmpi-4.1.2
-#module load cde/v3/metis/5.1.0-gcc-10.3.0
-#module load cde/v3/parmetis/4.0.3-gcc-10.3.0-openmpi-4.1.2
-
+module load aue/cmake/3.27.7
+module load aue/gcc/10.3.0
+module load aue/metis/5.1.0-gcc-10.3.0
+module load aue/netlib-lapack/3.11.0-gcc-10.3.0
+
+module load aue/openmpi/4.1.6-gcc-10.3.0
+module load aue/hdf5/1.14.2-gcc-10.3.0-openmpi-4.1.6
+module load aue/netcdf-c/4.9.2-gcc-10.3.0-openmpi-4.1.6
+module load aue/parmetis/4.0.3-gcc-10.3.0-openmpi-4.1.6
+module load aue/parallel-netcdf/1.12.3-gcc-10.3.0-openmpi-4.1.6
diff --git a/packages/krino/cmake_install_test/run_cmake_krino b/packages/krino/cmake_install_test/run_cmake_krino
@@ -45,5 +45,6 @@ cmake \
 -Dyamlcpp_LIBRARY_DIRS=${yaml_install_dir}/lib \
 -DTPL_ENABLE_Netcdf:BOOL=ON \
 -DTPL_ENABLE_HDF5:BOOL=ON \
+-DTPL_HDF5_LIBRARIES="-lhdf5" \
 ${trilinos_src_dir}/
 
diff --git a/packages/krino/delete_small_elements/Akri_DeleteSmallElementsMain.cpp b/packages/krino/delete_small_elements/Akri_DeleteSmallElementsMain.cpp
@@ -108,7 +108,6 @@ static bool delete_small_elements(const DeleteSmallElementsInputData& inputData,
 {
   std::shared_ptr<stk::mesh::BulkData> bulk = stk::mesh::MeshBuilder(comm).create();
   stk::mesh::MetaData& meta = bulk->mesh_meta_data();
-  meta.use_simple_fields();
 
   stk::io::fill_mesh_with_auto_decomp(inputData.meshIn, *bulk);