Adjustments on generators

Author: Arthoni

.gitlab-ci.yml

@@ -22,12 +22,11 @@ pkg-of:
   stage: package
   parallel:
     matrix:
-      - TAG: ["debian-12-qt6",
-              "ubuntu-22.04-qt5", "ubuntu-24.04-qt6", "ubuntu-24.10-qt6", "ubuntu-25.04-qt6"]  
+      - TAG: ["ubuntu-22.04-qt5"]  
   image: "registry.forge.inrae.fr/openfluid/incubateur/openfluid/ofbuild/$TAG"
   script:
     - mkdir ./_build
-    - cd ./_build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+    - cd ./_build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DOFBUILD_ENABLE_GUI=OFF
     - make -j `nproc`
     - cpack -j `nproc`
   artifacts:

src/apps/openfluid-builder/model/AddGeneratorDialog.cpp

@@ -479,6 +479,7 @@ openfluid::ware::WareParams_t AddGeneratorDialog::getParams() const
     if (ui->VectorRadioButton->isChecked() || ui->MatrixRadioButton->isChecked())
     {
       Params["identicalcells"] = ui->IdenticalValueCheckbox->isChecked();
+      Params["varsize"] = getDimensions().getSerializedVariableSize();
     }
   }
   else if (m_Method == openfluid::fluidx::GeneratorDescriptor::GeneratorMethod::INTERP)

src/openfluid/machine/FixedGenerator.cpp

@@ -262,43 +262,6 @@ void FixedGenerator<T>::initParams(const openfluid::ware::WareParams_t& Params)
 // =====================================================================
 
 
-template <>
-void FixedGenerator<double>::applyValue(openfluid::core::SpatialUnit* LU, bool init)
-{
-  if (init)
-  {
-    OPENFLUID_InitializeVariable(LU,m_VarName,0.0);
-  }
-  else
-  {
-    OPENFLUID_AppendVariable(LU,m_VarName,m_VarValue);
-  }
-}
-
-
-// =====================================================================
-// =====================================================================
-
-
-template <>
-void FixedGenerator<std::string>::applyValue(openfluid::core::SpatialUnit* LU, bool init)
-{
-  if (init)
-  {
-    std::string InitVar = "";
-    OPENFLUID_InitializeVariable(LU,m_VarName, InitVar);
-  }
-  else
-  {
-    OPENFLUID_AppendVariable(LU,m_VarName,m_VarValue);
-  }
-}
-
-
-// =====================================================================
-// =====================================================================
-
-
 template <>
 void LinearFixedGenerator<openfluid::core::VectorValue>::applyValue(openfluid::core::SpatialUnit* LU, bool init)
 {

src/openfluid/utils/Binding.hpp

@@ -35,6 +35,8 @@
   @author Jean-Christophe FABRE <jean-christophe.fabre@inra.fr>
 */
 
+// OpenFLUID:stylecheck:!brac
+
 
 #ifndef __OPENFLUID_UTILS_BINDING_HPP__
 #define __OPENFLUID_UTILS_BINDING_HPP__
@@ -865,6 +867,12 @@ class Binding
             mp_OutErr->printfOut("inject");
           }
 
+          if (pGenDesc->getGeneratorMethod() == \
+                openfluid::fluidx::GeneratorDescriptor:: GeneratorMethod::INJECTMULTICOL)
+          {
+            mp_OutErr->printfOut("inject-multicol");
+          }
+
           mp_OutErr->printfOut(" generator for variable %s on units %s\n",
                               pGenDesc->getVariableName().c_str(),pGenDesc->getUnitsClass().c_str());
         }