fix(test): updated test and cma_case

Author: Benncs

apps/api/tests/data/0d/cma_case

@@ -1,6 +1,5 @@
 cma_path = meson.current_source_dir() + '/data/0d/'
 
-
 test_api = executable('test_api', 'test_api.cpp',dependencies:[lib_api_shared_dep])
 test_api_bad_alloc = executable('test_api_bad_alloc', 'test_api_throw.cpp',dependencies:[lib_api_shared_dep])
 if build_c_api

apps/api/tests/meson.build

@@ -2,26 +2,26 @@
 #include <optional>
 
 #include "common_test.hpp"
+#include "core/simulation_parameters.hpp"
 
 #define INIT Api::SimulationInstance::init(argc, argv);
 
 Core::UserControlParameters gparams(std::string_view path)
 {
-  bool serde = false;
-  return {.biomass_initial_concentration = cx,
-          .final_time = ft,
-          .delta_time = dt,
-          .number_particle = np,
-          .n_thread = nt,
-          .number_exported_result = nex,
-          .recursive = false,
-          .force_override = true,
-          .load_serde = serde,
-          .initialiser_path = "",
-          .model_name = "None",
-          .results_file_name = tmp_dir,
-          .cma_case_path = std::string(path),
-          .serde_file = std::nullopt};
+  auto p = Core::UserControlParameters::m_default();
+
+  p.biomass_initial_concentration = cx;
+  p.final_time = ft;
+  p.delta_time = dt;
+  p.number_particle = np;
+  p.n_thread = nt;
+  p.number_exported_result = nex;
+  p.force_override = true;
+  p.load_serde = false;
+  p.results_file_name = tmp_dir;
+  p.cma_case_path = std::string(path);
+
+  return p;
 }
 
 void test_exec(std::string_view path)
@@ -57,10 +57,11 @@ void test_register_parameters(int argc, char** argv, std::string_view path)
   auto handle = *INIT;
   assert(handle->register_parameters(gparams(path)));
 }
-
+#include <iostream>
 int main(int argc, char** argv)
 {
   std::string cma_path = get_cma_path(argc, argv);
+  std::cout << cma_path << std::endl;
   test_init(argc, argv);
   test_apply_err(argc, argv);
   test_exec_err(argc, argv);

apps/api/tests/test_api.cpp

@@ -46,7 +46,8 @@ void test_exec(int argc, char** argv, std::string_view path)
 
 void test_apply(int argc, char** argv, std::string_view path)
 {
-  Handle handle = INIT mock_prepre_apply(path, handle);
+  Handle handle = INIT;
+  mock_prepre_apply(path, handle);
   CHECK(apply(handle, 0));
   delete_handle(&handle);
 }
@@ -83,13 +84,13 @@ void test_register_initializer_path(int argc, char** argv)
 }
 void test_make_params(int argc, char** argv)
 {
-  Param params = PARAM assert(params.biomass_initial_concentration == cx);
+  Param params = PARAM;
+  assert(params.biomass_initial_concentration == cx);
   assert(params.final_time == ft);
   assert(params.delta_time == dt);
   assert(params.number_particle == np);
   assert(params.n_thread == 1); // Default value
   assert(params.number_exported_result == nex);
-  assert(params.recursive == 0);      // Default value
   assert(params.force_override == 0); // Default value
   assert(params.load_serde == 0);     // Default value
 }
@@ -105,8 +106,7 @@ void test_register_parameters(int argc, char** argv)
 // need existing directory
 void test_register_cma_path_recursive(int argc, char** argv)
 {
-  Handle handle = INIT int result =
-      register_cma_path_recursive(handle, "./tools");
+  Handle handle = INIT int result = register_cma_path(handle, "./tools");
   assert(result == 0);
   delete_handle(&handle);
 }
@@ -159,10 +159,6 @@ void test_branch_null(int argc, char** argv)
   CHECK_FALSE(register_result_path(handle, NULL));
   CHECK_FALSE(register_result_path(NULL, NULL));
 
