From 2caa3f3d9400d985edb9026c94bfafcfcd126938 Mon Sep 17 00:00:00 2001
From: dekken <philip.deegan@gmail.com>
Date: Wed, 13 Mar 2024 15:02:14 +0100
Subject: [PATCH] updates

---
 .github/workflows/build.yml | 17 ++++++++++++++
 .gitignore                  |  1 +
 .travis.yml                 | 29 ------------------------
 mkn.sh                      | 44 +++++++++++++++++++++++++++----------
 mkn.yaml                    |  2 +-
 5 files changed, 52 insertions(+), 41 deletions(-)
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..29e755a
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,17 @@
+name: ubuntu
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - run: |
+        sudo apt-get update
+        sudo apt-get install -y libopenmpi-dev libhdf5-openmpi-dev
+        ./mkn.sh
diff --git a/.gitignore b/.gitignore
index 7a6844a..fd30e13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.cmake*
 include
 lib
 share
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5509b50..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: generic
-matrix:
-  include:
-  - os: linux
-    dist: bionic
-    sudo: required
-    language: cpp
-    compiler: gcc
-    addons:
-      apt:
-        sources:
-        - sourceline: 'ppa:ubuntu-toolchain-r/test'
-        packages:
-          - g++-9
-          - gfortran-9
-          - libhdf5-mpich-dev
-    env:
-      - MATRIX_EVAL="CC=gcc-9 CXX=g++-9 FC=gfortran-9"
-before_install:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      sudo ln -fs /usr/bin/gcc-9 /usr/local/bin/gcc
-      sudo ln -fs /usr/bin/g++-9 /usr/local/bin/g++
-      sudo ln -fs /usr/bin/gfortran-9 /usr/local/bin/gfortran
-      gcc -v
-    fi
-script:
-  - set -e
-  - THREADS=1 ./mkn.sh # memory problems
diff --git a/mkn.sh b/mkn.sh
index bfa25ee..27881e4 100755
--- a/mkn.sh
+++ b/mkn.sh
@@ -1,22 +1,44 @@
 #!/usr/bin/env bash
 set -e
-THREADS=${THREADS:=""}
+THREADS=${THREADS:="2"}
 CWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="samrai"
 GIT_URL="https://github.com/llnl/$DIR"
-VERSION="master"
+VERSION="develop"
 FFF=("include" "lib" "$DIR" "share")
 [ ! -z "$MKN_CLEAN" ] && (( $MKN_CLEAN == 1 )) && for f in ${FFF[@]}; do rm -rf $CWD/$f; done
 [ ! -d "$CWD/$DIR" ] && git clone --depth 1 $GIT_URL -b $VERSION $DIR --recursive
 cd $CWD/$DIR
-rm -rf build && mkdir build && cd build
+rm -rf build && mkdir build
 
-cmake .. \
-  -DENABLE_OPENMP=OFF -DENABLE_SAMRAI_TESTS=OFF \
-  -DCMAKE_INSTALL_PREFIX=$CWD \
-  -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \
-  -DCMAKE_CXX_FLAGS="-g0 -O3 -march=native -mtune=native" \
-  -DCMAKE_BUILD_TYPE=Release # -DBUILD_SHARED_LIBS=ON
+CMAKE_CONFIG=""
 
-make VERBOSE=1 -j$THREADS && make install
-cd .. && rm -rf build
+## SUPER RELEASE
+CMAKE_CXX_FLAGS="-DNDEBUG -g0 -O3 -march=native -mtune=native"
+CMAKE_BUILD_TYPE="Release"
+
+# ## OPTIMZ AND DEBUG
+# CMAKE_CXX_FLAGS="-g3 -O3 -march=native -mtune=native -fno-omit-frame-pointer"
+# CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+# ## PURE DEBUG
+# CMAKE_CXX_FLAGS="-g3 -O0 -fno-omit-frame-pointer"
+# CMAKE_BUILD_TYPE="Debug"
+
+CMAKE_CONFIG+=" -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
+
+time (
+  date
+  (
+    cd build
+    cmake .. \
+      -DENABLE_OPENMP=OFF -DENABLE_SAMRAI_TESTS=OFF \
+      -DCMAKE_INSTALL_PREFIX=$CWD  -DENABLE_DOCS=ON \
+      -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true \
+      -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" \
+      ${CMAKE_CONFIG} # -DBUILD_SHARED_LIBS=ON
+    make VERBOSE=1 -j$THREADS && make install
+  )
+  rm -rf build
+  date
+) 1> >(tee $CWD/.cmake.sh.out ) 2> >(tee $CWD/.cmake.sh.err >&2 )
diff --git a/mkn.yaml b/mkn.yaml
index d416b6f..95b2f5c 100644
--- a/mkn.yaml
+++ b/mkn.yaml
@@ -17,4 +17,4 @@ profile:
       SAMRAI_mesh SAMRAI_pdat
       SAMRAI_solv SAMRAI_xfer
       SAMRAI_hier SAMRAI_tbox
-      mpi++ mpi
+      mpi