updated trilinos

Author: danieljeffreydunning

.conda/fierro/cpu/build.sh

@@ -7,13 +7,25 @@ cd build
 # is added to the CXXFLAGS for MacOS builds. 
 # see https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
 
-cmake .. \
+# install Elements
+cmake ../lib/Elements \
+      -D CMAKE_BUILD_TYPE:STRING=RELEASE \
+      -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
+      -D CMAKE_CXX_STANDARD:STRING=17 \
+      -D Matar_ENABLE_KOKKOS=ON \
+      -D Matar_KOKKOS_PACKAGE=Trilinos \
+      $CMAKE_ARGS \
+      -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS -fopenmp -D_LIBCPP_DISABLE_AVAILABILITY" \
+      -D VECTOR_ARCH_FLAGS="$VECTOR_ARCH_FLAGS" \
+
+make install
+
+cmake ../.. \
       -D CMAKE_BUILD_TYPE:STRING=RELEASE \
       -D CMAKE_INSTALL_PREFIX:PATH=$PREFIX \
       -D CMAKE_CXX_STANDARD:STRING=17 \
       -D BUILD_PARALLEL_EXPLICIT_SOLVER=ON \
       -D BUILD_IMPLICIT_SOLVER=ON \
-      -D BUILD_ELEMENTS=ON \
       -D DISTRIBUTION=On \
       $CMAKE_ARGS \
       -D CMAKE_CXX_FLAGS="$PATCHED_CXXFLAGS -fopenmp -D_LIBCPP_DISABLE_AVAILABILITY" \

.conda/fierro/cpu/meta.yaml

@@ -29,6 +29,7 @@ requirements:
     - {{ compiler('cxx') }}={{ macos_compiler_version }} # [osx]
     - {{ compiler('fortran') }}
     - openmpi
+    - trilinos-cpu
   host:
     - _openmp_mutex # [linux]
     - llvm-openmp   # [osx]

.conda/trilinos/cpu/meta.yaml

@@ -33,10 +33,10 @@ requirements:
     - boost-cpp
     - libnetcdf
     - libmatio
-      #    - llvm-openmp # [osx]
+    - llvm-openmp # [osx]
   run:
     - libblas
-      #    - llvm-openmp # [osx]
+    - llvm-openmp # [osx]
 
 about:
   home: https://trilinos.org

scripts/cmake_build.sh

@@ -23,6 +23,7 @@ fi
 
 # Install Elements
 if [ ! -d "${ELEMENTS_INSTALL_DIR}/lib" ]; then
+#if [ -d "${ELEMENTS_INSTALL_DIR}/lib" ]; then
     echo "Installing Elements..."
     cmake -D CMAKE_INSTALL_PREFIX="$ELEMENTS_INSTALL_DIR" -D Trilinos_DIR="${Trilinos_DIR}" -D Matar_ENABLE_KOKKOS=ON -D Matar_KOKKOS_PACKAGE=Trilinos -B "${ELEMENTS_BUILD_DIR}" -S "${ELEMENTS_SOURCE_DIR}"
     make -C "${ELEMENTS_BUILD_DIR}" -j${FIERRO_BUILD_CORES}