From 09d41a4d2cb99ee43a10050fcbc224fc8c1d5734 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Tue, 30 Mar 2021 12:45:02 -0700 Subject: [PATCH 01/11] changing egads files for regression tests to egadslite files --- test/regression/egads/data/cyl.egadslite | Bin 0 -> 4487 bytes .../data/{cyl.egads.sup => cyl.egadslite.sup} | Bin test/regression/egads/data/cyl2.egadslite | Bin 0 -> 4399 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/regression/egads/data/cyl.egadslite rename test/regression/egads/data/{cyl.egads.sup => cyl.egadslite.sup} (100%) create mode 100644 test/regression/egads/data/cyl2.egadslite diff --git a/test/regression/egads/data/cyl.egadslite b/test/regression/egads/data/cyl.egadslite new file mode 100644 index 0000000000000000000000000000000000000000..f08ae31e4a838d794bb4cb41784f936aaaaffaea GIT binary patch literal 4487 zcmb_fJ!lj`6yEq36Hp0=Xb{E5E-J(n63s>kXdrCe(%Sas zpyT*;@{z6e5yxq=@2YWEjk}cV6XJ)(cfj}#8EvfNTG0&FfrsR~vP~{~?PZ)=D36wu z?I5E>+S@rfG%@@4T;I4_Y_V?JIYm3QsG&4=h=W{euw#%0&pyL=ztN61o3VKkYieqp z;!%I%a)bJi^B@aVzi@8ZCB+^&(>5+ar&+2tp?{MH){<0Kc4nh zFDZ5JF~{)Kum8D?n$x*)Z?11V-`-puLk?gcAL<}eD(Ah)2|b4K-eBCz7d$6Sf$tuT zmT^awrm1u)>z%xWJM=zYr478JN)%&)N&+AkD+3ycoS(kR6KCz3U|ltJz-SVBu`e=n z<@`$EL__r8%t7%5*+CLicIbr}gD_invpFx=V8jB&7fLhbN}veB_#g}(CAye&RJDw2 zD0Buoqfnj*N0OjW3W0zmeU>TJQ0Oq0n`cIc_*?si;F`J=lH)(r#%Vf9=h?TM=5TBL zVV0&v(;%NukNS!G7qLx0@@di-ocXk~^P|4noD{E<)iFLzeipwz`tbYP7@cX2|D`ri zC`E7Rvjv6m$1;d8?x%zL=e^GQClAl#2h|r>MjPMt{lMK#v#m})ZsRnaq%`}M(;RM% zKWAVzB@}g~_^t&-*FT+Uh4NWgfyH)PnbPzu6%+_jkS|%gY{U{ltbAX;Xm=FRAh?-j zyALgK_AriHhGnYyu3e_IL%RqDLj}F)BT)cuzDlqrBvuxA@(D|O;Lr<#oeugEPYn8v z>W8l&(}o;zoTOI_^YeCK6WdpBYc2O0Z_IQPH!T4#KGrU|UBj$pUdfPWE*LY6QJ%b$9_&is zIwL;pMeN_}lhe*w(e?`2d}Y?FU|_WBRSRATt;OYqc`RY-jw!KeuTq@yN`-1s41j!h v7ZKC1Qbr~?FXrsJ!{1S+I+I<>E>xU>#=l#`!|&ZMzn-pL>wl&aetG;q=t`13 literal 0 HcmV?d00001 diff --git a/test/regression/egads/data/cyl.egads.sup b/test/regression/egads/data/cyl.egadslite.sup similarity index 100% rename from test/regression/egads/data/cyl.egads.sup rename to test/regression/egads/data/cyl.egadslite.sup diff --git a/test/regression/egads/data/cyl2.egadslite b/test/regression/egads/data/cyl2.egadslite new file mode 100644 index 0000000000000000000000000000000000000000..524a0211b0ca7155275e98d84f904fa5fc7d88e1 GIT binary patch literal 4399 zcmb_fy=xRf6yF#%CLkh&pdyNmT~MMaLL_@aAO;Lrq*5_l?$*12$%WiSNI*S1+xXEa zf?C*KC0GRa4~QVxq!L$5`ZJX%80R-LzrESr+mGlyn7o-cGw=64=Qi69yR0rt(eQR- z*s?sA{Kd}Z3Cn77ZELx$p2itC5O*l&!3#vJE(R!rqNaD#Gc-n0!_+MT+2R@f=; zrr_u+$vDRb$ESav>CFZ8bJb~_i5amfAMx}Iqs-uEK8 zL47Fl?4Fzb7tX$Yy{^_xmpehObY`?u>j>Ln)wNE|!~4ok)G`S5%vhkVfDKs;<+NOL z&sBb{T~c!T6_Lx>ARhG1#E7XyiP5bT%fE+>d2mYHu&-&c2x?(}iT5FrOZ0zxA||)l_Q{&_b7Nm=tUuq`TpdFWfRBMXm|3V4oyl=u26>N^JH?V? zwNl{OzitG|I8~(yl})9aW+lv__3c%L9Zyw>VvJEq2gt=qNk;?kr>FD8UFKTV5$g%{ zMepbZ^rA0jW-G-NX~c$D!I%SL$m}2qIyW8fjmsde0=6p?2z z`iZb4&S)BoDANI)Rmlq&jiVUm>yQ#@9r;M4{iG8f(7{L#CKwF^F?gHnHb%o(R*;yQ zl;dYcW8f}Y?*l(Ko(;cxy1V<;{Wj4pM5|-`-1t%c{^;G$tuewzjXs}XG;h(G1fy{j z$G{okld`7yTg{p#=Ns$U4{9$*MmN6rZ+?1BuO%2wBQqGyqlijIqvb=61`HXUp{73y z6d)!wVv5n&=8?Ek5Jv>H>X)UktBFp7!*OOVyoQ!`c#sSIE=y0Z?QrQ4hq!Q?~zv^BGGT?R>V5= z`zu^OTx%X*ucqJ7AMZE(ZJ%%Kbkc7kq4t4@I4Ih)-;9H;?`z)le@Cf5-fu=fns4lM z(r+TcUkuhRdANpI%j{j;XD%2s$atSTO%J*few`8ny@>w3JUL~Z7IUYRFIK0WDg>i7 zr&e+nFk4)npTiNR?ufoN4zAq Date: Tue, 30 Mar 2021 13:04:34 -0700 Subject: [PATCH 02/11] update model filename in test options --- test/regression/egads/test_meshmovement_egads_cyl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/regression/egads/test_meshmovement_egads_cyl.cpp b/test/regression/egads/test_meshmovement_egads_cyl.cpp index d5eb44b3..e1acc112 100644 --- a/test/regression/egads/test_meshmovement_egads_cyl.cpp +++ b/test/regression/egads/test_meshmovement_egads_cyl.cpp @@ -20,7 +20,7 @@ auto options = R"( "print-options": false, "mesh": { "file": "data/cyl.smb", - "model-file": "data/cyl.egads" + "model-file": "data/cyl.egadslite" }, "space-dis": { "basis-type": "H1", From 79a6add09ff510a53ef991afbad82a998f9b13c2 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 09:25:55 -0700 Subject: [PATCH 03/11] changed test model file back to egads --- test/regression/egads/test_meshmovement_egads_cyl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/regression/egads/test_meshmovement_egads_cyl.cpp b/test/regression/egads/test_meshmovement_egads_cyl.cpp index e1acc112..d5eb44b3 100644 --- a/test/regression/egads/test_meshmovement_egads_cyl.cpp +++ b/test/regression/egads/test_meshmovement_egads_cyl.cpp @@ -20,7 +20,7 @@ auto options = R"( "print-options": false, "mesh": { "file": "data/cyl.smb", - "model-file": "data/cyl.egadslite" + "model-file": "data/cyl.egads" }, "space-dis": { "basis-type": "H1", From e283217cd3b1efd23df3b5086c2b034f9d719a44 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 20:23:55 -0700 Subject: [PATCH 04/11] update workflow to build hypre ourselves with fPIC --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be6d4c6b..b548b019 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,34 @@ jobs: - name: Brew install MFEM dependencies # if: steps.cache-brew.outputs.cache-hit != 'true' - run: brew install open-mpi metis hypre + run: brew install open-mpi metis + + - name: Download Hypre + uses: actions/checkout@v2 + with: + repository: 'hypre-space/hypre' + ref: 'master' + path: .deps/hypre + + - name: Create Hypre Build Environment + run: cmake -E make_directory ${{runner.workspace}}/.deps/hypre/build + + - name: Configure Hypre + shell: bash + working-directory: ${{runner.workspace}}/.deps/hypre/build + run: | + cmake ${GITHUB_WORKSPACE}/.deps/hypre \ + -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ + -DCMAKE_POSITION_INDEPENDENT_CODE=YES \ + -DCMAKE_INSTALL_PREFIX="$PWD /../.." + + - name: Build Hypre + working-directory: ${{runner.workspace}}/.deps/hypre/build + run: cmake --build . --parallel 2 --config $BUILD_TYPE + + - name: Install Hypre + working-directory: ${{runner.workspace}}/.deps/hypre/build + run: cmake --build . --config $BUILD_TYPE - name: Download MFEM uses: actions/checkout@v2 @@ -129,7 +156,7 @@ jobs: -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DMFEM_USE_MPI=YES \ -DMFEM_USE_METIS_5=YES \ - -DHYPRE_DIR="$(brew --prefix hypre)" \ + -DHYPRE_DIR="$PWD /../../ hypre" \ -DMETIS_DIR="$(brew --prefix metis)" \ -DMFEM_ENABLE_EXAMPLES=NO \ -DMFEM_ENABLE_MINIAPPS=NO From 7e3dbc53a9060b925f34c3e6d513613fb119b5c1 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 20:30:23 -0700 Subject: [PATCH 05/11] trying to add status badges to README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b6bfbcf..22797fe7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![.github/workflows/build.yml](https://github.com/OptimalDesignLab/mach/workflows/.github/workflows/build.yml/badge.svg?branch=dev) - +![master](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=master) +![dev](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=dev) # ODL Mach # Mach is a C++ library for multi-physics finite-element simulations based on LLNL's [MFEM](https://github.com/mfem/mfem). From dca5597085858c8dc055a3100a248e70034a00f5 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 20:37:20 -0700 Subject: [PATCH 06/11] use correct hypre src dir --- .github/workflows/build.yml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b548b019..afd61507 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -125,7 +125,7 @@ jobs: shell: bash working-directory: ${{runner.workspace}}/.deps/hypre/build run: | - cmake ${GITHUB_WORKSPACE}/.deps/hypre \ + cmake ${GITHUB_WORKSPACE}/.deps/hypre/src \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_POSITION_INDEPENDENT_CODE=YES \ -DCMAKE_INSTALL_PREFIX="$PWD /../.." diff --git a/README.md b/README.md index 22797fe7..2aab665b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![master](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=master) -![dev](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=dev) +master ![master](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=master) +dev ![dev](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=dev) # ODL Mach # Mach is a C++ library for multi-physics finite-element simulations based on LLNL's [MFEM](https://github.com/mfem/mfem). From 0ed581b936f0ef7ea8bf94baafa81fbe7011a16f Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 20:41:23 -0700 Subject: [PATCH 07/11] just have master status badge --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 2aab665b..4fcfcf44 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -master ![master](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=master) -dev ![dev](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=dev) +![master](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=master) # ODL Mach # Mach is a C++ library for multi-physics finite-element simulations based on LLNL's [MFEM](https://github.com/mfem/mfem). From c5a7619826f717f8a689345ce92997aa191497b7 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 20:58:38 -0700 Subject: [PATCH 08/11] remove space --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afd61507..6cc27b7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,7 +156,7 @@ jobs: -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DMFEM_USE_MPI=YES \ -DMFEM_USE_METIS_5=YES \ - -DHYPRE_DIR="$PWD /../../ hypre" \ + -DHYPRE_DIR="$PWD /../../hypre" \ -DMETIS_DIR="$(brew --prefix metis)" \ -DMFEM_ENABLE_EXAMPLES=NO \ -DMFEM_ENABLE_MINIAPPS=NO From 78b738c51f8960124e1b68cb88ce3672d473b536 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 21:12:31 -0700 Subject: [PATCH 09/11] making sure hypre is installed --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cc27b7b..f183257c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -136,7 +136,7 @@ jobs: - name: Install Hypre working-directory: ${{runner.workspace}}/.deps/hypre/build - run: cmake --build . --config $BUILD_TYPE + run: cmake --build . --config $BUILD_TYPE --target install - name: Download MFEM uses: actions/checkout@v2 From 04fb09370aa5bf80ec57810fefad65ceeba437d6 Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Fri, 2 Apr 2021 21:31:44 -0700 Subject: [PATCH 10/11] trying again with hypre... --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f183257c..e7ea76f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,7 +128,7 @@ jobs: cmake ${GITHUB_WORKSPACE}/.deps/hypre/src \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DCMAKE_POSITION_INDEPENDENT_CODE=YES \ - -DCMAKE_INSTALL_PREFIX="$PWD /../.." + -DCMAKE_INSTALL_PREFIX="${{runner.workspace}}/.deps/hypre" - name: Build Hypre working-directory: ${{runner.workspace}}/.deps/hypre/build @@ -156,7 +156,7 @@ jobs: -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DMFEM_USE_MPI=YES \ -DMFEM_USE_METIS_5=YES \ - -DHYPRE_DIR="$PWD /../../hypre" \ + -DHYPRE_DIR="${{runner.workspace}}/.deps/hypre" \ -DMETIS_DIR="$(brew --prefix metis)" \ -DMFEM_ENABLE_EXAMPLES=NO \ -DMFEM_ENABLE_MINIAPPS=NO From 70df85cba302e77df4aa4a5d0e4fca4146c2ed6f Mon Sep 17 00:00:00 2001 From: Tucker Babcock Date: Mon, 5 Apr 2021 09:58:32 -0700 Subject: [PATCH 11/11] re-adding supplementary model file --- test/regression/egads/data/cyl.egads.sup | Bin 0 -> 204 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/regression/egads/data/cyl.egads.sup diff --git a/test/regression/egads/data/cyl.egads.sup b/test/regression/egads/data/cyl.egads.sup new file mode 100644 index 0000000000000000000000000000000000000000..227d43be94638aa7168ce609a6de8cb2bd3d8b4c GIT binary patch literal 204 scmZQ%U|?W`Viq9H2E-s5ghAp=K+Fu~gXGY~Sb<_NJ?L^UbLm9`05ezsWdHyG literal 0 HcmV?d00001