[WIP] MFEM development

.gitignore

@@ -108,15 +108,15 @@ framework/contrib/libtorch
 test.cache
 
 # Allow certain files in gold directories
-!**/gold/*.e
-!**/gold/*.e-s*
-!**/gold/*.csv
-!**/gold/*.csv.*
-!**/gold/*.vtk
-!**/gold/*.vtu
-!**/gold/*.pvtu
-!**/gold/*.xml*
-!**/gold/*.json*
+!**/gold/**/*.e
+!**/gold/**/*.e-s*
+!**/gold/**/*.csv
+!**/gold/**/*.csv.*
+!**/gold/**/*.vtk
+!**/gold/**/*.vtu
+!**/gold/**/*.pvtu
+!**/gold/**/*.xml*
+!**/gold/**/*.json*
 
 peacock_run_tmp.i
 yaml_dump*
@@ -338,3 +338,16 @@ share/
 *.hpc_out.txt
 *.hpc_result
 *.hpc_submit
+
+# MFEM output
+OutputData
+!**/gold/**/OutputData
+!**/gold/**/OutputData/**/*.e
+!**/gold/**/OutputData/**/*.e-s*
+!**/gold/**/OutputData/**/*.csv
+!**/gold/**/OutputData/**/*.csv.*
+!**/gold/**/OutputData/**/*.vtk
+!**/gold/**/OutputData/**/*.vtu
+!**/gold/**/OutputData/**/*.pvtu
+!**/gold/**/OutputData/**/*.xml*
+!**/gold/**/OutputData/**/*.json*

.gitmodules

@@ -47,3 +47,11 @@
 	path = modules/fluid_properties/contrib/carbon_dioxide
 	url = https://github.com/idaholab/carbon_dioxide.git
     update = none
+[submodule "framework/contrib/mfem"]
+	path = framework/contrib/mfem
+    url = ../../mfem/mfem.git
+    update = none
+[submodule "framework/contrib/conduit"]
+	path = framework/contrib/conduit
+	url = https://github.com/LLNL/conduit.git
+    update = none

aclocal.m4

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

apptainer/moose-dev.def

