Merge branch 'summa_v4_changes' of...

Merge branch 'summa_v4_changes' of https://git.cs.usask.ca/numerical_simulations_lab/actors/Summa-Actors into summa_v4_changes

build/includes/global/timing_info.hpp

@@ -2,6 +2,7 @@
 #include <chrono>
 #include <optional>
 #include <vector>
+#include <string>
 
 using chrono_time = std::chrono::time_point<std::chrono::system_clock>;
 /**

build/includes/job_actor/GRU.hpp

@@ -13,9 +13,7 @@ enum class gru_state {
     succeeded
 };
 
-auto success = [](const gru_state& state) -> int {
-    return(state == gru_state::succeeded) ? 1 : 0;
-};
+int is_success(const gru_state& state);
 
 /**
  * Class that holds information about the running GRUs. This class is held by the job actor

build/source/actors/job_actor/GRU.cpp

@@ -4,6 +4,11 @@
 #include <fstream>
 
 
+int is_success(const gru_state& state) {
+
+  return(state == gru_state::succeeded) ? 1 : 0;
+}
+
 
 GRU::GRU(int global_gru_index, int local_gru_index, caf::actor gru_actor, 
          int dt_init_factor, double rel_tol, double abs_tol, int max_attempt) {

build/source/actors/job_actor/job_actor.cpp

@@ -267,7 +267,7 @@ std::vector<serializable_netcdf_gru_actor_info> getGruNetcdfInfo(int max_run_att
         gru_info.write_output_duration = gru->getWriteOutputDuration();
         
         gru_info.num_attempts = max_run_attempts - gru->getAttemptsLeft() + 1;
-        gru_info.successful = success(gru->getStatus());
+        gru_info.successful = is_success(gru->getStatus());
         gru_info.rel_tol = gru->getRelTol();
         gru_info.abs_tol = gru->getAbsTol();
 

utils/containers/apptainer.def

+Bootstrap: docker
+From: ubuntu:22.04
+
+%post
+    apt-get update -y
+    apt-get install locales -y
+    locale-gen en_CA.UTF-8
+    apt-get upgrade -y
+
+    # Install dependencies
+    DEBIAN_FRONTEND="noninteractive" apt-get install -y software-properties-common \
+        libnetcdf-dev \
+        libnetcdff-dev \
+        liblapack-dev \
+        libopenblas-dev \
+        cmake \
+        g++ \
+        git \
+        libssl-dev \
+        make \
+        gfortran \
+        wget \
+        python3-pip \
+        valgrind \
+        gdb &&\
+        apt-get autoclean
+
+    # Install Sundials v6.6
+    cd /opt
+    wget https://github.com/LLNL/sundials/releases/download/v6.6.0/sundials-6.6.0.tar.gz
+    tar -xzf sundials-6.6.0.tar.gz
+    mkdir /usr/local/sundials/
+    mkdir /usr/local/sundials/v6.6
+    cd sundials-6.6.0
+    mkdir build
+    cd build
+    cmake .. -DBUILD_FORTRAN_MODULE_INTERFACE=ON -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_INSTALL_PREFIX=/usr/local/sundials/v6.6 -DEXAMPLES_INSTALL_PATH=/usr/local/sundials/v6.6/examples
+    make
+    make install
+
+    # Install C++ Actor Framework
+    cd /opt
+    wget https://github.com/actor-framework/actor-framework/archive/refs/tags/0.18.6.tar.gz
+    tar -xzf 0.18.6.tar.gz
+    cd actor-framework-0.18.6
+    ./configure
+    cd build
+    make
+    make install
\ No newline at end of file