-  CHECK_FALSE(register_cma_path_recursive(NULL, "valid"));
-  CHECK_FALSE(register_cma_path_recursive(handle, NULL));
-  CHECK_FALSE(register_cma_path_recursive(NULL, NULL));
-
   CHECK_FALSE(register_serde(NULL, "valid"));
   CHECK_FALSE(register_serde(handle, NULL));
   CHECK_FALSE(register_serde(NULL, NULL));

apps/api/tests/test_api_raw.cpp

@@ -8,6 +8,7 @@
 #include <cstddef>
 #include <cstdio>
 #include <dataexporter/data_exporter.hpp>
+#include <exception>
 #include <load_balancing/iload_balancer.hpp>
 #include <load_balancing/impl_lb.hpp>
 #include <mc/mcinit.hpp>
@@ -206,13 +207,24 @@ namespace Core
   std::optional<CmaUtils::TransitionnerPtrType>
   GlobalInitialiser::init_transitionner()
   {
-
-    auto d_transition = (is_host)
-                            ? get_dtransitioner(user_params.cma_case_path)
-                            : CmaUtils::TransitionnerPtrType::from_raw(nullptr);
+    auto d_transition = CmaUtils::TransitionnerPtrType::from_raw(nullptr);
 
     if (is_host)
     {
+      try
+      {
+        d_transition = (is_host)
+                           ? get_dtransitioner(user_params.cma_case_path)
+                           : CmaUtils::TransitionnerPtrType::from_raw(nullptr);
+      }
+      catch (std::exception& e)
+      {
+        if (logger)
+        {
+          logger->error(e.what());
+        }
+        return std::nullopt;
+      }
       f_init_gas_flow = info.current_rank == 0 && params.is_two_phase_flow;
       const auto state = d_transition->get_current();
       if (logger)

apps/core/src/global_initaliser.cpp

@@ -74,8 +74,9 @@ namespace WrapMPI
     [[nodiscard]] bool sendAll(std::size_t n_rank) noexcept;
 
     void wait() noexcept;
-
+#ifdef NDEBUG // FIXME Needed for unite test
   private:
+#endif
     std::span<const double> liquid_volumes;
     std::span<const std::size_t> liquid_neighbors_flat;
     std::span<const double> proba_leaving_flat;

apps/libs/mpi_w/public/mpi_w/iteration_payload.hpp

@@ -1,5 +1,8 @@
 #include <cassert>
 #include <iostream>
+#ifdef NDEBUG
+#  undef NDEBUG
+#endif
 #include <mpi_w/iteration_payload.hpp>
 
 int main(int argc, char** argv)
@@ -17,31 +20,32 @@ int main(int argc, char** argv)
   std::vector<double> gases = {7.7, 8.8, 9.9};
 
   std::vector<size_t> raw_neighbors = {1, 2, 3, 1, 2, 3, 1, 2, 3};
+  std::vector<double> flat_proba = {0, 0.5, 1, 0, 0.5, 1, 0, 0.5, 1};
 
-  CmaRead::L2DView<const size_t> n_view(raw_neighbors, 3);
   if (size != 1)
   {
 
     MPI_Status status;
     if (rank == 0)
+
     { // Sender
 
       WrapMPI::HostIterationPayload host_payload;
-      host_payload.liquid_flows = flows;
+      host_payload.liquid_out_flows = flows;
       host_payload.liquid_volumes = volumes;
-      host_payload.gas_volumes = gases;
-      host_payload.neighbors = n_view;
+      host_payload.liquid_neighbors_flat = raw_neighbors;
+      host_payload.proba_leaving_flat = flat_proba;
       auto _ = host_payload.sendAll(size);
     }
     else if (rank == 1)
     {
-      WrapMPI::IterationPayload payload(3, 3);
+      WrapMPI::IterationPayload payload(3);
       payload.recv(0, &status);
 
-      assert(payload.liquid_flows == flows);
+      assert(payload.liquid_out_flows == flows);
       assert(payload.liquid_volumes == volumes);
-      assert(payload.gas_volumes == gases);
-      assert(raw_neighbors == payload.raw_neighbors);
+      assert(payload.liquid_neighbors_flat == raw_neighbors);
+      assert(payload.proba_leaving_flat == payload.proba_leaving_flat);
     }
   }
   std::cout << "OK" << std::endl;