diff --git a/src/fluid_ele/4C_fluid_ele_boundary_parent_calc.cpp b/src/fluid_ele/4C_fluid_ele_boundary_parent_calc.cpp
index 082ea98b8a7..ba3d664562d 100644
--- a/src/fluid_ele/4C_fluid_ele_boundary_parent_calc.cpp
+++ b/src/fluid_ele/4C_fluid_ele_boundary_parent_calc.cpp
@@ -1874,7 +1874,7 @@ void Discret::Elements::FluidBoundaryParent<distype>::evaluate_weak_dbc(
 
   // get values and switches from condition
   // (assumed to be constant on element boundary)
-  const auto functions = wdbc_cond->parameters().get<std::vector<int>>("FUNCT");
+  const auto functions = wdbc_cond->parameters().get<std::vector<std::optional<int>>>("FUNCT");
 
   // find out whether to apply weak DBC only in normal direction
   bool onlynormal = false;
@@ -2185,13 +2185,14 @@ void Discret::Elements::FluidBoundaryParent<distype>::evaluate_weak_dbc(
     for (int idim = 0; idim < nsd; idim++)
     {
       // factor given by spatial function
-      if (functions[idim] > 0)
+      if (functions[idim].has_value())
       {
         // evaluate function at current gauss point
         // (important: requires 3D position vector)
-        functionfac(idim) = Global::Problem::instance()
-                                ->function_by_id<Core::Utils::FunctionOfSpaceTime>(functions[idim])
-                                .evaluate(coordgp.data(), time, idim);
+        functionfac(idim) =
+            Global::Problem::instance()
+                ->function_by_id<Core::Utils::FunctionOfSpaceTime>(functions[idim].value())
+                .evaluate(coordgp.data(), time, idim);
       }
       else
         functionfac(idim) = 1.0;
diff --git a/src/inpar/4C_inpar_validconditions.cpp b/src/inpar/4C_inpar_validconditions.cpp
index 4459be66f5c..ba0c096dcad 100644
--- a/src/inpar/4C_inpar_validconditions.cpp
+++ b/src/inpar/4C_inpar_validconditions.cpp
@@ -33,6 +33,7 @@
 #include "4C_inpar_structure.hpp"
 #include "4C_inpar_xfem.hpp"
 #include "4C_io_input_spec_builders.hpp"
+#include "4C_io_input_types.hpp"
 #include "4C_thermo_input.hpp"
 
 FOUR_C_NAMESPACE_OPEN
@@ -579,8 +580,8 @@ std::vector<Core::Conditions::ConditionDefinition> Input::valid_conditions()
     cond.add_component(parameter<std::vector<double>>("VAL", {.description = "values", .size = 3}));
 
     // and optional spatial functions
-    cond.add_component(parameter<std::vector<int>>("FUNCT",
-        {.description = "function ids", .default_value = std::vector<int>{0, 0, 0}, .size = 3}));
+    cond.add_component(parameter<std::vector<std::optional<int>>>(
+        "FUNCT", {.description = "function ids", .size = 3}));
     // append the condition to the list of all conditions
     condlist.push_back(cond);
   };
diff --git a/src/inpar/4C_inpar_xfem.cpp b/src/inpar/4C_inpar_xfem.cpp
index 382d936b94d..3f893654b7a 100644
--- a/src/inpar/4C_inpar_xfem.cpp
+++ b/src/inpar/4C_inpar_xfem.cpp
@@ -10,6 +10,7 @@
 #include "4C_cut_enum.hpp"
 #include "4C_fem_condition_definition.hpp"
 #include "4C_io_input_spec_builders.hpp"
+#include "4C_io_input_types.hpp"
 #include "4C_utils_parameter_list.hpp"
 
 FOUR_C_NAMESPACE_OPEN
@@ -520,8 +521,8 @@ void Inpar::XFEM::set_valid_conditions(std::vector<Core::Conditions::ConditionDe
   xfem_levelset_navier_slip.add_component(
       parameter<std::optional<int>>("ROBIN_NEUMANN_ID", {.description = ""}));
   xfem_levelset_navier_slip.add_component(parameter<double>("SLIPCOEFFICIENT"));
-  xfem_levelset_navier_slip.add_component(
-      parameter<int>("FUNCT", {.description = "slip function id", .default_value = 0}));
+  xfem_levelset_navier_slip.add_component(parameter<std::optional<int>>(
+      "FUNCT", {.description = "slip function id", .default_value = 0}));
   xfem_levelset_navier_slip.add_component(
       parameter<bool>("FORCE_ONLY_TANG_VEL", {.description = "", .default_value = false}));
 
@@ -705,8 +706,8 @@ void Inpar::XFEM::set_valid_conditions(std::vector<Core::Conditions::ConditionDe
   xfem_surf_navier_slip.add_component(
       parameter<std::optional<int>>("ROBIN_NEUMANN_ID", {.description = ""}));
   xfem_surf_navier_slip.add_component(parameter<double>("SLIPCOEFFICIENT"));
-  xfem_surf_navier_slip.add_component(
-      parameter<int>("FUNCT", {.description = "slip function id", .default_value = 0}));
+  xfem_surf_navier_slip.add_component(parameter<std::optional<int>>(
+      "FUNCT", {.description = "slip function id", .default_value = 0}));
   xfem_surf_navier_slip.add_component(
       parameter<bool>("FORCE_ONLY_TANG_VEL", {.description = "", .default_value = false}));
 
diff --git a/src/scatra/4C_scatra_timint_elch.cpp b/src/scatra/4C_scatra_timint_elch.cpp
index d9f9b718f78..8dcdb218c36 100644
--- a/src/scatra/4C_scatra_timint_elch.cpp
+++ b/src/scatra/4C_scatra_timint_elch.cpp
@@ -32,6 +32,7 @@
 
 #include <Teuchos_TimeMonitor.hpp>
 
+#include <iterator>
 #include <unordered_set>
 
 FOUR_C_NAMESPACE_OPEN
@@ -2976,7 +2977,8 @@ void ScaTra::ScaTraTimIntElch::apply_neumann_bc(
             // condition.
             const std::vector<int> onoff = {0, 1};
             const std::vector<double> val = {0.0, condition->parameters().get<double>("CURRENT")};
-            const std::vector<std::optional<int>> funct = {0, 0};
+            const std::vector<std::optional<int>> funct = {std::nullopt, std::nullopt};
+
             condition->parameters().add("NUMDOF", 2);
             condition->parameters().add("FUNCT", funct);
             condition->parameters().add("ONOFF", onoff);
diff --git a/src/xfem/4C_xfem_coupling_levelset.cpp b/src/xfem/4C_xfem_coupling_levelset.cpp
index 2a110d22a51..f68c7baad0d 100644
--- a/src/xfem/4C_xfem_coupling_levelset.cpp
+++ b/src/xfem/4C_xfem_coupling_levelset.cpp
@@ -18,6 +18,7 @@
 #include "4C_io_control.hpp"
 #include "4C_io_gmsh.hpp"
 #include "4C_io_input_parameter_container.hpp"
+#include "4C_io_input_types.hpp"
 #include "4C_io_pstream.hpp"
 #include "4C_linalg_utils_sparse_algebra_create.hpp"
 #include "4C_linalg_utils_sparse_algebra_manipulation.hpp"
@@ -1398,12 +1399,8 @@ void XFEM::LevelSetCouplingNavierSlip::set_condition_specific_parameters()
   // Get the scaling factor for the slip length
   sliplength_ = cond->parameters().get<double>("SLIPCOEFFICIENT");
 
-  // Temporary variable for readability.
-  bool tmp_bool;
-
   // Is the slip length constant? Don't call functions at GP-level unnecessary.
-  tmp_bool = (cond->parameters().get<int>("FUNCT") < 1);
-  is_constant_sliplength_ = (tmp_bool) ? true : false;
+  is_constant_sliplength_ = !cond->parameters().get<std::optional<int>>("FUNCT").has_value();
 
   // Project the prescribed velocity in tangential direction, to remove "spurious velocities"
   //  from the geometry approximation.
diff --git a/src/xfem/4C_xfem_coupling_mesh.cpp b/src/xfem/4C_xfem_coupling_mesh.cpp
index f8198cc0ffb..80f620b92db 100644
--- a/src/xfem/4C_xfem_coupling_mesh.cpp
+++ b/src/xfem/4C_xfem_coupling_mesh.cpp
@@ -1474,7 +1474,7 @@ void XFEM::MeshCouplingNavierSlip::set_condition_specific_parameters()
     double sliplength = cond->parameters().get<double>("SLIPCOEFFICIENT");
 
     // Is the slip length constant? Don't call functions at GP-level unnecessary.
-    bool slip_bool = (cond->parameters().get<int>("FUNCT") < 1);
+    bool slip_bool = (!cond->parameters().get<std::optional<int>>("FUNCT").has_value());
 
     bool force_tangential = cond->parameters().get<bool>("FORCE_ONLY_TANG_VEL");
 
@@ -1816,7 +1816,7 @@ void XFEM::MeshCouplingFSI::set_condition_specific_parameters()
     double sliplength = cond->parameters().get<double>("SLIPCOEFFICIENT");
 
     // Is the slip length constant? Don't call functions at GP-level unnecessary.
-    bool slip_bool = (cond->parameters().get<int>("SLIP_FUNCT") < 1);
+    bool slip_bool = (!cond->parameters().get<std::optional<int>>("FUNCT").has_value());
 
     if (!sliplength_map_.insert(std::make_pair(cond_int, std::make_pair(sliplength, slip_bool)))
             .second)
diff --git a/tests/framework-test/tutorial_battery.bc b/tests/framework-test/tutorial_battery.bc
index 00ae51127d1..b3a576fd367 100644
--- a/tests/framework-test/tutorial_battery.bc
+++ b/tests/framework-test/tutorial_battery.bc
@@ -26,7 +26,7 @@ Property Name: INFLOW
 has 45107 Nodes
 '*ns0="CONDITION"'
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 6 ONOFF 1 1 1 0 0 0 VAL 2.0 0.0 0.0 0.0 0.0 0.0 FUNCT 1 0 0 0 0 0"
+description="NUMDOF 6 ONOFF 1 1 1 0 0 0 VAL 2.0 0.0 0.0 0.0 0.0 0.0 FUNCT 1 none none none none none"
 
 MIND that you can specify a condition also on an ElementBlock, just replace 'ELEMENT' with 'CONDITION'
 The 'E num' in the dat-file depends on the order of the specification below
@@ -55,7 +55,7 @@ sectionname="DESIGN VOL INITIAL FIELD CONDITIONS"
 description="FIELD ScaTra FUNCT 2"
 *eb2="CONDITION"
 sectionname="DESIGN VOL TRANSPORT DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 0 VAL 1.2e3 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 0 VAL 1.2e3 0.0 FUNCT none none"
 
 Element Block, named: cathode
 of Shape: TET4
@@ -83,7 +83,7 @@ sectionname="DESIGN VOL INITIAL FIELD CONDITIONS"
 description="FIELD ScaTra FUNCT 4"
 *eb4="CONDITION"
 sectionname="DESIGN VOL TRANSPORT DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 0 VAL 1.2e3 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 0 VAL 1.2e3 0.0 FUNCT none none"
 
 Element Block, named: cathode_cc
 of Shape: TET4
@@ -97,7 +97,7 @@ sectionname="DESIGN VOL INITIAL FIELD CONDITIONS"
 description="FIELD ScaTra FUNCT 5"
 *eb5="CONDITION"
 sectionname="DESIGN VOL TRANSPORT DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 0 VAL 1.2e3 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 0 VAL 1.2e3 0.0 FUNCT none none"
 
 Node Set, named: an-side_cc
 Property Name: none
@@ -107,7 +107,7 @@ sectionname="DESIGN SURF DIRICH CONDITIONS"
 description="NUMDOF 3 ONOFF 1 0 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 *ns1="CONDITION"
 sectionname="DESIGN SURF TRANSPORT DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 0 1 VAL 0.0 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 0 1 VAL 0.0 0.0 FUNCT none none"
 *ns1="CONDITION"
 sectionname="DESIGN CELL VOLTAGE SURF CONDITIONS"
 description="ConditionID 0"
@@ -220,7 +220,7 @@ sectionname="DESIGN SURF DIRICH CONDITIONS"
 description="NUMDOF 3 ONOFF 1 0 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 *ns12="CONDITION"
 sectionname="DESIGN SURF TRANSPORT NEUMANN CONDITIONS"
-description="NUMDOF 2 ONOFF 0 1 VAL 0.0 5.839316572e-6 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 0 1 VAL 0.0 5.839316572e-6 FUNCT none none"
 *ns12="CONDITION"
 sectionname="DESIGN CELL VOLTAGE SURF CONDITIONS"
 description="ConditionID 1"
@@ -244,7 +244,7 @@ Property Name: none
 has 248 Nodes
 *ns15="CONDITION"
 sectionname="DESIGN SURF LOCSYS CONDITIONS"
-description="ROTANGLE 0.7853981634 0.0 0.0 FUNCT 0 0 0 USEUPDATEDNODEPOS 0 USECONSISTENTNODENORMAL 0"
+description="ROTANGLE 0.7853981634 0.0 0.0 FUNCT none none none USEUPDATEDNODEPOS 0 USECONSISTENTNODENORMAL 0"
 *ns15="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
 description="NUMDOF 3 ONOFF 0 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
@@ -268,7 +268,7 @@ Property Name: none
 has 19 Nodes
 *ns18="CONDITION"
 sectionname="DESIGN LINE LOCSYS CONDITIONS"
-description="ROTANGLE 0.7853981634 0.0 0.0 FUNCT 0 0 0 USEUPDATEDNODEPOS 0 USECONSISTENTNODENORMAL 0"
+description="ROTANGLE 0.7853981634 0.0 0.0 FUNCT none none none USEUPDATEDNODEPOS 0 USECONSISTENTNODENORMAL 0"
 *ns18="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
 description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
diff --git a/tests/framework-test/tutorial_contact_3d.bc b/tests/framework-test/tutorial_contact_3d.bc
index e992c2e4469..1a0517cdb0e 100644
--- a/tests/framework-test/tutorial_contact_3d.bc
+++ b/tests/framework-test/tutorial_contact_3d.bc
@@ -37,12 +37,12 @@ Property Name: none
 has 36 Nodes
 *ns4="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 0 0 VAL -1.0 0.0 0.0 FUNCT 1 0 0"
+description="NUMDOF 3 ONOFF 1 0 0 VAL -1.0 0.0 0.0 FUNCT 1 none none"
 
 Node Set, named: wall
 Property Name: none
 has 121 Nodes
 *ns3="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 -----------------------------------------VALIDCONDITIONS
diff --git a/tests/framework-test/tutorial_fluid.bc b/tests/framework-test/tutorial_fluid.bc
index 8d109f373bf..a3f943ddd20 100644
--- a/tests/framework-test/tutorial_fluid.bc
+++ b/tests/framework-test/tutorial_fluid.bc
@@ -45,35 +45,35 @@ Property Name: none
 has 23 Nodes
 *ns1="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 1 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 1 none none"
 
 Node Set, named: top
 Property Name: none
 has 68 Nodes
 *ns2="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 1 0 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 0 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: bottom
 Property Name: none
 has 68 Nodes
 *ns3="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 1 0 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 0 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: cylinder
 Property Name: none
 has 116 Nodes
 *ns4="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: edges
 Property Name: none
 has 2 Nodes
 *ns5="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT none none none"
 
 -----------------------------------------VALIDCONDITIONS
 
diff --git a/tests/framework-test/tutorial_fsi.bc b/tests/framework-test/tutorial_fsi.bc
index b6869eb8f94..94b43fca368 100644
--- a/tests/framework-test/tutorial_fsi.bc
+++ b/tests/framework-test/tutorial_fsi.bc
@@ -21,7 +21,7 @@ Property Name: none
 has 4 Nodes
 *ns1="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT none none"
 
 Node Set, named: structure_fsi_curve
 Property Name: none
@@ -35,42 +35,42 @@ Property Name: none
 has 4 Nodes
 *ns3="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT none none"
 
 Node Set, named: structure_fsi_vertices
 Property Name: none
 has 2 Nodes
 *ns4="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT none none"
 
 Node Set, named: cavity_wall_curves
 Property Name: none
 has 66 Nodes
 *ns5="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: inflow_volume_curve_top
 Property Name: none
 has 33 Nodes
 *ns6="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 1 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 1 none none"
 
 Node Set, named: inflow_area_curve
 Property Name: none
 has 5 Nodes
 *ns7="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 2 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 2 none none"
 
 Node Set, named: fluid_curves_in_y-direction
 Property Name: none
 has 76 Nodes
 *ns8="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT none none"
 
 Node Set, named: fluid_fsi_curve
 Property Name: none
@@ -84,34 +84,34 @@ Property Name: none
 has 2 Nodes
 *ns10="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 1 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 1.0 0.0 0.0 FUNCT 1 none none"
 
 Node Set, named: cavity_vertices
 Property Name: none
 has 4 Nodes
 *ns11="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: fluid_fsi_vertices
 Property Name: none
 has 2 Nodes
 *ns12="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 0 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: fluid_vertices_all
 Property Name: none
 has 8 Nodes
 *ns13="CONDITION"
 sectionname="DESIGN POINT ALE DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT none none"
 
 Node Set, named: inflow_volume_curve_top
 Property Name: none
 has 33 Nodes
 *ns6="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT 0 0"
+description="NUMDOF 2 ONOFF 1 1 VAL 0.0 0.0 FUNCT none none"
 
 -----------------------------------------VALIDCONDITIONS
\ No newline at end of file
diff --git a/tests/framework-test/tutorial_fsi_3d.bc b/tests/framework-test/tutorial_fsi_3d.bc
index 4fb92d1cd03..60dcd591347 100644
--- a/tests/framework-test/tutorial_fsi_3d.bc
+++ b/tests/framework-test/tutorial_fsi_3d.bc
@@ -20,28 +20,28 @@ Property Name: none
 has 4 Nodes
 *ns1="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: structure_surface_right
 Property Name: none
 has 4 Nodes
 *ns2="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: structure_surface_front
 Property Name: none
 has 66 Nodes
 *ns3="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: structure_surface_back
 Property Name: none
 has 66 Nodes
 *ns4="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: structure_coupling_surface
 Property Name: none
@@ -55,84 +55,84 @@ Property Name: none
 has 2 Nodes
 *ns6="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: structure_edge_back_left
 Property Name: none
 has 2 Nodes
 *ns7="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: structure_edge_back_right
 Property Name: none
 has 2 Nodes
 *ns8="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: structure_edge_front_right
 Property Name: none
 has 2 Nodes
 *ns9="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0"
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none"
 
 Node Set, named: cavity_wall_left
 Property Name: none
 has 66 Nodes
 *ns10="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_wall_left
 Property Name: none
 has 66 Nodes
 *ns10="CONDITION"
 sectionname="DESIGN SURF ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_wall_right
 Property Name: none
 has 66 Nodes
 *ns11="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_wall_right
 Property Name: none
 has 66 Nodes
 *ns11="CONDITION"
 sectionname="DESIGN SURF ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: fluid_wall_front
 Property Name: none
 has 1320 Nodes
 *ns12="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: fluid_wall_front
 Property Name: none
 has 1320 Nodes
 *ns12="CONDITION"
 sectionname="DESIGN SURF ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: fluid_wall_back
 Property Name: none
 has 1320 Nodes
 *ns13="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: fluid_wall_back
 Property Name: none
 has 1320 Nodes
 *ns13="CONDITION"
 sectionname="DESIGN SURF ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: fluid_coupling_surface
 Property Name: none
@@ -146,231 +146,231 @@ Property Name: none
 has 66 Nodes
 *ns15="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 0 0 0 "
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 none none none "
 
 Node Set, named: lid
 Property Name: none
 has 66 Nodes
 *ns15="CONDITION"
 sectionname="DESIGN SURF ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: inflow
 Property Name: none
 has 16 Nodes
 *ns16="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 2 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 2 none none none"
 
 Node Set, named: inflow
 Property Name: none
 has 16 Nodes
 *ns16="CONDITION"
 sectionname="DESIGN SURF ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: outflow
 Property Name: none
 has 16 Nodes
 *ns17="CONDITION"
 sectionname="DESIGN SURF ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_edge_front_left
 Property Name: none
 has 33 Nodes
 *ns18="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_front_left
 Property Name: none
 has 33 Nodes
 *ns18="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_edge_back_left
 Property Name: none
 has 33 Nodes
 *ns19="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_back_left
 Property Name: none
 has 33 Nodes
 *ns19="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_edge_back_right
 Property Name: none
 has 33 Nodes
 *ns20="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_back_right
 Property Name: none
 has 33 Nodes
 *ns20="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_edge_front_right
 Property Name: none
 has 33 Nodes
 *ns21="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_front_right
 Property Name: none
 has 33 Nodes
 *ns21="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_edge_front_bottom
 Property Name: none
 has 33 Nodes
 *ns22="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_back_bottom
 Property Name: none
 has 33 Nodes
 *ns23="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 0 0 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_left_bottom
 Property Name: none
 has 2 Nodes
 *ns24="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_left_bottom
 Property Name: none
 has 2 Nodes
 *ns24="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_edge_right_bottom
 Property Name: none
 has 2 Nodes
 *ns25="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_edge_right_bottom
 Property Name: none
 has 2 Nodes
 *ns25="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity-inflow_edge
 Property Name: none
 has 2 Nodes
 *ns26="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity-inflow_edge
 Property Name: none
 has 2 Nodes
 *ns26="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: inflow_edge_front
 Property Name: none
 has 8 Nodes
 *ns27="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 2 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 2 none none none"
 
 Node Set, named: inflow_edge_front
 Property Name: none
 has 8 Nodes
 *ns27="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: inflow_edge_back
 Property Name: none
 has 8 Nodes
 *ns28="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 2 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 2 none none none"
 
 Node Set, named: inflow_edge_back
 Property Name: none
 has 8 Nodes
 *ns28="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: lid_edge_left
 Property Name: none
 has 2 Nodes
 *ns29="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 none none none"
 
 Node Set, named: lid_edge_left
 Property Name: none
 has 2 Nodes
 *ns29="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: lid_edge_front
 Property Name: none
 has 33 Nodes
 *ns30="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 none none none"
 
 Node Set, named: lid_edge_front
 Property Name: none
 has 33 Nodes
 *ns30="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: lid_edge_back
 Property Name: none
 has 33 Nodes
 *ns31="CONDITION"
 sectionname="DESIGN LINE DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 none none none"
 
 Node Set, named: lid_edge_back
 Property Name: none
 has 33 Nodes
 *ns31="CONDITION"
 sectionname="DESIGN LINE ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity_vertex_front_left_bottom
 Property Name: none
 has 1 Nodes
 *ns32="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_vertex_back_left_bottom
 Property Name: none
 has 1 Nodes
 *ns33="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 
 Node Set, named: cavity_vertex_back_right_bottom
@@ -378,69 +378,69 @@ Property Name: none
 has 1 Nodes
 *ns34="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity_vertex_front_right_bottom
 Property Name: none
 has 1 Nodes
 *ns35="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity-inflow_vertex_front_1
 Property Name: none
 has 1 Nodes
 *ns36="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity-inflow_vertex_front_1
 Property Name: none
 has 1 Nodes
 *ns36="CONDITION"
 sectionname="DESIGN POINT ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: cavity-inflow_vertex_front_2
 Property Name: none
 has 1 Nodes
 *ns36="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT 0 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 0.0 0.0 0.0 0.0 FUNCT none none none none"
 
 Node Set, named: cavity-inflow_vertex_front_2
 Property Name: none
 has 1 Nodes
 *ns37="CONDITION"
 sectionname="DESIGN POINT ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: lid_vertex_front_left
 Property Name: none
 has 1 Nodes
 *ns38="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 none none none"
 
 Node Set, named: lid_vertex_front_left
 Property Name: none
 has 1 Nodes
 *ns38="CONDITION"
 sectionname="DESIGN POINT ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 Node Set, named: lid_vertex_back_left
 Property Name: none
 has 1 Nodes
 *ns39="CONDITION"
 sectionname="DESIGN POINT DIRICH CONDITIONS"
-description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 0 0 0"
+description="NUMDOF 4 ONOFF 1 1 1 0 VAL 1.0 0.0 0.0 0.0 FUNCT 1 none none none"
 
 Node Set, named: lid_vertex_back_left
 Property Name: none
 has 1 Nodes
 *ns39="CONDITION"
 sectionname="DESIGN POINT ALE DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT 0 0 0 "
+description="NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none "
 
 -----------------------------------------VALIDCONDITIONS
\ No newline at end of file
diff --git a/tests/framework-test/tutorial_solid.bc b/tests/framework-test/tutorial_solid.bc
index 97351421f20..8a4a3fd2d3c 100644
--- a/tests/framework-test/tutorial_solid.bc
+++ b/tests/framework-test/tutorial_solid.bc
@@ -18,26 +18,26 @@ Property Name: none
 has 47 Nodes
 *ns1="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 1 0  VAL 0 0 0 FUNCT 0 0 0  TAG none "
+description="NUMDOF 3 ONOFF 0 1 0  VAL 0 0 0 FUNCT none none none  TAG none "
 
 Node Set, named: zsymm
 Property Name: none
 has 238 Nodes
 *ns2="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 0 1  VAL 0 0 0 FUNCT 0 0 0  TAG none "
+description="NUMDOF 3 ONOFF 0 0 1  VAL 0 0 0 FUNCT none none none  TAG none "
 
 Node Set, named: xsymm
 Property Name: none
 has 238 Nodes
 *ns3="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 1 0 0  VAL 0 0 0 FUNCT 0 0 0  TAG none "
+description="NUMDOF 3 ONOFF 1 0 0  VAL 0 0 0 FUNCT none none none  TAG none "
 
 Node Set, named: top
 Property Name: none
 has 47 Nodes
 *ns4="CONDITION"
 sectionname="DESIGN SURF DIRICH CONDITIONS"
-description="NUMDOF 3 ONOFF 0 1 0  VAL 0 1 0 FUNCT 0 1 0  TAG monitor_reaction "
+description="NUMDOF 3 ONOFF 0 1 0  VAL 0 1 0 FUNCT none 1 none  TAG monitor_reaction "
 
diff --git a/tests/input_files/beam3eb_genalpha_BTSPH_contact_elstat_attraction.dat b/tests/input_files/beam3eb_genalpha_BTSPH_contact_elstat_attraction.dat
index ee0c82f85cb..e7345d67d98 100644
--- a/tests/input_files/beam3eb_genalpha_BTSPH_contact_elstat_attraction.dat
+++ b/tests/input_files/beam3eb_genalpha_BTSPH_contact_elstat_attraction.dat
@@ -77,9 +77,9 @@ E 1 NUMDOF 6 ONOFF 1 1 1 0 0 0 VAL 0.0 0.0 0.0 0.0 0.0 0.0 FUNCT none none none
 E 2 NUMDOF 6 ONOFF 1 1 1 0 0 0 VAL 0.0 0.0 0.0 0.0 0.0 0.0 FUNCT none none none none none none
 E 3 NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 -1.0 FUNCT none none 1
 ------------------------DESIGN POINT RIGIDSPHERE POTENTIAL CHARGE CONDITIONS
-E 3 POTLAW 1 VAL 1.0 FUNCT -1
+E 3 POTLAW 1 VAL 1.0 FUNCT none
 --------------------------------DESIGN LINE BEAM POTENTIAL CHARGE CONDITIONS
-E 1 POTLAW 1 VAL -1.0 FUNCT -1
+E 1 POTLAW 1 VAL -1.0 FUNCT none
 ---------------------------------------------------------DNODE-NODE TOPOLOGY
 NODE 1 DNODE 1
 NODE 5 DNODE 2
diff --git a/tests/input_files/f2_channel20x20_drt_mixhyb.dat b/tests/input_files/f2_channel20x20_drt_mixhyb.dat
index 64c7d135324..b7b7640d9ec 100644
--- a/tests/input_files/f2_channel20x20_drt_mixhyb.dat
+++ b/tests/input_files/f2_channel20x20_drt_mixhyb.dat
@@ -37,9 +37,9 @@ EVALUATION_TAU                  integration_point
 NAME                            Fluid_Solver
 SOLVER                          UMFPACK
 -------------------------------DESIGN LINE MIXED/HYBRID DIRICHLET CONDITIONS
-E 4 val 1.0 0.0 0.0 funct 1 0 0 u_C 0 PENTYPE constant hB_divided_by 0 utau_computation at_wall
-E 1 val 0.0 0.0 0.0 funct 0 0 0 u_C 0 PENTYPE constant hB_divided_by 0 utau_computation at_wall
-E 3 val 0.0 0.0 0.0 funct 0 0 0 u_C 0 PENTYPE constant hB_divided_by 0 utau_computation at_wall
+E 4 val 1.0 0.0 0.0 funct 1 none none u_C 0 PENTYPE constant hB_divided_by 0 utau_computation at_wall
+E 1 val 0.0 0.0 0.0 funct none none none u_C 0 PENTYPE constant hB_divided_by 0 utau_computation at_wall
+E 3 val 0.0 0.0 0.0 funct none none none u_C 0 PENTYPE constant hB_divided_by 0 utau_computation at_wall
 ---------------------------------------------------------DNODE-NODE TOPOLOGY
 NODE 332 DNODE 1
 NODE 1 DNODE 2
diff --git a/tests/input_files/f3_channel_mixedhybrid.dat b/tests/input_files/f3_channel_mixedhybrid.dat
index 0388ad4bca4..01cc82f3a36 100644
--- a/tests/input_files/f3_channel_mixedhybrid.dat
+++ b/tests/input_files/f3_channel_mixedhybrid.dat
@@ -104,9 +104,9 @@ E 6 ID 1 MASTER_OR_SLAVE Master PLANE xy LAYER 1 ANGLE 0.0 ABSTREETOL 1e-9
 E 1 DIS fluid NUMMODES 4 ONOFF 0 0 0 1 WEIGHTVECDEF integration
 ----------------------------DESIGN SURFACE MIXED/HYBRID DIRICHLET CONDITIONS
 // wall top
-E 1 val 0.0 0.0 0.0 funct 0 0 0 u_C -0.5 PENTYPE Spalding hB_divided_by 4.0 utau_computation at_wall
+E 1 val 0.0 0.0 0.0 funct none none none u_C -0.5 PENTYPE Spalding hB_divided_by 4.0 utau_computation at_wall
 // wall bottom
-E 2 val 0.0 0.0 0.0 funct 0 0 0 u_C -0.5 PENTYPE Spalding hB_divided_by 4.0 utau_computation at_wall
+E 2 val 0.0 0.0 0.0 funct none none none u_C -0.5 PENTYPE Spalding hB_divided_by 4.0 utau_computation at_wall
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 1201 DSURFACE 1
 NODE 1202 DSURFACE 1
diff --git a/tests/input_files/thermoconvection_Tempn.dat b/tests/input_files/thermoconvection_Tempn.dat
index 288a4ed3c51..0ee24eeb490 100644
--- a/tests/input_files/thermoconvection_Tempn.dat
+++ b/tests/input_files/thermoconvection_Tempn.dat
@@ -67,7 +67,7 @@ COMPONENT 0 SYMBOLIC_FUNCTION_OF_SPACE_TIME 0.0
 E 1 NUMDOF 1 ONOFF 1 VAL 0.0 FUNCT none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // right surf Neumann convection
-E 3 temperature_state Tempn coeff -1.0 surtemp 5.0 surtempfunct 0 funct 0
+E 3 temperature_state Tempn coeff -1.0 surtemp 5.0 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 1 DSURFACE 1
 NODE 4 DSURFACE 1
diff --git a/tests/input_files/thermoconvection_Tempnp.dat b/tests/input_files/thermoconvection_Tempnp.dat
index 089a3d469cb..9f02dc90c35 100644
--- a/tests/input_files/thermoconvection_Tempnp.dat
+++ b/tests/input_files/thermoconvection_Tempnp.dat
@@ -74,7 +74,7 @@ COMPONENT 0 SYMBOLIC_FUNCTION_OF_SPACE_TIME 0.0
 E 1 NUMDOF 1 ONOFF 1 VAL 0.0 FUNCT none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // right surf Neumann convection
-E 3 temperature_state Tempnp coeff -1.0 surtemp 5.0 surtempfunct 0 funct 0
+E 3 temperature_state Tempnp coeff -1.0 surtemp 5.0 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 1 DSURFACE 1
 NODE 4 DSURFACE 1
diff --git a/tests/input_files/thermoconvection_tempnp_genalpha.dat b/tests/input_files/thermoconvection_tempnp_genalpha.dat
index e526469400c..ad057d0a919 100644
--- a/tests/input_files/thermoconvection_tempnp_genalpha.dat
+++ b/tests/input_files/thermoconvection_tempnp_genalpha.dat
@@ -72,7 +72,7 @@ COMPONENT 0 SYMBOLIC_FUNCTION_OF_SPACE_TIME 0.0
 E 1 NUMDOF 1 ONOFF 1 VAL 0.0 FUNCT none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // right surf Neumann convection
-E 3 temperature_state Tempnp coeff -1.0 surtemp 5.0 surtempfunct 0 funct 0
+E 3 temperature_state Tempnp coeff -1.0 surtemp 5.0 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 1 DSURFACE 1
 NODE 4 DSURFACE 1
diff --git a/tests/input_files/tsi_geonln_heatconvection_fbar_genalpha_monolithic.dat b/tests/input_files/tsi_geonln_heatconvection_fbar_genalpha_monolithic.dat
index bb6d316716a..f47fdf3c82d 100644
--- a/tests/input_files/tsi_geonln_heatconvection_fbar_genalpha_monolithic.dat
+++ b/tests/input_files/tsi_geonln_heatconvection_fbar_genalpha_monolithic.dat
@@ -149,7 +149,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 49 DSURFACE 1
 NODE 50 DSURFACE 1
diff --git a/tests/input_files/tsi_geonln_heatconvection_fbar_monolithic.dat b/tests/input_files/tsi_geonln_heatconvection_fbar_monolithic.dat
index 538b091c92d..6403d5507ff 100644
--- a/tests/input_files/tsi_geonln_heatconvection_fbar_monolithic.dat
+++ b/tests/input_files/tsi_geonln_heatconvection_fbar_monolithic.dat
@@ -136,7 +136,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 49 DSURFACE 1
 NODE 50 DSURFACE 1
diff --git a/tests/input_files/tsi_geonln_heatconvection_monolithic.dat b/tests/input_files/tsi_geonln_heatconvection_monolithic.dat
index 5e69baa6a51..1900946b6ee 100644
--- a/tests/input_files/tsi_geonln_heatconvection_monolithic.dat
+++ b/tests/input_files/tsi_geonln_heatconvection_monolithic.dat
@@ -141,7 +141,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 49 DSURFACE 1
 NODE 50 DSURFACE 1
diff --git a/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic.dat b/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic.dat
index ac05f9d4950..472f143bb25 100644
--- a/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic.dat
+++ b/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic.dat
@@ -155,9 +155,9 @@ E 1 NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 E 2 NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 //                              inner_surf_temperature
-E 4 temperature_state Tempnp coeff -42700.0 surtemp 80.0  surtempfunct 0 funct 0
+E 4 temperature_state Tempnp coeff -42700.0 surtemp 80.0  surtempfunct none funct none
 //                              outer_surf_temperature
-E 5 temperature_state Tempnp coeff -5.0 surtemp 50.0  surtempfunct 0 funct 0
+E 5 temperature_state Tempnp coeff -5.0 surtemp 50.0  surtempfunct none funct none
 ---------------------------------------------------------DLINE-NODE TOPOLOGY
 NODE 1 DLINE 1
 NODE 4 DLINE 1
diff --git a/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic_mergeTSImatrix.dat b/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic_mergeTSImatrix.dat
index 1d02d129880..06ba3aedeaf 100644
--- a/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic_mergeTSImatrix.dat
+++ b/tests/input_files/tsi_geonln_plexichannel_varyE_OST_monolithic_mergeTSImatrix.dat
@@ -158,9 +158,9 @@ E 1 NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 E 2 NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 //                              inner_surf_temperature
-E 4 temperature_state Tempnp coeff -42700.0 surtemp 80.0  surtempfunct 0 funct 0
+E 4 temperature_state Tempnp coeff -42700.0 surtemp 80.0  surtempfunct none funct none
 //                              outer_surf_temperature
-E 5 temperature_state Tempnp coeff -5.0 surtemp 50.0  surtempfunct 0 funct 0
+E 5 temperature_state Tempnp coeff -5.0 surtemp 50.0  surtempfunct none funct none
 ---------------------------------------------------------DLINE-NODE TOPOLOGY
 NODE 1 DLINE 1
 NODE 4 DLINE 1
diff --git a/tests/input_files/tsi_geonln_simplrocketnozzle_monolithic.dat b/tests/input_files/tsi_geonln_simplrocketnozzle_monolithic.dat
index 65e969212be..36a7cac50ad 100644
--- a/tests/input_files/tsi_geonln_simplrocketnozzle_monolithic.dat
+++ b/tests/input_files/tsi_geonln_simplrocketnozzle_monolithic.dat
@@ -147,7 +147,7 @@ E 5 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 E 1 NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // thr convection hot gas --> cycle is applied via CURVE2
-E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct 0
+E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct none
 // thr top surrounding temp
 //E 7 - temperature_state Tempnp coeff 28000 surtemp 293.15 surtempcurve none curve none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
diff --git a/tests/input_files/tsi_heatconvection_iterstagg.dat b/tests/input_files/tsi_heatconvection_iterstagg.dat
index 206926be0ba..10ceb8ec753 100644
--- a/tests/input_files/tsi_heatconvection_iterstagg.dat
+++ b/tests/input_files/tsi_heatconvection_iterstagg.dat
@@ -133,7 +133,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 // THR left surface heat convection:
 //E 7 - temperature_state Tempnp coeff -6.444497425e-06 surtemp 373.15 surtempcurve none curve none
 // nightly test case
-E 7 temperature_state Tempnp coeff -6.444497425e-06 surtemp 373.15 surtempfunct 0 funct 2
+E 7 temperature_state Tempnp coeff -6.444497425e-06 surtemp 373.15 surtempfunct none funct 2
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 1 DSURFACE 2
 NODE 4 DSURFACE 2
diff --git a/tests/input_files/tsi_heatconvection_monolithic.dat b/tests/input_files/tsi_heatconvection_monolithic.dat
index c627fc074c2..5bff50784db 100644
--- a/tests/input_files/tsi_heatconvection_monolithic.dat
+++ b/tests/input_files/tsi_heatconvection_monolithic.dat
@@ -140,7 +140,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 49 DSURFACE 1
 NODE 50 DSURFACE 1
diff --git a/tests/input_files/tsi_heatconvection_monolithic_fine.dat b/tests/input_files/tsi_heatconvection_monolithic_fine.dat
index 4f2f7d164eb..8dc1517cb86 100644
--- a/tests/input_files/tsi_heatconvection_monolithic_fine.dat
+++ b/tests/input_files/tsi_heatconvection_monolithic_fine.dat
@@ -6,7 +6,8 @@ benchmark for linear thermo-structure interaction
 -> validation of fully-coupled partitioned TSI-algorithm
 -> for comparison with literature use: tmax = 4.0, dt = 0.01
 30x12x12 elements, i.e., 4320 elements: for the given problem inefficient fine
-mesh, but to test a BGS(AMG) preconditioner necessary.
+mesh, but to test a BGS(AMG)
+preconditioner necessary.
 Be careful if you want to compare these results with Tanaka: coupling term in
 thermal equation depends only on initial temperature T_0, whereas in 4C the coupling term depends on current temperature T
 -> Switch on #define COUPLEINITTEMPERATURE in tsi_defines.H
@@ -149,7 +150,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 121 DSURFACE 1
 NODE 122 DSURFACE 1
diff --git a/tests/input_files/tsi_heatconvection_monolithic_muelu.dat b/tests/input_files/tsi_heatconvection_monolithic_muelu.dat
index 9d10690b694..844583744ed 100644
--- a/tests/input_files/tsi_heatconvection_monolithic_muelu.dat
+++ b/tests/input_files/tsi_heatconvection_monolithic_muelu.dat
@@ -141,7 +141,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 49 DSURFACE 1
 NODE 50 DSURFACE 1
diff --git a/tests/input_files/tsi_heatconvection_thrplastic_genalpha_monolithic.dat b/tests/input_files/tsi_heatconvection_thrplastic_genalpha_monolithic.dat
index 97dfe6f66ee..60169732484 100644
--- a/tests/input_files/tsi_heatconvection_thrplastic_genalpha_monolithic.dat
+++ b/tests/input_files/tsi_heatconvection_thrplastic_genalpha_monolithic.dat
@@ -162,7 +162,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 49 DSURFACE 1
 NODE 50 DSURFACE 1
diff --git a/tests/input_files/tsi_heatconvection_thrplastic_monolithic.dat b/tests/input_files/tsi_heatconvection_thrplastic_monolithic.dat
index 6a59af348b6..bb4fdb9426d 100644
--- a/tests/input_files/tsi_heatconvection_thrplastic_monolithic.dat
+++ b/tests/input_files/tsi_heatconvection_thrplastic_monolithic.dat
@@ -145,7 +145,7 @@ E 1 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 //E 8 - 1 1 373.15 none 0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // THR left surf heat convection
-E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct 0 funct 0
+E 8 temperature_state Tempnp coeff -6.444497425 surtemp 373.15 surtempfunct none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 49 DSURFACE 1
 NODE 50 DSURFACE 1
diff --git a/tests/input_files/tsi_locsys_monolithic.dat b/tests/input_files/tsi_locsys_monolithic.dat
index cc9abbbb1f1..43c517c0ca4 100644
--- a/tests/input_files/tsi_locsys_monolithic.dat
+++ b/tests/input_files/tsi_locsys_monolithic.dat
@@ -138,7 +138,7 @@ E 3 ROTANGLE 2.01937681 2.406599614 0.0 FUNCT none none none USEUPDATEDNODEPOS 0
 //normal -0.176327 1.0 0.0 tangent 1.0 0.176327 0.0
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 //  thr_conv_hot_gas
-E 4 temperature_state Tempnp coeff -280 surtemp 1.0 surtempfunct 2 funct 0
+E 4 temperature_state Tempnp coeff -280 surtemp 1.0 surtempfunct 2 funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
 NODE 1 DSURFACE 1
 NODE 2 DSURFACE 1
diff --git a/tests/input_files/tsi_plexichannel_varyE_monolithic.dat b/tests/input_files/tsi_plexichannel_varyE_monolithic.dat
index ac64172bf71..985f4446445 100644
--- a/tests/input_files/tsi_plexichannel_varyE_monolithic.dat
+++ b/tests/input_files/tsi_plexichannel_varyE_monolithic.dat
@@ -156,9 +156,9 @@ E 1 NUMDOF 3 ONOFF 1 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 E 2 NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 //                              inner_surf_temperature
-E 4 temperature_state Tempnp coeff -42700.0 surtemp 80.0 surtempfunct 0 funct 0
+E 4 temperature_state Tempnp coeff -42700.0 surtemp 80.0 surtempfunct none funct none
 //                              outer_surf_temperature
-E 5 temperature_state Tempnp coeff -5.0 surtemp 50.0 surtempfunct 0 funct 0
+E 5 temperature_state Tempnp coeff -5.0 surtemp 50.0 surtempfunct none funct none
 ---------------------------------------------------------DLINE-NODE TOPOLOGY
 NODE 1 DLINE 1
 NODE 4 DLINE 1
diff --git a/tests/input_files/tsi_simplrocketnozzle_monolithic.dat b/tests/input_files/tsi_simplrocketnozzle_monolithic.dat
index 9c5ffab51b7..ed508ecf3cc 100644
--- a/tests/input_files/tsi_simplrocketnozzle_monolithic.dat
+++ b/tests/input_files/tsi_simplrocketnozzle_monolithic.dat
@@ -151,7 +151,7 @@ E 5 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 E 1 NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // thr convection hot gas --> cycle is applied via CURVE2
-E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct 0
+E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct none
 // thr top surrounding temp
 //E 7 - temperature_state Tempnp coeff 28000 surtemp 293.15 surtempcurve none curve none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
diff --git a/tests/input_files/tsi_simplrocketnozzle_monolithic_ilu.dat b/tests/input_files/tsi_simplrocketnozzle_monolithic_ilu.dat
index 7a060d9614a..594957d2ac6 100644
--- a/tests/input_files/tsi_simplrocketnozzle_monolithic_ilu.dat
+++ b/tests/input_files/tsi_simplrocketnozzle_monolithic_ilu.dat
@@ -152,7 +152,7 @@ E 5 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 E 1 NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // thr convection hot gas --> cycle is applied via CURVE2
-E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct 0
+E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct none
 // thr top surrounding temp
 //E 7 - temperature_state Tempnp coeff 28000 surtemp 293.15 surtempcurve none curve none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY
diff --git a/tests/input_files/tsi_simplrocketnozzle_monolithic_muelu.dat b/tests/input_files/tsi_simplrocketnozzle_monolithic_muelu.dat
index 246492b3ac5..2efd255465a 100644
--- a/tests/input_files/tsi_simplrocketnozzle_monolithic_muelu.dat
+++ b/tests/input_files/tsi_simplrocketnozzle_monolithic_muelu.dat
@@ -151,7 +151,7 @@ E 5 NUMDOF 3 ONOFF 0 1 1 VAL 0.0 0.0 0.0 FUNCT none none none
 E 1 NUMDOF 3 ONOFF 0 0 1 VAL 0.0 0.0 0.0 FUNCT none none none
 ------------------------------------DESIGN THERMO CONVECTION SURF CONDITIONS
 // thr convection hot gas --> cycle is applied via CURVE2
-E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct 0
+E 6 temperature_state Tempnp coeff -28000 surtemp 1.0 surtempfunct 3 funct none
 // thr top surrounding temp
 //E 7 - temperature_state Tempnp coeff 28000 surtemp 293.15 surtempcurve none funct none
 ---------------------------------------------------------DSURF-NODE TOPOLOGY