Merge branch 'feature/issue-442-integrator-class' of github.com:Eleven7825/svMultiPhysics into feature/issue-442-integrator-class

Please enter a commit message to explain why this merge is necessary,

Author: shiyi

.github/actions/test-macos/action.yml

@@ -49,7 +49,7 @@ runs:
       run: |
         git lfs pull
         cd tests
-        conda run -n svmultiphysics pytest -rPv --durations=0
+        conda run -n svmultiphysics pytest -v -rfEP --durations=0
         
     - name: Run unit tests
       shell: bash

.github/actions/test-ubuntu/action.yml

@@ -53,7 +53,7 @@ runs:
         git config --global --add safe.directory /__w/svMultiPhysics/svMultiPhysics
         git lfs pull
         cd tests
-        conda run -n svmultiphysics pytest -rPv --durations=0
+        conda run -n svmultiphysics pytest -v -rfEP --durations=0
         
     - name: Run unit tests
       shell: bash

Code/Source/solver/Array.cpp

@@ -5,9 +5,6 @@
 
 // b o o l //
 
-template<>
-bool Array<bool>::show_index_check_message = true;
-
 template<>
 int Array<bool>::id = 0;
 
@@ -28,9 +25,6 @@ bool Array<bool>::write_enabled = false;
 
 // d o u b l e //
 
-template<>
-bool Array<double>::show_index_check_message = true;
-
 template<>
 int Array<double>::id = 0;
 
@@ -63,9 +57,6 @@ bool Array<double>::write_enabled = false;
 
 //  i n t  //
 
-template<>
-bool Array<int>::show_index_check_message = true;
-
 template<>
 int Array<int>::id = 0;
 

Code/Source/solver/Array.h

@@ -31,7 +31,6 @@ class Array
     static int id;
     static int num_allocated;
     static int active;
-    static bool show_index_check_message;
     static double memory_in_use;
     static double memory_returned;
     static void memory(const std::string& prefix="");
@@ -945,14 +944,7 @@ class Array
     }
 
     void check_index(const int row, const int col) const
-    { 
-      if (show_index_check_message) {
-        std::cout << "[Array] **********************************" << std::endl;
-        std::cout << "[Array] WARNING: Index checking is enabled " << std::endl;
-        std::cout << "[Array] **********************************" << std::endl;
-        show_index_check_message = false;
-      }
-
+    {
       if (data_ == nullptr) { 
         //throw std::runtime_error(+"Accessing null data in Array.");
         return;

Code/Source/solver/Array3.cpp

@@ -4,9 +4,6 @@
 #include "Array3.h"
 #include "utils.h"
 
-template<>
-bool Array3<double>::show_index_check_message = true;
-
 template<>
 double Array3<double>::memory_in_use = 0;
 
@@ -38,9 +35,6 @@ void Array3<double>::stats(const std::string& prefix)
 //          int             //
 //--------------------------//
 
-template<>
-bool Array3<int>::show_index_check_message = true;
-
 template<>
 double Array3<int>::memory_in_use = 0;
 

Code/Source/solver/Array3.h

@@ -27,7 +27,6 @@ class Array3
 
     static int num_allocated;
     static int active;
-    static bool show_index_check_message;
     static double memory_in_use;
     static double memory_returned;
     static bool write_enabled;
@@ -105,13 +104,6 @@ class Array3
 
     void check_index(const int i, const int j, const int k) const
     {
-      if (show_index_check_message) {
-        std::cout << "[Array3] **********************************" << std::endl;
-        std::cout << "[Array3] WARNING: Index checking is enabled " << std::endl;
-        std::cout << "[Array3] **********************************" << std::endl;
-        show_index_check_message = false;
-      }
-
       if (data_ == nullptr) {
         throw std::runtime_error(+"Accessing null data in Array3.");
       } 

Code/Source/solver/Tensor4.cpp

@@ -2,7 +2,3 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #include "Tensor4.h"
-
-template<>
-bool Tensor4<double>::show_index_check_message = true;
-

Code/Source/solver/Tensor4.h

@@ -1,23 +1,23 @@
 // SPDX-FileCopyrightText: Copyright (c) Stanford University, The Regents of the University of California, and others.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#ifndef TENSOR4_H 
-#define TENSOR4_H 
+#ifndef TENSOR4_H
+#define TENSOR4_H
 
 #include <cstring>
 #include <iostream>
 
+#include "Vector.h"
+
 #ifdef ENABLE_ARRAY_INDEX_CHECKING
 #define Tensor4_check_enabled
 #endif
 
 /// @brief The Tensor4 template class implements a simple interface to 4th order tensors.
 //
 template<typename T>
-class Tensor4 
+class Tensor4
 {
-  static bool show_index_check_message;
-
   public:
     std::string name_ = "";
     int ni_ = 0;
@@ -175,14 +175,7 @@ class Tensor4
     //
     void check_index(const int i, const int j, const int k, const int l) const
     {
-      if (show_index_check_message) {
-        std::cout << "[Tensor4] **********************************" << std::endl;
-        std::cout << "[Tensor4] WARNING: Index checking is enabled " << std::endl;
-        std::cout << "[Tensor4] **********************************" << std::endl;
-        show_index_check_message = false;
-      }
-
-     if (data_ == nullptr) {
+      if (data_ == nullptr) {
         throw std::runtime_error(name_+"Accessing null data in Tensor4.");
       } 
       if ((i < 0) || (i >= ni_) || (j < 0) || (j >= nj_) || (k < 0) || (k >= nk_) || (l < 0) || (l >= nl_)) {

Code/Source/solver/Vector.cpp

@@ -4,9 +4,6 @@
 #include "Array.h"
 #include "utils.h"
 
-template<>
-bool Vector<double>::show_index_check_message = true;
-
 template<>
 double Vector<double>::memory_in_use = 0;
 
@@ -38,9 +35,6 @@ void Vector<double>::stats(const std::string& prefix)
 //  int  //
 //------//
 
-template<>
-bool Vector<int>::show_index_check_message = true;
-
 template<>
 double Vector<int>::memory_in_use = 0;
 
@@ -68,10 +62,7 @@ void Vector<int>::stats(const std::string& prefix)
   utils::print_stats("Vector<int>", prefix, num_allocated, active);
 }
 
-// Vector<Vector<double>> 
-
-template<>
-bool Vector<Vector<double>>::show_index_check_message = true;
+// Vector<Vector<double>>
 
 template<>
 double Vector<Vector<double>>::memory_in_use = 0;
@@ -89,8 +80,6 @@ template<>
 bool Vector<Vector<double>>::write_enabled = false;
 
 // float //
-template<>
-bool Vector<float>::show_index_check_message = true;
 
 template<>
 double Vector<float>::memory_in_use = 0;

Code/Source/solver/Vector.h

@@ -29,7 +29,6 @@ class Vector
     static double memory_in_use;
     static double memory_returned;
     static bool write_enabled;
-    static bool show_index_check_message;
     static void memory(const std::string& prefix="");
     static void stats(const std::string& prefix="");
 
@@ -575,13 +574,6 @@ class Vector
 
     void check_index(const int i) const
     {
-      if (show_index_check_message) {
-        std::cout << "[Vector] **********************************" << std::endl;
-        std::cout << "[Vector] WARNING: Index checking is enabled " << std::endl;
-        std::cout << "[Vector] **********************************" << std::endl;
-        show_index_check_message = false;
-      }
-
       if (data_ == nullptr) {
         std::cout << "[Vector] WARNING: Accessing null data in Vector at " << i << std::endl;
         return;