Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding virtual keyword to all oM classes #301

Merged
merged 1 commit into from
Apr 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ETABS_oM/Elements/Diaphragm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class Diaphragm : BHoMObject
/**** Public Properties ****/
/***************************************************/

public DiaphragmType Rigidity { get; set; } = DiaphragmType.RigidDiaphragm;
public virtual DiaphragmType Rigidity { get; set; } = DiaphragmType.RigidDiaphragm;

/***************************************************/
}
Expand Down
8 changes: 7 additions & 1 deletion ETABS_oM/Elements/PierForce.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@ namespace BH.oM.Adapters.ETABS.Elements
{
public class PierForce : BH.oM.Structure.Results.BarForce
{
/***************************************************/
/**** Public Properties ****/
/***************************************************/

//Just using this for the name
public string Location { get; set; } = "";
public virtual string Location { get; set; } = "";

/***************************************************/
}
}

4 changes: 2 additions & 2 deletions ETABS_oM/Fragments/AutoLengthOffset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ public class AutoLengthOffset : IFragment
/**** Public Properties ****/
/***************************************************/

public bool AutoOffset { get; set; } = false;
public virtual bool AutoOffset { get; set; } = false;

[Description("Value descibing the factor of the rigid zone. Needs to be between 0 and 1")]
public double RigidZoneFactor { get; set; } = 1.0;
public virtual double RigidZoneFactor { get; set; } = 1.0;

/***************************************************/
}
Expand Down
4 changes: 2 additions & 2 deletions ETABS_oM/Fragments/EtabsLabel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public class EtabsLabel : IFragment
/***************************************************/

[Description("Label of the element in Etabs")]
public string Label { get; set; } = "";
public virtual string Label { get; set; } = "";

[Description("Name of the story of the element in Etabs")]
public string Story { get; set; } = "";
public virtual string Story { get; set; } = "";

/***************************************************/
}
Expand Down
4 changes: 2 additions & 2 deletions ETABS_oM/Fragments/InsertionPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ public class InsertionPoint : IFragment
/**** Public Properties ****/
/***************************************************/

public BarInsertionPoint BarInsertionPoint { get; set; } = BarInsertionPoint.Centroid;
public virtual BarInsertionPoint BarInsertionPoint { get; set; } = BarInsertionPoint.Centroid;

[Description("Transform frame stiffness for offsets from centroid for non-P/T floors")]
public bool ModifyStiffness { get; set; } = true;
public virtual bool ModifyStiffness { get; set; } = true;

/***************************************************/
}
Expand Down
8 changes: 3 additions & 5 deletions ETABS_oM/Loads/MassSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@ public class MassSource : BHoMObject
/**** Properties ****/
/***************************************************/

public bool ElementSelfMass { get; set; } = true;

public bool AdditionalMass { get; set; } = true;

public List<Tuple<Loadcase, double>> FactoredAdditionalCases { get; set; } = new List<Tuple<Loadcase, double>>();
public virtual bool ElementSelfMass { get; set; } = true;

public virtual bool AdditionalMass { get; set; } = true;

public virtual List<Tuple<Loadcase, double>> FactoredAdditionalCases { get; set; } = new List<Tuple<Loadcase, double>>();

/***************************************************/
}
Expand Down
16 changes: 11 additions & 5 deletions ETABS_oM/Loads/ModalCase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,20 @@ namespace BH.oM.Structure.Loads
{
public class ModalCase : BHoMObject, ICase
{
public int Number { get; set; } = 0;

public int NumberOfModes { get; set; } = 20;
/***************************************************/
/**** Properties ****/
/***************************************************/

public int StartMode { get; set; } = 1;
public virtual int Number { get; set; } = 0;

public MassSource Mass { get; set; } = new MassSource();

public virtual int NumberOfModes { get; set; } = 20;

public virtual int StartMode { get; set; } = 1;

public virtual MassSource Mass { get; set; } = new MassSource();

/***************************************************/
}
}

2 changes: 1 addition & 1 deletion ETABS_oM/Settings/DataBaseSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class DatabaseSettings : IObject
/***************************************************/

[Description("The ETABS defined section database to read sections from if the name of the sections you push share a name with one avalible in the database")]
public SectionDatabase SectionDatabase { get; set; } = SectionDatabase.None;
public virtual SectionDatabase SectionDatabase { get; set; } = SectionDatabase.None;

/***************************************************/
}
Expand Down
4 changes: 2 additions & 2 deletions ETABS_oM/Settings/EtabsSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public class EtabsSettings : IObject
/***************************************************/

[Description("Sets whether the loads being pushed should overwrite existing loads on the same object within the same loadcase")]
public bool ReplaceLoads { get; set; } = false;
public virtual bool ReplaceLoads { get; set; } = false;

[Description("")]
public DatabaseSettings DatabaseSettings { get; set; } = new DatabaseSettings();
public virtual DatabaseSettings DatabaseSettings { get; set; } = new DatabaseSettings();

/***************************************************/
}
Expand Down