Change Cjr_half -> Djr

- compute Djr in 3D
- fix a few Cjr_n -> Djr use for d>1

src/language/modules/SchemeModule.cpp

@@ -621,6 +621,44 @@ SchemeModule::SchemeModule()
 
                             ));
 
+  this
+    ->_addBuiltinFunction("implicit_eucclhyd_euler",
+                          std::function(
+
+                            [](const std::shared_ptr<const DiscreteFunctionVariant>& rho,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& u,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& E,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& c,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& p,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& pi,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& Cv,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& entropy,
+                               const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>&
+                                 bc_descriptor_list,
+                               const std::shared_ptr<const DiscreteFunctionVariant>& chi_explicit,
+                               const double& dt) -> std::tuple<std::shared_ptr<const IMesh>,
+                                                               std::shared_ptr<const DiscreteFunctionVariant>,
+                                                               std::shared_ptr<const DiscreteFunctionVariant>,
+                                                               std::shared_ptr<const DiscreteFunctionVariant>> {
+                              return ImplicitAcousticSolverHandler{ImplicitAcousticSolverHandler::SolverType::Eucclhyd,
+                                                                   rho,
+                                                                   c,
+                                                                   u,
+                                                                   p,
+                                                                   pi,
+                                                                   gamma,
+                                                                   Cv,
+                                                                   entropy,
+                                                                   bc_descriptor_list,
+                                                                   chi_explicit,
+                                                                   dt}
+                                .solver()
+                                .apply(dt, rho, u, E, c, p, pi, gamma, Cv, entropy);
+                            }
+
+                            ));
+
   this->_addBuiltinFunction(
     "implicit_eucclhyd_euler",
     std::function(
@@ -655,6 +693,116 @@ SchemeModule::SchemeModule()
 
       ));
 
+  this->_addBuiltinFunction("implicit_glace_euler",
+                            std::function(
+
+                              [](const std::shared_ptr<const DiscreteFunctionVariant>& rho,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& u,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& E,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& c,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& p,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& pi,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& Cv,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& entropy,
+                                 const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>&
+                                   bc_descriptor_list,
+                                 const std::vector<std::shared_ptr<const IZoneDescriptor>>& explicit_zone_list,
+                                 const double& dt) -> std::tuple<std::shared_ptr<const IMesh>,
+                                                                 std::shared_ptr<const DiscreteFunctionVariant>,
+                                                                 std::shared_ptr<const DiscreteFunctionVariant>,
+                                                                 std::shared_ptr<const DiscreteFunctionVariant>> {
+                                return ImplicitAcousticSolverHandler{ImplicitAcousticSolverHandler::SolverType::
+                                                                       Glace2States,
+                                                                     rho,
+                                                                     c,
+                                                                     u,
+                                                                     p,
+                                                                     pi,
+                                                                     gamma,
+                                                                     Cv,
+                                                                     entropy,
+                                                                     bc_descriptor_list,
+                                                                     explicit_zone_list,
+                                                                     dt}
+                                  .solver()
+                                  .apply(dt, rho, u, E, c, p, pi, gamma, Cv, entropy);
+                              }
+
+                              ));
+
+  this->_addBuiltinFunction("implicit_glace_euler",
+                            std::function(
+
+                              [](const std::shared_ptr<const DiscreteFunctionVariant>& rho,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& u,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& E,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& c,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& p,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& pi,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& Cv,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& entropy,
+                                 const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>&
+                                   bc_descriptor_list,
+                                 const std::shared_ptr<const DiscreteFunctionVariant>& chi_explicit,
+                                 const double& dt) -> std::tuple<std::shared_ptr<const IMesh>,
+                                                                 std::shared_ptr<const DiscreteFunctionVariant>,
+                                                                 std::shared_ptr<const DiscreteFunctionVariant>,
+                                                                 std::shared_ptr<const DiscreteFunctionVariant>> {
+                                return ImplicitAcousticSolverHandler{ImplicitAcousticSolverHandler::SolverType::
+                                                                       Glace2States,
+                                                                     rho,
+                                                                     c,
+                                                                     u,
+                                                                     p,
+                                                                     pi,
+                                                                     gamma,
+                                                                     Cv,
+                                                                     entropy,
+                                                                     bc_descriptor_list,
+                                                                     chi_explicit,
+                                                                     dt}
+                                  .solver()
+                                  .apply(dt, rho, u, E, c, p, pi, gamma, Cv, entropy);
+                              }
+
+                              ));
+
+  this->_addBuiltinFunction(
+    "implicit_glace_euler",
+    std::function(
+
+      [](const std::shared_ptr<const DiscreteFunctionVariant>& rho,
+         const std::shared_ptr<const DiscreteFunctionVariant>& u,
+         const std::shared_ptr<const DiscreteFunctionVariant>& E,
+         const std::shared_ptr<const DiscreteFunctionVariant>& c,
+         const std::shared_ptr<const DiscreteFunctionVariant>& p,
+         const std::shared_ptr<const DiscreteFunctionVariant>& pi,
+         const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
+         const std::shared_ptr<const DiscreteFunctionVariant>& Cv,
+         const std::shared_ptr<const DiscreteFunctionVariant>& entropy,
+         const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& bc_descriptor_list, const double& dt)
+        -> std::tuple<std::shared_ptr<const IMesh>, std::shared_ptr<const DiscreteFunctionVariant>,
+                      std::shared_ptr<const DiscreteFunctionVariant>, std::shared_ptr<const DiscreteFunctionVariant>> {
+        return ImplicitAcousticSolverHandler{ImplicitAcousticSolverHandler::SolverType::Glace2States,
+                                             rho,
+                                             c,
+                                             u,
+                                             p,
+                                             pi,
+                                             gamma,
+                                             Cv,
+                                             entropy,
+                                             bc_descriptor_list,
+                                             std::vector<std::shared_ptr<const IZoneDescriptor>>{},
+                                             dt}
+          .solver()
+          .apply(dt, rho, u, E, c, p, pi, gamma, Cv, entropy);
+      }
+
+      ));
+
   this->_addBuiltinFunction("acoustic_dt",
                             std::function(
 

src/scheme/ImplicitAcousticSolver.hpp

@@ -90,6 +90,20 @@ class ImplicitAcousticSolverHandler
     const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& bc_descriptor_list,
     const std::vector<std::shared_ptr<const IZoneDescriptor>>& explicit_zone_list,
     const double& dt);
+
+  ImplicitAcousticSolverHandler(
+    const SolverType solver_type,
+    const std::shared_ptr<const DiscreteFunctionVariant>& rho,
+    const std::shared_ptr<const DiscreteFunctionVariant>& c,
+    const std::shared_ptr<const DiscreteFunctionVariant>& u,
+    const std::shared_ptr<const DiscreteFunctionVariant>& p,
+    const std::shared_ptr<const DiscreteFunctionVariant>& pi,
+    const std::shared_ptr<const DiscreteFunctionVariant>& gamma,
+    const std::shared_ptr<const DiscreteFunctionVariant>& Cv,
+    const std::shared_ptr<const DiscreteFunctionVariant>& entropy,
+    const std::vector<std::shared_ptr<const IBoundaryConditionDescriptor>>& bc_descriptor_list,
+    const std::shared_ptr<const DiscreteFunctionVariant>& chi_explicit,
+    const double& dt);
 };
 
 #endif   // IMPLICIT_ACOUSTIC_SOLVER_HPP