Just skin discretization of head and torso for foundation of approach plus vectorization of related paths/nodes in energy and env. Builds but does not run

Author: ntatum94

projects/biogears/libBiogears/include/biogears/engine/BioGearsPhysiologyEngine.h

@@ -531,16 +531,18 @@ namespace tatrc {
         DEFINE_STATIC_STRING(Clothing);
         DEFINE_STATIC_STRING(Enclosure);
         DEFINE_STATIC_STRING(ExternalCore);
-        DEFINE_STATIC_STRING(ExternalSkin);
+        DEFINE_STATIC_STRING(ExternalTorsoSkin);
+        DEFINE_STATIC_STRING(ExternalHeadSkin);
         DEFINE_STATIC_STRING(ExternalGround);
         DEFINE_STATIC_STRING(InternalCore);
-        DEFINE_STATIC_STRING(InternalSkin);
+        DEFINE_STATIC_STRING(InternalTorsoSkin);
+        DEFINE_STATIC_STRING(InternalHeadSkin);
         DEFINE_STATIC_STRING(InternalGround);
 
         static const std::vector<std::string>& GetValues()
         {
           static std::vector<std::string> _values = {
-            Active, Ambient, Clothing, Enclosure, ExternalCore, ExternalSkin, ExternalGround, InternalCore, InternalSkin, InternalGround
+            Active, Ambient, Clothing, Enclosure, ExternalCore, ExternalTorsoSkin, ExternalHeadSkin, ExternalGround, InternalCore, InternalTorsoSkin, InternalHeadSkin, InternalGround
           };
           return _values;
         }
@@ -556,19 +558,24 @@ namespace tatrc {
         DEFINE_STATIC_STRING(GroundToClothing);
         DEFINE_STATIC_STRING(GroundToEnclosure);
         DEFINE_STATIC_STRING(GroundToEnvironment);
-        DEFINE_STATIC_STRING(ExternalSkinToGround);
-        DEFINE_STATIC_STRING(ExternalSkinToClothing);
+        DEFINE_STATIC_STRING(ExternalTorsoSkinToGround);
+        DEFINE_STATIC_STRING(ExternalHeadSkinToGround);
+        DEFINE_STATIC_STRING(ExternalTorsoSkinToClothing);
+        DEFINE_STATIC_STRING(ExternalHeadSkinToClothing);
         DEFINE_STATIC_STRING(GroundToInternalCore);
-        DEFINE_STATIC_STRING(InternalCoreToInternalSkin);
+        DEFINE_STATIC_STRING(InternalCoreToInternalTorsoSkin);
+        DEFINE_STATIC_STRING(InternalCoreToInternalHeadSkin);
         DEFINE_STATIC_STRING(InternalCoreToGround);
-        DEFINE_STATIC_STRING(InternalSkinToGround);
+        DEFINE_STATIC_STRING(InternalTorsoSkinToGround);
+        DEFINE_STATIC_STRING(InternalHeadSkinToGround);
         DEFINE_STATIC_STRING(InternalCoreToExternalCore);
-        DEFINE_STATIC_STRING(InternalSkinToExternalSkin);
+        DEFINE_STATIC_STRING(InternalTorsoSkinToExternalTorsoSkin);
+        DEFINE_STATIC_STRING(InternalHeadSkinToExternalHeadSkin);
 
         static const std::vector<std::string>& GetValues()
         {
           static std::vector<std::string> _values = {
-            ActiveToClothing, ClothingToEnclosure, ClothingToEnvironment, ExternalCoreToGround, GroundToActive, GroundToClothing, GroundToEnclosure, GroundToEnvironment, ExternalSkinToGround, ExternalSkinToClothing, GroundToInternalCore, InternalCoreToInternalSkin, InternalCoreToGround, InternalSkinToGround, InternalCoreToExternalCore, InternalSkinToExternalSkin
+            ActiveToClothing, ClothingToEnclosure, ClothingToEnvironment, ExternalCoreToGround, GroundToActive, GroundToClothing, GroundToEnclosure, GroundToEnvironment, ExternalTorsoSkinToGround, ExternalHeadSkinToGround, ExternalTorsoSkinToClothing, ExternalHeadSkinToClothing, GroundToInternalCore, InternalCoreToInternalTorsoSkin, InternalCoreToInternalHeadSkin, InternalCoreToGround, InternalTorsoSkinToGround, InternalHeadSkinToGround, InternalCoreToExternalCore, InternalTorsoSkinToExternalTorsoSkin, InternalHeadSkinToExternalHeadSkin
           };
           return _values;
         }

projects/biogears/libBiogears/include/biogears/engine/Controller/BioGearsCircuits.h

@@ -303,8 +303,8 @@ namespace tatrc {
         DEFINE_STATIC_STRING(Clothing);
         DEFINE_STATIC_STRING(Enclosure);
         DEFINE_STATIC_STRING(ExternalCore);
-        DEFINE_STATIC_STRING(ExternalUpperSkin);
-        DEFINE_STATIC_STRING(ExternalLowerSkin);
+        DEFINE_STATIC_STRING(ExternalTorsoSkin);
+        DEFINE_STATIC_STRING(ExternalHeadSkin);
         DEFINE_STATIC_STRING(ExternalGround);
         DEFINE_STATIC_STRING(Ambient);
       };
@@ -319,10 +319,10 @@ namespace tatrc {
         DEFINE_STATIC_STRING(GroundToClothing);
         DEFINE_STATIC_STRING(GroundToEnclosure);
         DEFINE_STATIC_STRING(GroundToEnvironment);
-        DEFINE_STATIC_STRING(ExternalUpperSkinToGround);
-        DEFINE_STATIC_STRING(ExternalUpperSkinToUpperClothing);
-        DEFINE_STATIC_STRING(ExternalLowerSkinToGround);
-        DEFINE_STATIC_STRING(ExternalLowerSkinToLowerClothing);
+        DEFINE_STATIC_STRING(ExternalTorsoSkinToGround);
+        DEFINE_STATIC_STRING(ExternalTorsoSkinToClothing);
+        DEFINE_STATIC_STRING(ExternalHeadSkinToGround);
+        DEFINE_STATIC_STRING(ExternalHeadSkinToClothing);
       };
 
       ////////////////////////////////////////
@@ -333,42 +333,25 @@ namespace tatrc {
 
         DEFINE_STATIC_STRING(InternalCore);
         DEFINE_STATIC_STRING(InternalGround);
-
-        DEFINE_STATIC_STRING(CentralBlood);
-        DEFINE_STATIC_STRING(UpperMuscle);
-        DEFINE_STATIC_STRING(UpperFat);
-        DEFINE_STATIC_STRING(InternalUpperSkin);
-        DEFINE_STATIC_STRING(LowerMuscle);
-        DEFINE_STATIC_STRING(LowerFat);
-        DEFINE_STATIC_STRING(InternalLowerSkin);
+        // Leaving out central blood, fat, and muscle nodes for proof of concept
+        //DEFINE_STATIC_STRING(CentralBlood);
+        //DEFINE_STATIC_STRING(TorsoMuscle);
+        //DEFINE_STATIC_STRING(TorsoFat);
+        //DEFINE_STATIC_STRING(TorsoMuscle);
+        //DEFINE_STATIC_STRING(TorsoFat);
+        DEFINE_STATIC_STRING(InternalTorsoSkin);
+        DEFINE_STATIC_STRING(InternalHeadSkin);
       };
 
       namespace InternalTemperaturePath {
 
         DEFINE_STATIC_STRING(GroundToInternalCore);
         DEFINE_STATIC_STRING(InternalCoreToGround);
 
-        DEFINE_STATIC_STRING(CentralBloodToTemperatureGround);
-        DEFINE_STATIC_STRING(UpperMuscleToTemperatureGround);
-        DEFINE_STATIC_STRING(UpperFatToTemperatureGround);
-        DEFINE_STATIC_STRING(InternalUpperSkinToTemperatureGround);
-        DEFINE_STATIC_STRING(UpperCoreToCentralBlood);
-        DEFINE_STATIC_STRING(UpperMuscleToCentralBlood);
-        DEFINE_STATIC_STRING(UpperFatToCentralBlood);
-        DEFINE_STATIC_STRING(InternalUpperSkinToCentralBlood);
-        DEFINE_STATIC_STRING(CoreToUpperMuscle);
-        DEFINE_STATIC_STRING(UpperMuscleToUpperFat);
-        DEFINE_STATIC_STRING(UpperFatToInternalUpperSkin);
-        DEFINE_STATIC_STRING(LowerMuscleToTemperatureGround);
-        DEFINE_STATIC_STRING(LowerFatToTemperatureGround);
-        DEFINE_STATIC_STRING(InternalLowerSkinToTemperatureGround);
-        DEFINE_STATIC_STRING(LowerCoreToCentralBlood);
-        DEFINE_STATIC_STRING(LowerMuscleToCentralBlood);
-        DEFINE_STATIC_STRING(LowerFatToCentralBlood);
-        DEFINE_STATIC_STRING(InternalLowerSkinToCentralBlood);
-        DEFINE_STATIC_STRING(CoreToLowerMuscle);
-        DEFINE_STATIC_STRING(LowerMuscleToLowerFat);
-        DEFINE_STATIC_STRING(LowerFatToInternalLowerSkin);
+        DEFINE_STATIC_STRING(InternalTorsoSkinToTemperatureGround);
+        DEFINE_STATIC_STRING(InternalHeadSkinToTemperatureGround);
+        DEFINE_STATIC_STRING(InternalCoreToInternalTorsoSkin);
+        DEFINE_STATIC_STRING(InternalCoreToInternalHeadSkin);
       };
 
       ////////////////////////////////////////
@@ -378,8 +361,8 @@ namespace tatrc {
       namespace CombinedTemperaturePath {
 
         DEFINE_STATIC_STRING(InternalCoreToExternalCore);
-        DEFINE_STATIC_STRING(UpperSkinToExternalUpperSkin);
-        DEFINE_STATIC_STRING(LowerSkinToExternalLowerSkin);
+        DEFINE_STATIC_STRING(InternalTorsoSkinToExternalTorsoSkin);
+        DEFINE_STATIC_STRING(InternalHeadSkinToExternalHeadSkin);
       };
 
       namespace CardiovascularNode {

projects/biogears/libBiogears/include/biogears/engine/Systems/Energy.h

@@ -115,7 +115,7 @@ class BIOGEARS_API Energy : public SEEnergySystem, public BioGearsSystem {
   SEThermalCircuitNode* m_skinNode;
   //Paths
   SEThermalCircuitPath* m_temperatureGroundToCorePath;
-  SEThermalCircuitPath* m_coreToSkinPath;
+  std::vector<SEThermalCircuitPath*> m_coreToSkinPaths;
   SEFluidCircuitPath* m_skinExtravascularToSweatingGroundPath;
   //Circuits
   SEThermalCircuit* m_InternalTemperatureCircuit;

projects/biogears/libBiogears/include/biogears/engine/Systems/Environment.h

@@ -112,15 +112,15 @@ class BIOGEARS_API Environment : public SEEnvironment, public BioGearsSystem {
   SEThermalCircuitNode* m_ClothingNode;
   SEThermalCircuitNode* m_EnclosureNode;
   //Paths
-  SEThermalCircuitPath* m_SkinToClothing;
+  std::vector<SEThermalCircuitPath*> m_SkinToClothingPaths;
   SEThermalCircuitPath* m_ActiveHeatTransferRatePath;
   SEThermalCircuitPath* m_ActiveTemperaturePath;
   SEThermalCircuitPath* m_ActiveSwitchPath;
   SEThermalCircuitPath* m_ClothingToEnclosurePath;
   SEThermalCircuitPath* m_GroundToEnclosurePath;
   SEThermalCircuitPath* m_ClothingToEnvironmentPath;
   SEThermalCircuitPath* m_GroundToEnvironmentPath;
-  SEThermalCircuitPath* m_EnvironmentSkinToGroundPath;
+  std::vector<SEThermalCircuitPath*> m_EnvironmentSkinToGroundPaths;
   SEThermalCircuitPath* m_EnvironmentCoreToGroundPath;
 };
 }