Cleaning up code

Author: ntatum94

projects/biogears/libBiogears/include/biogears/cdm/patient/actions/SEBurnWound.h

@@ -78,7 +78,6 @@ class BIOGEARS_API SEBurnWound : public SEPatientAction {
   bool operator!=(const SEBurnWound& rhs) const;
 
   std::vector<double> GetTBSACompartmentDistribution() const;
-  double SEBurnWound::GetTimeSinceBurn(SEScalarTime currentTime) const;
 
   double getLeftArmSA() const;
   double getRightArmSA() const;

projects/biogears/libBiogears/src/cdm/patient/actions/SEBurnWound.cpp

@@ -207,7 +207,7 @@ bool SEBurnWound::HasCompartment() const
 bool SEBurnWound::HasCompartment(const std::string compartment) const
 {
   for (const std::string ca : m_compartmentsAffected) {
-    if (compartment == ca)
+    if (compartment == ca && m_DegreeOfBurn != CDM::enumBurnDegree::First)
       return true;
   }
   return false;
@@ -392,12 +392,6 @@ std::vector<double> SEBurnWound::GetTBSACompartmentDistribution() const
            m_compartments[4].GetValue() };
 }
 //-------------------------------------------------------------------------------
-double SEBurnWound::GetTimeSinceBurn(SEScalarTime currentTime) const
-{
-
-  return currentTime.GetValue() - m_burnInitiationTime;
-}
-//-------------------------------------------------------------------------------
 double SEBurnWound::getLeftArmSA() const { return m_compartments[0].GetValue(); }
 double SEBurnWound::getRightArmSA() const { return m_compartments[1].GetValue(); }
 double SEBurnWound::getTrunkSA() const { return m_compartments[2].GetValue(); }

projects/biogears/libBiogears/src/engine/Systems/Energy.cpp

@@ -738,7 +738,7 @@ void Energy::UpdateHeatResistance()
   }
   if (isAnySegmentBurned) {
     SEBurnWound* burnAction = m_data.GetActions().GetPatientActions().GetBurnWound();
-    double timeSinceBurn = burnAction->GetTimeSinceBurn(m_data.GetSimulationTime());
+    double timeSinceBurn = m_data.GetSimulationTime().GetValue()  - burnAction->GetTimeOfBurn();
     if (timeSinceBurn != 0.0) {
       double t = timeSinceBurn;
       double burnTemperature = (30.3 * std::exp(-1.0 * std::pow(t - 7.81, 2) / 11.7)) + GetSkinTemperature(TemperatureUnit::C);

share/xsd/cdm/PatientActions.xsd

@@ -171,7 +171,8 @@ specific language governing permissions and limitations under the License.
     <xs:complexContent>
       <xs:extension base="PatientActionData">
         <xs:sequence>
-          <xs:element name="BurnInitiationTime" type="xs:double" minOccurs="0" maxOccurs="1"/> <!--Automatically set on burn instantiation. Exists here for state loading/unloading-->
+          <xs:element name="BurnInitiationTime" type="xs:double" minOccurs="0" maxOccurs="1"> <!--Automatically set on burn instantiation. Exists here for state loading/unloading-->
+		  </xs:element>
 		  <xs:element name="DegreeOfBurn" type="enumBurnDegree" minOccurs="0" maxOccurs="1"/>
 		  <xs:element name="TotalBodySurfaceArea" type="Scalar0To1Data" minOccurs="1" maxOccurs="1"/>
           <xs:element name="Compartments" type="xs:string" minOccurs="0" maxOccurs="5"/>