@@ -7,31 +7,47 @@
 
 {#- Optional jinja arguments                                                                  -#}
 {#- CONDA_ALT_CHANNEL: An alternate channel to add to conda                                   -#}
+{#- CONDUIT_GIT_SHA: The git SHA to use for conduit                                           -#}
+{#- CONDUIT_GIT_REMOTE: The git remote to use to get conduit                                  -#}
+{#- MFEM_GIT_SHA: The git SHA to use for MFEM                                                 -#}
+{#- MFEM_GIT_REMOTE: The git remote to use to get MFEM                                        -#}
+{#- MFEM_OPTIONS: Options to pass to mfem build                                               -#}
 {#- MOOSE_TOOLS_VERSION: The version to pin moose-tools to (if any)                           -#}
 {#- MOOSE_JOBS: Number of jobs to pass to the builds                                          -#}
-{#- WITH_LIBTORCH: The libtorch distribution to use (cpu, cu121, etc); default: cpu           -#}
 {#- PROFILING: Set to anything to build for profiling (add gperftools)                        -#}
+{#- WITH_LIBTORCH: The libtorch distribution to use (cpu, cu121, etc); default: cpu           -#}
+{#- WITH_MFEM: Whether or not to build mfem (default: 1 to build, 0 to not build)             -#}
 
 {#- Set WITH_LIBTORCH default if not set                                                      -#}
 {%- if WITH_LIBTORCH is not defined %}
 {%- set WITH_LIBTORCH = 'cpu' %}
 {%- endif %}
+{#- Set WITH_MFEM default if not set                                                          -#}
+{%- if WITH_MFEM is not defined %}
+{%- set WITH_MFEM = '1' %}
+{%- endif %}
 
 {#- The within-container build directory to use                                               -#}
 {%- set ROOT_BUILD_DIR = '/root/build' -%}
 
 {#- Location to install miniforge3                                                            -#}
 {%- set MOOSE_MINIFORGE = '/opt/miniforge3' -%}
 
-{#- The installation location for wasp                                                        -#}
-{%- set WASP_DIR = '/opt/wasp' -%}
+{#- Name of the environment to create in conda                                                -#}
+{%- set MOOSE_CONDA_ENV_NAME = 'moose' -%}
+
 {#- The installation location for gperftools                                                  -#}
 {%- set GPERF_DIR = '/opt/gperftools' -%}
 {#- The installation location for pprof                                                       -#}
 {%- set PPROF_DIR = '/opt/pprof' -%}
 {#- The installation location for libtorch                                                    -#}
-{%- set LIBTORCH_DEST = '/opt' -%}
-
+{%- set LIBTORCH_DIR = '/opt/libtorch' -%}
+{#- The script used to install mfem                                                           -#}
+{%- set MFEM_BUILD_SCRIPT = 'update_and_rebuild_mfem.sh' -%}
+{#- The installation location for mfem                                                        -#}
+{%- set MFEM_DIR = '/opt/mfem' -%}
+{#- The installation location for wasp                                                        -#}
+{%- set WASP_DIR = '/opt/wasp' -%}
 {#- The script used to install wasp                                                           -#}
 {%- set WASP_BUILD_SCRIPT = 'update_and_rebuild_wasp.sh' -%}
 
@@ -50,9 +66,13 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
     export WASP_DIR={{ WASP_DIR }}
     export PATH=${WASP_DIR}/bin:$PATH
 
+{%- if WITH_MFEM %}
+    export MFEM_DIR={{ MFEM_DIR }}
+{%- endif %}
+
 {%- if WITH_LIBTORCH %}
     # Make libtorch visible to moose
-    export LIBTORCH_DIR={{ LIBTORCH_DEST }}/libtorch
+    export LIBTORCH_DIR={{ LIBTORCH_DIR }}
     # Adding this to not get GPU initialization errors from MPICH
     export MPIR_CVAR_ENABLE_GPU=0
 {%- endif %}
@@ -105,17 +125,9 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
     chmod 755 /opt/code-server/bin/*
     chmod 644 /opt/code-server/extensions/*
 
-    # Clone WASP
-    cd ${ROOT_BUILD_DIR}
-    WASP_SRC_DIR=${ROOT_BUILD_DIR}/wasp
-    git clone ${WASP_GIT_REMOTE} ${WASP_SRC_DIR}
-    cd ${WASP_SRC_DIR}
-    git checkout ${WASP_GIT_SHA}
-    git submodule update --init --recursive
-
 {%- if WITH_LIBTORCH %}
     # Libtorch-related vars
-    LIBTORCH_DEST={{ LIBTORCH_DEST }}
+    LIBTORCH_DEST=$(realpath -m {{ LIBTORCH_DIR }}/..)
     LIBTORCH_VER=2.1.0
     LIBTORCH_DISTRIBUTION={{ WITH_LIBTORCH }}
 
@@ -134,6 +146,35 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
 {%- endif %}
 {%- endif %}
 
+{%- if WITH_MFEM %}
+    # Load MFEM jinja variables
+    CONDUIT_GIT_SHA={{ CONDUIT_GIT_SHA }}
+    CONDUIT_GIT_REMOTE={{ CONDUIT_GIT_REMOTE }}
+    CONDUIT_DIR={{ CONDUIT_DIR }}
+    MFEM_BUILD_SCRIPT=${ROOT_BUILD_DIR}/{{ MFEM_BUILD_SCRIPT }}
+    MFEM_DIR={{ MFEM_DIR }}
+    MFEM_GIT_SHA={{ MFEM_GIT_SHA }}
+    MFEM_GIT_REMOTE={{ MFEM_GIT_REMOTE }}
+
+    # Clone conduit
+    cd ${ROOT_BUILD_DIR}
+    git clone $CONDUIT_GIT_REMOTE
+    CONDUIT_SRC_DIR=${ROOT_BUILD_DIR}/conduit
+    cd ${CONDUIT_SRC_DIR}
+    git checkout $CONDUIT_GIT_SHA
+    git submodule update --init
+
+    # Clone MFEM
+    cd ${ROOT_BUILD_DIR}
+    git clone $MFEM_GIT_REMOTE
+    MFEM_SRC_DIR=${ROOT_BUILD_DIR}/mfem
+    cd ${MFEM_SRC_DIR}
+    git checkout $MFEM_GIT_SHA
+
+    # Install MFEM
+    MFEM_DIR=${MFEM_DIR} MFEM_SRC_DIR=${MFEM_SRC_DIR} CONDUIT_SRC_DIR=${CONDUIT_SRC_DIR} ${MFEM_BUILD_SCRIPT} {{ MFEM_OPTIONS }}
+{%- endif %}
+
     # Install miniforge in MOOSE_MINIFORGE
     MINIFORGE_SCRIPT=${ROOT_BUILD_DIR}/miniforge3.sh
     curl -L https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/Miniforge3-${MINIFORGE_VERSION}-Linux-x86_64.sh -o ${MINIFORGE_SCRIPT}
@@ -156,6 +197,14 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
     # Needed for coverage
     pip3 --no-cache install lcov-cobertura
 
+    # Clone WASP
+    cd ${ROOT_BUILD_DIR}
+    WASP_SRC_DIR=${ROOT_BUILD_DIR}/wasp
+    git clone ${WASP_GIT_REMOTE} ${WASP_SRC_DIR}
+    cd ${WASP_SRC_DIR}
+    git checkout ${WASP_GIT_SHA}
+    git submodule update --init --recursive
+
     # Build and install wasp
     # This is redundant; hopefully we can use the one from conda in the future
     WASP_SRC_DIR=${WASP_SRC_DIR} ${WASP_BUILD_SCRIPT} -D CMAKE_INSTALL_PREFIX:STRING=${WASP_DIR}
@@ -204,6 +253,7 @@ Fingerprints: 0CFFCAB55E806363601C442D211817B01E0911DB
 %files
     {{ FILES_DIR }}/opt/code-server/bin/code-server-setup-extensions /opt/code-server/bin/code-server-setup-extensions
     {{ FILES_DIR }}/opt/code-server/bin/code-server-start /opt/code-server/bin/code-server-start
+    {{ MOOSE_DIR }}/scripts/{{ MFEM_BUILD_SCRIPT }} {{ ROOT_BUILD_DIR }}/{{ MFEM_BUILD_SCRIPT }}
     {{ MOOSE_DIR }}/scripts/{{ WASP_BUILD_SCRIPT }} {{ ROOT_BUILD_DIR }}/{{ WASP_BUILD_SCRIPT }}
     {{ MOOSE_DIR }}/scripts/configure_wasp.sh {{ ROOT_BUILD_DIR }}/configure_wasp.sh
 {%- if WITH_LIBTORCH %}

conda/moose-dev/meta.yaml

@@ -2,7 +2,7 @@
 # REMEMBER TO UPDATE the .yaml files for the following packages:
 #   moose/conda_build_config.yaml
 # As well as any directions pertaining to modifying those files.
-{% set version = "2024.12.23" %}
+{% set version = "2025.01.07" %}
 
 package:
   name: moose-dev

conda/moose/conda_build_config.yaml

@@ -3,7 +3,7 @@ mpi:
   - openmpi
 
 moose_dev:
-  - moose-dev 2024.12.23
+  - moose-dev 2025.01.07
 
 #### Darwin SDK SYSROOT
 CONDA_BUILD_SYSROOT:                                        # [osx]

conf_vars.mk.in

@@ -3,3 +3,5 @@ libPNG_INCLUDE := @LIBPNG_INCLUDES@
 PREFIX         := @prefix@
 ENABLE_LIBTORCH := @libtorch_support@
 LIBTORCH_DIR := @libtorch_library@
+ENABLE_MFEM := @mfem_support@
+MFEM_DIR := @mfem_library@