diff --git a/ETABS_Engine/Compute/UpgradeVersion.cs b/ETABS_Engine/Compute/UpgradeVersion.cs index bdc0c1d2..47dc954f 100644 --- a/ETABS_Engine/Compute/UpgradeVersion.cs +++ b/ETABS_Engine/Compute/UpgradeVersion.cs @@ -27,7 +27,7 @@ using System.Threading.Tasks; using BH.oM.Architecture.Elements; using BH.oM.Geometry.SettingOut; -using BH.oM.Reflection.Attributes; +using BH.oM.Base.Attributes; namespace BH.Engine.Adapters.ETABS { @@ -38,7 +38,7 @@ public static partial class Compute /**** Public Methods ****/ /***************************************************/ - [Deprecated("3.1", "BH.oM.Architecture.Elements.Level replaced by BH.oM.Geometry.SettingOut.Level")] + [ToBeRemoved("3.1", "BH.oM.Architecture.Elements.Level replaced by BH.oM.Geometry.SettingOut.Level")] public static List UpgradeVersion(this List levels) { List upgradedLevels = new List(); @@ -51,7 +51,7 @@ public static partial class Compute /***************************************************/ - [Deprecated("3.1", "BH.oM.Architecture.Elements.Level replaced by BH.oM.Geometry.SettingOut.Level")] + [ToBeRemoved("3.1", "BH.oM.Architecture.Elements.Level replaced by BH.oM.Geometry.SettingOut.Level")] public static oM.Geometry.SettingOut.Level UpgradeVersion(this BH.oM.Architecture.Elements.Level level) { return new oM.Geometry.SettingOut.Level { diff --git a/ETABS_Engine/Create/Diaphragm.cs b/ETABS_Engine/Create/Diaphragm.cs index d32408bf..ae136a05 100644 --- a/ETABS_Engine/Create/Diaphragm.cs +++ b/ETABS_Engine/Create/Diaphragm.cs @@ -45,7 +45,7 @@ public static Diaphragm Diaphragm(/*List panels,*/ string name, Diaphragm //if (zvals.Where(x => Math.Abs(zvals.First() - x) > BH.oM.Geometry.Tolerance.Distance).Count() > 0) //{ - // BH.Engine.Reflection.Compute.RecordError("All panels need to be in the same plane"); + // BH.Engine.Base.Compute.RecordError("All panels need to be in the same plane"); // return null; //} diff --git a/ETABS_Engine/Create/MassSource.cs b/ETABS_Engine/Create/MassSource.cs index da316457..8e77b88e 100644 --- a/ETABS_Engine/Create/MassSource.cs +++ b/ETABS_Engine/Create/MassSource.cs @@ -44,13 +44,13 @@ public static MassSource MassSource(bool elementSelfWeight, bool additionalMass, { if (caseFactors == null) { - Engine.Reflection.Compute.RecordError("If cases are provided, please provide factors as well"); + Engine.Base.Compute.RecordError("If cases are provided, please provide factors as well"); return null; } if (loadCases.Count != caseFactors.Count) { - Engine.Reflection.Compute.RecordError("Please provide the same number of cases and case factors"); + Engine.Base.Compute.RecordError("Please provide the same number of cases and case factors"); return null; } @@ -61,7 +61,7 @@ public static MassSource MassSource(bool elementSelfWeight, bool additionalMass, } else if (caseFactors != null) { - Engine.Reflection.Compute.RecordError("If factors are provided, please provide cases as well"); + Engine.Base.Compute.RecordError("If factors are provided, please provide cases as well"); return null; } diff --git a/ETABS_Engine/ETABS_Engine.csproj b/ETABS_Engine/ETABS_Engine.csproj index 4b502d87..c6376b57 100644 --- a/ETABS_Engine/ETABS_Engine.csproj +++ b/ETABS_Engine/ETABS_Engine.csproj @@ -34,6 +34,7 @@ C:\ProgramData\BHoM\Assemblies\Adapter_Engine.dll False + False False @@ -43,22 +44,27 @@ C:\ProgramData\BHoM\Assemblies\Architecture_oM.dll False + False C:\ProgramData\BHoM\Assemblies\BHoM.dll False + False C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Data_oM.dll False + False C:\ProgramData\BHoM\Assemblies\Dimensional_oM.dll False + False False @@ -68,32 +74,27 @@ C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll False + False False C:\ProgramData\BHoM\Assemblies\Physical_oM.dll False - - False - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - False - - - C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll - False - C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Structure_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Structure_oM.dll False + False diff --git a/ETABS_Engine/Modify/SetAutoLengthOffset.cs b/ETABS_Engine/Modify/SetAutoLengthOffset.cs index 2573cc43..29b5091a 100644 --- a/ETABS_Engine/Modify/SetAutoLengthOffset.cs +++ b/ETABS_Engine/Modify/SetAutoLengthOffset.cs @@ -50,7 +50,7 @@ public static Bar SetAutoLengthOffset(this Bar bar, bool autoLengthOffset, doubl if (rigidZoneFactor < 0 || rigidZoneFactor > 1.0) { rigidZoneFactor = Math.Min(Math.Max(0, rigidZoneFactor), 1); - Engine.Reflection.Compute.RecordWarning("Rigid zone factor needs to be between 0 and 1. The value has been updated to fit in this interval"); + Engine.Base.Compute.RecordWarning("Rigid zone factor needs to be between 0 and 1. The value has been updated to fit in this interval"); } return (Bar)bar.AddFragment(new AutoLengthOffset { AutoOffset = autoLengthOffset, RigidZoneFactor = rigidZoneFactor }, true); diff --git a/ETABS_oM/ETABS_oM.csproj b/ETABS_oM/ETABS_oM.csproj index 9f7f34e9..1743d8b5 100644 --- a/ETABS_oM/ETABS_oM.csproj +++ b/ETABS_oM/ETABS_oM.csproj @@ -35,22 +35,22 @@ C:\ProgramData\BHoM\Assemblies\BHoM.dll False + False C:\ProgramData\BHoM\Assemblies\Data_oM.dll False + False C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll False - - - C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll - False + False C:\ProgramData\BHoM\Assemblies\Structure_oM.dll False + False diff --git a/ETABS_oM/Settings/DataBaseSettings.cs b/ETABS_oM/Settings/DataBaseSettings.cs index 5c24a86d..dbf7a813 100644 --- a/ETABS_oM/Settings/DataBaseSettings.cs +++ b/ETABS_oM/Settings/DataBaseSettings.cs @@ -26,7 +26,7 @@ using System.Text; using System.Threading.Tasks; using BH.oM.Base; -using BH.oM.Reflection.Attributes; +using BH.oM.Base.Attributes; using System.ComponentModel; namespace BH.oM.Adapters.ETABS diff --git a/ETABS_oM/Settings/EtabsSettings.cs b/ETABS_oM/Settings/EtabsSettings.cs index abdce6d0..4f1f2018 100644 --- a/ETABS_oM/Settings/EtabsSettings.cs +++ b/ETABS_oM/Settings/EtabsSettings.cs @@ -26,7 +26,7 @@ using System.Text; using System.Threading.Tasks; using BH.oM.Base; -using BH.oM.Reflection.Attributes; +using BH.oM.Base.Attributes; using System.ComponentModel; namespace BH.oM.Adapters.ETABS diff --git a/Etabs_Adapter/AdapterActions/Execute.cs b/Etabs_Adapter/AdapterActions/Execute.cs index e911ad61..8fdbd647 100644 --- a/Etabs_Adapter/AdapterActions/Execute.cs +++ b/Etabs_Adapter/AdapterActions/Execute.cs @@ -25,7 +25,7 @@ using BH.Engine.Adapter; using BH.oM.Adapters.ETABS; using BH.oM.Adapter; -using BH.oM.Reflection; +using BH.oM.Base; using BH.oM.Adapter.Commands; using BH.oM.Structure.Loads; @@ -98,7 +98,7 @@ public bool RunCommand(Open command) } else { - Engine.Reflection.Compute.RecordError("File does not exist"); + Engine.Base.Compute.RecordError("File does not exist"); return false; } } @@ -115,7 +115,7 @@ public bool RunCommand(Analyse command) public bool RunCommand(AnalyseLoadCases command) { if(command.LoadCases == null || command.LoadCases.Count() == 0) - Engine.Reflection.Compute.RecordNote("No cases provided, all cases will be run"); + Engine.Base.Compute.RecordNote("No cases provided, all cases will be run"); return Analyse(command.LoadCases); } @@ -135,7 +135,7 @@ public bool RunCommand(Exit command) { if (m_app.SapModel.GetModelFilepath() == "(Untitled)") { - Engine.Reflection.Compute.RecordError($"Application not exited. File does not have a name. Please manually save the file or use the {nameof(SaveAs)} command before trying to Exit the application. If you want to close the application anyway, please toggle {nameof(Exit.SaveBeforeClose)} to false."); + Engine.Base.Compute.RecordError($"Application not exited. File does not have a name. Please manually save the file or use the {nameof(SaveAs)} command before trying to Exit the application. If you want to close the application anyway, please toggle {nameof(Exit.SaveBeforeClose)} to false."); return false; } } @@ -150,7 +150,7 @@ public bool RunCommand(Exit command) public bool RunCommand(IExecuteCommand command) { - Engine.Reflection.Compute.RecordWarning($"The command {command.GetType().Name} is not supported by this Adapter."); + Engine.Base.Compute.RecordWarning($"The command {command.GetType().Name} is not supported by this Adapter."); return false; } @@ -165,7 +165,7 @@ private bool Analyse(IEnumerable cases = null) //Check if the model has been saved if (m_model.GetModelFilename(true) == "(Untitled)") { - Engine.Reflection.Compute.RecordWarning("ETABS requires the model to be saved before being analysed. Please save the model and try running again."); + Engine.Base.Compute.RecordWarning("ETABS requires the model to be saved before being analysed. Please save the model and try running again."); return false; } @@ -175,7 +175,7 @@ private bool Analyse(IEnumerable cases = null) if (!success) { - Engine.Reflection.Compute.RecordWarning("Failed to set up cases to run. Model has not been analysed"); + Engine.Base.Compute.RecordWarning("Failed to set up cases to run. Model has not been analysed"); return false; } } @@ -196,7 +196,7 @@ private bool Analyse(IEnumerable cases = null) name = (item as ICase).Name; else { - Engine.Reflection.Compute.RecordWarning("Can not set up cases for running of type " + item.GetType().Name + ". Item " + item.ToString() + " will be ignored. Please provide case names or BHoM cases to be run"); + Engine.Base.Compute.RecordWarning("Can not set up cases for running of type " + item.GetType().Name + ". Item " + item.ToString() + " will be ignored. Please provide case names or BHoM cases to be run"); continue; } @@ -205,7 +205,7 @@ private bool Analyse(IEnumerable cases = null) if (!caseSuccess) { - Engine.Reflection.Compute.RecordWarning("Failed to set case " + name + "for running. Please check that the case exists in the model"); + Engine.Base.Compute.RecordWarning("Failed to set case " + name + "for running. Please check that the case exists in the model"); } } diff --git a/Etabs_Adapter/CRUD/Create/Bar.cs b/Etabs_Adapter/CRUD/Create/Bar.cs index b4af4ffa..ad91b67c 100644 --- a/Etabs_Adapter/CRUD/Create/Bar.cs +++ b/Etabs_Adapter/CRUD/Create/Bar.cs @@ -73,7 +73,7 @@ private bool CreateObject(Bar bhBar) { FlipEndPoints(bhBar); //CloneBeforePush means this is fine FlipInsertionPoint(bhBar); //ETABS specific operation - Engine.Reflection.Compute.RecordNote("Some bars has been flipped to comply with ETABS API, asymmetric sections will suffer"); + Engine.Base.Compute.RecordNote("Some bars has been flipped to comply with ETABS API, asymmetric sections will suffer"); } #endif @@ -83,7 +83,7 @@ private bool CreateObject(Bar bhBar) if (string.IsNullOrEmpty(stNodeId) || string.IsNullOrEmpty(endNodeId)) { - Engine.Reflection.Compute.RecordError("Could not find the ids for at least one end node for at least one Bar. Bar not created."); + Engine.Base.Compute.RecordError("Could not find the ids for at least one end node for at least one Bar. Bar not created."); return false; } diff --git a/Etabs_Adapter/CRUD/Create/Error.cs b/Etabs_Adapter/CRUD/Create/Error.cs index bcff21ae..3b8ac9b7 100644 --- a/Etabs_Adapter/CRUD/Create/Error.cs +++ b/Etabs_Adapter/CRUD/Create/Error.cs @@ -47,19 +47,19 @@ public partial class ETABS2016Adapter : BHoMAdapter private bool CheckPropertyWarning(T obj, Func selector, bool couldNotBeCreated = false) { - return CheckPropertyEvent(obj, selector, couldNotBeCreated, oM.Reflection.Debugging.EventType.Warning); + return CheckPropertyEvent(obj, selector, couldNotBeCreated, oM.Base.Debugging.EventType.Warning); } /***************************************************/ private bool CheckPropertyError(T obj, Func selector, bool couldNotBeCreated = false) { - return CheckPropertyEvent(obj, selector, couldNotBeCreated, oM.Reflection.Debugging.EventType.Error); + return CheckPropertyEvent(obj, selector, couldNotBeCreated, oM.Base.Debugging.EventType.Error); } /***************************************************/ - private bool CheckPropertyEvent(T obj, Func selector, bool couldNotBeCreated = false, BH.oM.Reflection.Debugging.EventType errorLevel = oM.Reflection.Debugging.EventType.Error) + private bool CheckPropertyEvent(T obj, Func selector, bool couldNotBeCreated = false, BH.oM.Base.Debugging.EventType errorLevel = oM.Base.Debugging.EventType.Error) { if (obj == null || selector == null) return false; @@ -67,9 +67,9 @@ private bool CheckPropertyEvent(T obj, Func selector, bool couldNotB if (selector(obj) == null) { if(couldNotBeCreated) - Engine.Reflection.Compute.RecordEvent($"An object of type {obj.GetType().Name} could not be created due to a property of type {typeof(P).Name} being null. Please check your input data!", errorLevel); + Engine.Base.Compute.RecordEvent($"An object of type {obj.GetType().Name} could not be created due to a property of type {typeof(P).Name} being null. Please check your input data!", errorLevel); else - Engine.Reflection.Compute.RecordEvent($"A property of type {typeof(P).Name} on an object of type {obj.GetType().Name} is null and could not be set.", errorLevel); + Engine.Base.Compute.RecordEvent($"A property of type {typeof(P).Name} on an object of type {obj.GetType().Name} is null and could not be set.", errorLevel); return false; } @@ -80,35 +80,35 @@ private bool CheckPropertyEvent(T obj, Func selector, bool couldNotB private void CreateElementError(string elemType, string elemName) { - Engine.Reflection.Compute.RecordError("Failed to create the element of type " + elemType + ", with id: " + elemName); + Engine.Base.Compute.RecordError("Failed to create the element of type " + elemType + ", with id: " + elemName); } /***************************************************/ private void CreatePropertyError(string failedProperty, string elemType, string elemName) { - CreatePropertyEvent(failedProperty, elemType, elemName, oM.Reflection.Debugging.EventType.Error); + CreatePropertyEvent(failedProperty, elemType, elemName, oM.Base.Debugging.EventType.Error); } /***************************************************/ private void CreatePropertyWarning(string failedProperty, string elemType, string elemName) { - CreatePropertyEvent(failedProperty, elemType, elemName, oM.Reflection.Debugging.EventType.Warning); + CreatePropertyEvent(failedProperty, elemType, elemName, oM.Base.Debugging.EventType.Warning); } /***************************************************/ - private void CreatePropertyEvent(string failedProperty, string elemType, string elemName, oM.Reflection.Debugging.EventType eventType) + private void CreatePropertyEvent(string failedProperty, string elemType, string elemName, oM.Base.Debugging.EventType eventType) { - Engine.Reflection.Compute.RecordEvent("Failed to set property " + failedProperty + " for the " + elemType + "with id: " + elemName, eventType); + Engine.Base.Compute.RecordEvent("Failed to set property " + failedProperty + " for the " + elemType + "with id: " + elemName, eventType); } /***************************************************/ private static void RecordFlippingError(string sectionName) { - BH.Engine.Reflection.Compute.RecordWarning("Section with name " + sectionName + "has a flipping boolean. This is not currently supported in the ETABS_Toolkit. The section will be set to etabs unflipped"); + BH.Engine.Base.Compute.RecordWarning("Section with name " + sectionName + "has a flipping boolean. This is not currently supported in the ETABS_Toolkit. The section will be set to etabs unflipped"); } /***************************************************/ diff --git a/Etabs_Adapter/CRUD/Create/Level.cs b/Etabs_Adapter/CRUD/Create/Level.cs index 6295d9a2..008da734 100644 --- a/Etabs_Adapter/CRUD/Create/Level.cs +++ b/Etabs_Adapter/CRUD/Create/Level.cs @@ -54,25 +54,25 @@ private bool CreateCollection(IEnumerable levels) return true; if (count == 1) { - Engine.Reflection.Compute.RecordError("Need to provide at least two levels to be able to push levels to ETABS through the API."); + Engine.Base.Compute.RecordError("Need to provide at least two levels to be able to push levels to ETABS through the API."); return false; } //Check for any duplicate level elevations if (levels.GroupBy(x => x.Elevation).Any(g => g.Count() > 1)) { - Engine.Reflection.Compute.RecordError("Duplicate level elevations provided. All provided levels need to have a unique elevation, please check the inputs."); + Engine.Base.Compute.RecordError("Duplicate level elevations provided. All provided levels need to have a unique elevation, please check the inputs."); return false; } List levelList = levels.OrderBy(x => x.Elevation).ToList(); if (levelList.Any(x => string.IsNullOrWhiteSpace(x.Name))) - Engine.Reflection.Compute.RecordWarning("Unnamed levels have been given name according to their height index: Level 'i'"); + Engine.Base.Compute.RecordWarning("Unnamed levels have been given name according to their height index: Level 'i'"); //remove the first name, as first level will be the base level string[] names = levelList.Select((x, i) => string.IsNullOrWhiteSpace(x.Name) ? "Level " + i.ToString() : x.Name).Skip(1).ToArray(); - Engine.Reflection.Compute.RecordNote("First level will be the base level and will not be given the provided name"); + Engine.Base.Compute.RecordNote("First level will be the base level and will not be given the provided name"); double[] heights = new double[count]; //Heights empty, set by elevations double[] elevations; @@ -103,7 +103,7 @@ private bool CreateCollection(IEnumerable levels) if (m_model.Story.SetStories(names, elevations, heights, isMasterStory, similarTo, spliceAbove, spliceHeight) == 0) { } else { - Engine.Reflection.Compute.RecordError("Failed to push levels. Levels can only be pushed to an empty model."); + Engine.Base.Compute.RecordError("Failed to push levels. Levels can only be pushed to an empty model."); return false; } diff --git a/Etabs_Adapter/CRUD/Create/Load.cs b/Etabs_Adapter/CRUD/Create/Load.cs index 22f5fd5e..61e8047e 100644 --- a/Etabs_Adapter/CRUD/Create/Load.cs +++ b/Etabs_Adapter/CRUD/Create/Load.cs @@ -64,7 +64,7 @@ private bool CreateObject(ILoad bhLoad) public void SetLoad(PointLoad pointLoad, bool replace) { if (pointLoad.Axis != LoadAxis.Global) - Engine.Reflection.Compute.RecordWarning("The local coordinate system of BHoM nodes are not pushed to ETABS, Local Axis PointLoads are set on the Global Axis"); + Engine.Base.Compute.RecordWarning("The local coordinate system of BHoM nodes are not pushed to ETABS, Local Axis PointLoads are set on the Global Axis"); double[] pfValues = new double[] { pointLoad.Force.X, pointLoad.Force.Y, pointLoad.Force.Z, pointLoad.Moment.X, pointLoad.Moment.Y, pointLoad.Moment.Z }; int ret = 0; @@ -191,7 +191,7 @@ public void SetLoad(BarVaryingDistributedLoad barLoad, bool replace) if (!(val1 == 0 && val2 == 0)) { if (val1 * val2 < 0) - Engine.Reflection.Compute.RecordWarning("BarVaryingLoad can not be in opposite directions for the two end values"); + Engine.Base.Compute.RecordWarning("BarVaryingLoad can not be in opposite directions for the two end values"); else { ret = m_model.FrameObj.SetLoadDistributed(GetAdapterId(bar), caseName, 1, direction + shift, dist1, dist2, val1, val2, axis, barLoad.RelativePositions, stepReplace); @@ -316,14 +316,14 @@ public void SetLoad(GravityLoad gravityLoad, bool replace) m_model.LoadPatterns.GetSelfWTMultiplier(caseName, ref selfWeightMultiplier); if (selfWeightMultiplier != 0) - BH.Engine.Reflection.Compute.RecordWarning($"Loadcase {gravityLoad.Loadcase.Name} allready had a selfweight multiplier which will get overridden. Previous value: {selfWeightMultiplier}, new value: {-gravityLoad.GravityDirection.Z}"); + BH.Engine.Base.Compute.RecordWarning($"Loadcase {gravityLoad.Loadcase.Name} allready had a selfweight multiplier which will get overridden. Previous value: {selfWeightMultiplier}, new value: {-gravityLoad.GravityDirection.Z}"); m_model.LoadPatterns.SetSelfWTMultiplier(caseName, -gravityLoad.GravityDirection.Z); if (gravityLoad.GravityDirection.X != 0 || gravityLoad.GravityDirection.Y != 0) - Engine.Reflection.Compute.RecordError("ETABS can only handle gravity loads in global z direction"); + Engine.Base.Compute.RecordError("ETABS can only handle gravity loads in global z direction"); - BH.Engine.Reflection.Compute.RecordWarning("ETABS handles gravity loads via loadcases, why only one gravity load per loadcase can be used. THis gravity load will be applied to all objects"); + BH.Engine.Base.Compute.RecordWarning("ETABS handles gravity loads via loadcases, why only one gravity load per loadcase can be used. THis gravity load will be applied to all objects"); } @@ -333,7 +333,7 @@ public void SetLoad(GravityLoad gravityLoad, bool replace) private void SetLoad(ILoad load, bool replace) { - Engine.Reflection.Compute.RecordError("Load of type " + load.GetType().Name + " is not supported."); + Engine.Base.Compute.RecordError("Load of type " + load.GetType().Name + " is not supported."); } /***************************************************/ diff --git a/Etabs_Adapter/CRUD/Create/Material.cs b/Etabs_Adapter/CRUD/Create/Material.cs index ad943d85..bd27507e 100644 --- a/Etabs_Adapter/CRUD/Create/Material.cs +++ b/Etabs_Adapter/CRUD/Create/Material.cs @@ -68,7 +68,7 @@ private bool CreateObject(IMaterialFragment material) success &= SetObject(material); } if (!success) - Engine.Reflection.Compute.RecordWarning($"Failed to assign material: {material.DescriptionOrName()}, ETABS may have overwritten some properties with default values"); + Engine.Base.Compute.RecordWarning($"Failed to assign material: {material.DescriptionOrName()}, ETABS may have overwritten some properties with default values"); return success; } @@ -123,20 +123,20 @@ private eMatType MaterialTypeToCSI(MaterialType materialType) case MaterialType.Concrete: return eMatType.Concrete; case MaterialType.Timber: - Engine.Reflection.Compute.RecordWarning("ETABS does not contain a definition for Timber materials, the material has been set to type 'Other' with 'Orthotropic' directional symmetry"); + Engine.Base.Compute.RecordWarning("ETABS does not contain a definition for Timber materials, the material has been set to type 'Other' with 'Orthotropic' directional symmetry"); return eMatType.NoDesign; case MaterialType.Rebar: return eMatType.Rebar; case MaterialType.Tendon: return eMatType.Tendon; case MaterialType.Glass: - Engine.Reflection.Compute.RecordWarning("ETABS does not contain a definition for Glass materials, the material has been set to type 'Other'"); + Engine.Base.Compute.RecordWarning("ETABS does not contain a definition for Glass materials, the material has been set to type 'Other'"); return eMatType.NoDesign; case MaterialType.Cable: - Engine.Reflection.Compute.RecordWarning("ETABS does not contain a definition for Cable materials, the material has been set to type 'Steel'"); + Engine.Base.Compute.RecordWarning("ETABS does not contain a definition for Cable materials, the material has been set to type 'Steel'"); return eMatType.Steel; default: - Engine.Reflection.Compute.RecordWarning("BHoM material type not found, the material has been set to type 'Other'"); + Engine.Base.Compute.RecordWarning("BHoM material type not found, the material has been set to type 'Other'"); return eMatType.NoDesign; } } diff --git a/Etabs_Adapter/CRUD/Create/Node.cs b/Etabs_Adapter/CRUD/Create/Node.cs index b08b759a..d6637f5b 100644 --- a/Etabs_Adapter/CRUD/Create/Node.cs +++ b/Etabs_Adapter/CRUD/Create/Node.cs @@ -99,7 +99,7 @@ private bool SetObject(Node bhNode, string name) if (bhNode.Orientation != null && !bhNode.Orientation.IsEqual(Basis.XY)) { - Engine.Reflection.Compute.RecordWarning("ETABS does not support local coordinate systems other than the global one. Any nodes pushed will have been so as if they had the global coordinatesystem."); + Engine.Base.Compute.RecordWarning("ETABS does not support local coordinate systems other than the global one. Any nodes pushed will have been so as if they had the global coordinatesystem."); } return true; diff --git a/Etabs_Adapter/CRUD/Create/Panel.cs b/Etabs_Adapter/CRUD/Create/Panel.cs index 85b72056..2253b7f4 100644 --- a/Etabs_Adapter/CRUD/Create/Panel.cs +++ b/Etabs_Adapter/CRUD/Create/Panel.cs @@ -201,7 +201,7 @@ private static void NonLinearEdgesCheck(List edges) isNonLinear = true; } if (isNonLinear) - Engine.Reflection.Compute.RecordWarning("Non-linear edges will be pushed using the control points of the underlying curves. It is recomended that you subsegment all edge curves into linear segements before you push to ETABS. Try using the CollapseToPolyline method. Please check the result of the push in the ETABS model!"); + Engine.Base.Compute.RecordWarning("Non-linear edges will be pushed using the control points of the underlying curves. It is recomended that you subsegment all edge curves into linear segements before you push to ETABS. Try using the CollapseToPolyline method. Please check the result of the push in the ETABS model!"); } diff --git a/Etabs_Adapter/CRUD/Create/SectionProperty.cs b/Etabs_Adapter/CRUD/Create/SectionProperty.cs index cd4e96d7..5e32c9a2 100644 --- a/Etabs_Adapter/CRUD/Create/SectionProperty.cs +++ b/Etabs_Adapter/CRUD/Create/SectionProperty.cs @@ -101,7 +101,7 @@ private void SetSection(IGeometricalSection section) } else { - Engine.Reflection.Compute.RecordWarning($"Section of type {section.GetType().Name} with name {section.DescriptionOrName()} has a null SectionProfile. Section will be pushed as an explicit section"); + Engine.Base.Compute.RecordWarning($"Section of type {section.GetType().Name} with name {section.DescriptionOrName()} has a null SectionProfile. Section will be pushed as an explicit section"); SetGeneral(section); } } @@ -117,7 +117,7 @@ private void SetSection(ExplicitSection section) private void SetSection(ISectionProperty section) { - Engine.Reflection.Compute.RecordError($"Sections of type {section.GetType().Name} are not explicitly supported by ETABS. Section with name {section.DescriptionOrName()} is pushed as an explicit section."); + Engine.Base.Compute.RecordError($"Sections of type {section.GetType().Name} are not explicitly supported by ETABS. Section with name {section.DescriptionOrName()} is pushed as an explicit section."); SetGeneral(section); } @@ -175,7 +175,7 @@ private bool SetProfile(TaperedProfile profile, string sectionName, IMaterialFra int[] type = length.Select(x => 1).ToArray(); // Relative Length values, (No idea what happens or why someone would mix thease) int[] eI33 = length.Select(x => 1).ToArray(); // Linear variation of EI33 int[] eI22 = length.Select(x => 1).ToArray(); // Linear variation of EI22 - Engine.Reflection.Compute.RecordNote("Tapered Sections Properties are set to vary linearly along the element in ETABS."); + Engine.Base.Compute.RecordNote("Tapered Sections Properties are set to vary linearly along the element in ETABS."); return m_model.PropFrame.SetNonPrismatic(sectionName, num, ref segmentStartProfile, ref segmentEndProfile, ref length, ref type, ref eI33, ref eI22) == 0; } @@ -199,7 +199,7 @@ private bool SetProfile(BoxProfile profile, string sectionName, IMaterialFragmen private bool SetProfile(FabricatedBoxProfile profile, string sectionName, IMaterialFragment material) { if (profile.TopFlangeThickness != profile.BotFlangeThickness) - Engine.Reflection.Compute.RecordWarning($"Different thickness of top and bottom flange is not supported in ETABS. Section named {sectionName} pushed to ETABS is using the top thickness for both flanges."); + Engine.Base.Compute.RecordWarning($"Different thickness of top and bottom flange is not supported in ETABS. Section named {sectionName} pushed to ETABS is using the top thickness for both flanges."); return m_model.PropFrame.SetTube(sectionName, material?.DescriptionOrName() ?? "", profile.Height, profile.Width, profile.TopFlangeThickness, profile.WebThickness) == 0; } @@ -283,7 +283,7 @@ private bool SetProfile(CircleProfile profile, string sectionName, IMaterialFrag private bool SetProfile(IProfile profile, string sectionName, IMaterialFragment material) { - Engine.Reflection.Compute.RecordWarning($"Profiles of type {profile.GetType().Name} is not supported by the ETABSAdapter. Section will be pushed as an Explicit section."); + Engine.Base.Compute.RecordWarning($"Profiles of type {profile.GetType().Name} is not supported by the ETABSAdapter. Section will be pushed as an Explicit section."); return false; } @@ -338,7 +338,7 @@ private bool LoadFromDatabase(ISectionProperty bhSection) } // Notify user and return true to stop the adapter from creating a new Section - Engine.Reflection.Compute.RecordNote(bhSection.DescriptionOrName() + " properties has been assigned from the database section " + bhName + "."); + Engine.Base.Compute.RecordNote(bhSection.DescriptionOrName() + " properties has been assigned from the database section " + bhName + "."); return true; } diff --git a/Etabs_Adapter/CRUD/Create/_Create.cs b/Etabs_Adapter/CRUD/Create/_Create.cs index 5e53b028..4663c087 100644 --- a/Etabs_Adapter/CRUD/Create/_Create.cs +++ b/Etabs_Adapter/CRUD/Create/_Create.cs @@ -118,7 +118,7 @@ private bool CreateCollection(IEnumerable objects) where T : BH.oM.Base.IO private bool CreateObject(IBHoMObject obj) { - Engine.Reflection.Compute.RecordWarning($"Objects of type {obj.GetType()} are not supported by the ETABSAdapter."); + Engine.Base.Compute.RecordWarning($"Objects of type {obj.GetType()} are not supported by the ETABSAdapter."); return false; } diff --git a/Etabs_Adapter/CRUD/Delete/_Delete.cs b/Etabs_Adapter/CRUD/Delete/_Delete.cs index eae378fe..3a06fcfd 100644 --- a/Etabs_Adapter/CRUD/Delete/_Delete.cs +++ b/Etabs_Adapter/CRUD/Delete/_Delete.cs @@ -86,7 +86,7 @@ protected override int IDelete(Type type, IEnumerable ids, ActionConfig foreach (string id in listIds) count -= m_model.LoadCases.Delete(id); else if (type == typeof(ILoad) || type.GetInterfaces().Contains(typeof(ILoad))) - Engine.Reflection.Compute.RecordError("Loads do not have ids in ETABS, try deleting Loadcases, LoadCombinations or overwriting the old loads with `ReplaceLoads`."); + Engine.Base.Compute.RecordError("Loads do not have ids in ETABS, try deleting Loadcases, LoadCombinations or overwriting the old loads with `ReplaceLoads`."); else if (type == typeof(RigidLink)) foreach (string id in listIds) count -= m_model.LinkObj.Delete(id); @@ -94,16 +94,16 @@ protected override int IDelete(Type type, IEnumerable ids, ActionConfig foreach (string id in listIds) count -= m_model.PropLink.Delete(id); else if (type == typeof(oM.Geometry.SettingOut.Level) || type == typeof(oM.Architecture.Elements.Level)) - Engine.Reflection.Compute.RecordError("Can't delete levels in ETABS."); + Engine.Base.Compute.RecordError("Can't delete levels in ETABS."); else if (type == typeof(oM.Geometry.SettingOut.Grid)) - Engine.Reflection.Compute.RecordError("Can't delete grids in ETABS."); + Engine.Base.Compute.RecordError("Can't delete grids in ETABS."); else if (type == typeof(FEMesh)) foreach (string id in listIds) count -= m_model.AreaObj.Delete(id); if (count != controlCount) { - Engine.Reflection.Compute.RecordWarning("Some of the requested delete operations failed."); + Engine.Base.Compute.RecordWarning("Some of the requested delete operations failed."); } return count; diff --git a/Etabs_Adapter/CRUD/Read/Bar.cs b/Etabs_Adapter/CRUD/Read/Bar.cs index cc944871..081debfa 100644 --- a/Etabs_Adapter/CRUD/Read/Bar.cs +++ b/Etabs_Adapter/CRUD/Read/Bar.cs @@ -119,7 +119,7 @@ private List ReadBar(List ids = null) if (!advanced) bhBar.OrientationAngle = angle * Math.PI / 180; else - BH.Engine.Reflection.Compute.RecordWarning("advanced local axis for bars are not supported"); + BH.Engine.Base.Compute.RecordWarning("advanced local axis for bars are not supported"); //Label and story string label = ""; @@ -140,7 +140,7 @@ private List ReadBar(List ids = null) } catch { - BH.Engine.Reflection.Compute.RecordError("Bar " + id.ToString() + " could not be pulled"); + BH.Engine.Base.Compute.RecordError("Bar " + id.ToString() + " could not be pulled"); } } return barList; diff --git a/Etabs_Adapter/CRUD/Read/Grid.cs b/Etabs_Adapter/CRUD/Read/Grid.cs index bb914c27..ff759502 100644 --- a/Etabs_Adapter/CRUD/Read/Grid.cs +++ b/Etabs_Adapter/CRUD/Read/Grid.cs @@ -75,7 +75,7 @@ private List ReadGrid(List ids = null) gridList.AddRange(CylindricalGrids(id, ids)); break; default: - Engine.Reflection.Compute.RecordWarning("Can not pull " + gridSysType + " Grid systems from ETABS, offender: " + id); + Engine.Base.Compute.RecordWarning("Can not pull " + gridSysType + " Grid systems from ETABS, offender: " + id); break; } } diff --git a/Etabs_Adapter/CRUD/Read/Link.cs b/Etabs_Adapter/CRUD/Read/Link.cs index eb009963..f49a311b 100644 --- a/Etabs_Adapter/CRUD/Read/Link.cs +++ b/Etabs_Adapter/CRUD/Read/Link.cs @@ -162,7 +162,7 @@ private List ReadLinkConstraints(List ids = null) if (constr != null) propList.Add(constr); else - Engine.Reflection.Compute.RecordError("Failed to read link constraint with id :" + id); + Engine.Base.Compute.RecordError("Failed to read link constraint with id :" + id); } return propList; @@ -187,7 +187,7 @@ private LinkConstraint LinkConstraint(string name, eLinkPropType linkType) case eLinkPropType.MultilinearPlastic: case eLinkPropType.Isolator3: default: - Engine.Reflection.Compute.RecordError("Reading of LinkConstraint of type " + linkType + " not implemented"); + Engine.Base.Compute.RecordError("Reading of LinkConstraint of type " + linkType + " not implemented"); return null; } @@ -223,10 +223,10 @@ private LinkConstraint GetLinearLinkConstraint(string name) constraint.ZZtoZZ = fix[5]; if (stiff != null && stiff.Any(x => x != 0)) - Engine.Reflection.Compute.RecordWarning("No stiffness read for link constraints"); + Engine.Base.Compute.RecordWarning("No stiffness read for link constraints"); if (damp != null && damp.Any(x => x != 0)) - Engine.Reflection.Compute.RecordWarning("No damping read for link contraint"); + Engine.Base.Compute.RecordWarning("No damping read for link contraint"); return constraint; diff --git a/Etabs_Adapter/CRUD/Read/Load.cs b/Etabs_Adapter/CRUD/Read/Load.cs index 968d62e9..a50e184f 100644 --- a/Etabs_Adapter/CRUD/Read/Load.cs +++ b/Etabs_Adapter/CRUD/Read/Load.cs @@ -65,7 +65,7 @@ private List ReadLoad(Type type, List ids = null) if (ids != null) { - Engine.Reflection.Compute.RecordWarning("Id filtering is not implemented for Loads, all Loads will be returned."); + Engine.Base.Compute.RecordWarning("Id filtering is not implemented for Loads, all Loads will be returned."); } List loads = new List(); @@ -115,11 +115,11 @@ private List ReadLoad(Type type, List ids = null) if (!typeCouldBeRead) { - Engine.Reflection.Compute.RecordError("The load type " + type.Name + " is not implemented for ETABS and could not be read."); + Engine.Base.Compute.RecordError("The load type " + type.Name + " is not implemented for ETABS and could not be read."); } else if (loads.Count == 0) { - Engine.Reflection.Compute.RecordWarning("No loads found in ETABS of the requested type."); + Engine.Base.Compute.RecordWarning("No loads found in ETABS of the requested type."); } return loads; @@ -152,7 +152,7 @@ private List ReadPointLoad(List loadcases) for (int i = 0; i < nameCount; i++) { if (CSys[i] != "Global") - Engine.Reflection.Compute.RecordWarning($"The coordinate system: {CSys[i]} was not read. The PointLoads defined in the coordinate system: {CSys[i]} were set as Global"); + Engine.Base.Compute.RecordWarning($"The coordinate system: {CSys[i]} was not read. The PointLoads defined in the coordinate system: {CSys[i]} were set as Global"); Loadcase bhLoadcase = loadcases.FirstOrDefault(x => x.Name == loadcase[i]); @@ -226,7 +226,7 @@ private List ReadBarLoad(List loadcases) bhLoad.Moment = force; break; default: - BH.Engine.Reflection.Compute.RecordWarning("Could not create the load. It's not 'MyType'. MyType = " + myType[i].ToString()); + BH.Engine.Base.Compute.RecordWarning("Could not create the load. It's not 'MyType'. MyType = " + myType[i].ToString()); break; } @@ -298,7 +298,7 @@ private List ReadBarVaryingLoad(List loadcases) bhLoad.MomentAtEnd = forceB; break; default: - BH.Engine.Reflection.Compute.RecordWarning("Could not create the load. It's not 'MyType'. MyType = " + myType[i].ToString()); + BH.Engine.Base.Compute.RecordWarning("Could not create the load. It's not 'MyType'. MyType = " + myType[i].ToString()); break; } @@ -480,7 +480,7 @@ private List ReadBarPointLoad(List loadcases) bhBarPointLoad.Moment = force; break; default: - BH.Engine.Reflection.Compute.RecordWarning("Could not create the load. It's not 'MyType'. MyType = " + myType[i].ToString()); + BH.Engine.Base.Compute.RecordWarning("Could not create the load. It's not 'MyType'. MyType = " + myType[i].ToString()); continue; } @@ -499,7 +499,7 @@ private List ReadBarPointLoad(List loadcases) private void SetDirection(ILoad load, int dir, string cSys) { if (cSys != "Global" && cSys != "Local") - Engine.Reflection.Compute.RecordWarning($"Custom coordinatesystem {cSys} for loads have been set as Global"); + Engine.Base.Compute.RecordWarning($"Custom coordinatesystem {cSys} for loads have been set as Global"); int type = (int)Math.Floor((double)((dir - 1) / 3)); switch (type) diff --git a/Etabs_Adapter/CRUD/Read/Material.cs b/Etabs_Adapter/CRUD/Read/Material.cs index 57ba0f24..f1d9f7a8 100644 --- a/Etabs_Adapter/CRUD/Read/Material.cs +++ b/Etabs_Adapter/CRUD/Read/Material.cs @@ -85,7 +85,7 @@ private List ReadMaterial(List ids = null) if (m_model.PropMaterial.GetMPOrthotropic(id, ref eArr, ref vArr, ref aArr, ref gArr) != 0) { string msg = string.Format("Could not extract structural properties for material {0}, this has been replaced with a GenericIsotropicMaterial with no properties.", id); - Engine.Reflection.Compute.RecordWarning(msg); + Engine.Base.Compute.RecordWarning(msg); m = new GenericIsotropicMaterial() { Name = id + "_replacment" }; } else @@ -160,7 +160,7 @@ private List ReadMaterial(List ids = null) else { string msg = string.Format("Could not extract structural properties for material {0}, this has been replaced with a GenericIsotropicMaterial with no properties.", id); - Engine.Reflection.Compute.RecordWarning(msg); + Engine.Base.Compute.RecordWarning(msg); m = new GenericIsotropicMaterial() { Name = id + "_replacment" }; } } diff --git a/Etabs_Adapter/CRUD/Read/Mesh.cs b/Etabs_Adapter/CRUD/Read/Mesh.cs index d5a6dd48..219be81d 100644 --- a/Etabs_Adapter/CRUD/Read/Mesh.cs +++ b/Etabs_Adapter/CRUD/Read/Mesh.cs @@ -159,7 +159,7 @@ private List ReadMesh(List ids = null) } else { - BH.Engine.Reflection.Compute.RecordWarning("Mesh " + id.ToString() + " could not be pulled, because it contains no nodes"); + BH.Engine.Base.Compute.RecordWarning("Mesh " + id.ToString() + " could not be pulled, because it contains no nodes"); } } diff --git a/Etabs_Adapter/CRUD/Read/Results/BarResults.cs b/Etabs_Adapter/CRUD/Read/Results/BarResults.cs index 3191fed7..c37e87f1 100644 --- a/Etabs_Adapter/CRUD/Read/Results/BarResults.cs +++ b/Etabs_Adapter/CRUD/Read/Results/BarResults.cs @@ -69,12 +69,12 @@ public IEnumerable ReadResults(BarResultRequest request, ActionConfig a case BarResultType.BarDisplacement: return ReadBarDisplacements(barIds, request.Divisions); case BarResultType.BarDeformation: - Engine.Reflection.Compute.RecordError("Etabs cannot export localised BarDeformations. To get the full displacement of the bars in global coordinates, try pulling BarDisplacements"); + Engine.Base.Compute.RecordError("Etabs cannot export localised BarDeformations. To get the full displacement of the bars in global coordinates, try pulling BarDisplacements"); return new List(); case BarResultType.BarStress: case BarResultType.BarStrain: default: - Engine.Reflection.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); + Engine.Base.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); return new List(); } } @@ -146,7 +146,7 @@ private List ReadBarDisplacements(List barIds, int divi { List displacements = new List(); - Engine.Reflection.Compute.RecordWarning("Displacements will only be extracted at ETABS calculation nodes. 'Divisions' parameter will not be considered in result extraction"); + Engine.Base.Compute.RecordWarning("Displacements will only be extracted at ETABS calculation nodes. 'Divisions' parameter will not be considered in result extraction"); int resultCount = 0; string[] obj = null; diff --git a/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs b/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs index a748c869..71f072ff 100644 --- a/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs +++ b/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs @@ -64,7 +64,7 @@ public IEnumerable ReadResults(GlobalResultRequest request, ActionConfi return GetGlobalReactions(); case GlobalResultType.ModalDynamics: default: - Engine.Reflection.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); + Engine.Base.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); return new List(); } } @@ -120,7 +120,7 @@ private List GetModalParticipationMassRatios() int res = m_model.Results.ModalParticipationFactors(ref resultCount, ref loadcaseNames, ref stepType, ref stepNum, ref period, ref ux, ref uy, ref uz, ref rx, ref ry, ref rz, ref modalMass, ref modalStiff); - if (res != 0) Engine.Reflection.Compute.RecordError("Could not extract Modal information."); + if (res != 0) Engine.Base.Compute.RecordError("Could not extract Modal information."); // Although API documentation says that StepNumber should correspond to the Mode Number, testing shows that StepNumber is always 0. string previousModalCase = ""; diff --git a/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs b/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs index b4cabab0..592265c5 100644 --- a/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs +++ b/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs @@ -74,7 +74,7 @@ public IEnumerable ReadResults(MeshResultRequest request, ActionConfig return ReadMeshStress(panelIds, cases, request.Smoothing, request.Layer); case MeshResultType.VonMises: default: - Engine.Reflection.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); + Engine.Base.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); return new List(); } @@ -93,7 +93,7 @@ private List ReadMeshForce(List panelIds, MeshResultSmoothin case MeshResultSmoothingType.BySelection: case MeshResultSmoothingType.Global: case MeshResultSmoothingType.ByFiniteElementCentres: - Engine.Reflection.Compute.RecordWarning("Smoothing type not supported for MeshForce. No results extracted"); + Engine.Base.Compute.RecordWarning("Smoothing type not supported for MeshForce. No results extracted"); return new List(); } @@ -126,7 +126,7 @@ private List ReadMeshForce(List panelIds, MeshResultSmoothin List results = new List(); if (smoothing == MeshResultSmoothingType.ByPanel) - Engine.Reflection.Compute.RecordWarning("Force values have been smoothed outside the API by averaging all force values in each node"); + Engine.Base.Compute.RecordWarning("Force values have been smoothed outside the API by averaging all force values in each node"); for (int i = 0; i < panelIds.Count; i++) { @@ -175,17 +175,17 @@ private List ReadMeshStress(List panelIds, List case case MeshResultSmoothingType.BySelection: case MeshResultSmoothingType.Global: case MeshResultSmoothingType.ByFiniteElementCentres: - Engine.Reflection.Compute.RecordWarning("Smoothing type not supported for MeshStress. No results extracted"); + Engine.Base.Compute.RecordWarning("Smoothing type not supported for MeshStress. No results extracted"); return new List(); } if (layer == MeshResultLayer.Upper || layer == MeshResultLayer.Lower) { - Engine.Reflection.Compute.RecordWarning("Results for both bot and top layers will be extracted at the same time"); + Engine.Base.Compute.RecordWarning("Results for both bot and top layers will be extracted at the same time"); } else { - Engine.Reflection.Compute.RecordWarning("Stress extraction is currently only possible at bot and top layers. Please update the MeshResultLayer parameter"); + Engine.Base.Compute.RecordWarning("Stress extraction is currently only possible at bot and top layers. Please update the MeshResultLayer parameter"); return new List(); } @@ -220,7 +220,7 @@ private List ReadMeshStress(List panelIds, List case if (smoothing == MeshResultSmoothingType.ByPanel) - Engine.Reflection.Compute.RecordWarning("Stress values have been smoothed outside the API by averaging all force values in each node"); + Engine.Base.Compute.RecordWarning("Stress values have been smoothed outside the API by averaging all force values in each node"); foreach (string caseName in cases) { @@ -263,7 +263,7 @@ private List ReadMeshStress(List panelIds, List case } else { - Engine.Reflection.Compute.RecordWarning("Failed to extract results for element " + panelIds[i] + " for case " + caseName); + Engine.Base.Compute.RecordWarning("Failed to extract results for element " + panelIds[i] + " for case " + caseName); } } } @@ -282,7 +282,7 @@ private List ReadMeshStressLayered(List panelIds, MeshResult case MeshResultSmoothingType.BySelection: case MeshResultSmoothingType.Global: case MeshResultSmoothingType.ByFiniteElementCentres: - Engine.Reflection.Compute.RecordWarning("Smoothing type not supported for MeshStress. No results extracted"); + Engine.Base.Compute.RecordWarning("Smoothing type not supported for MeshStress. No results extracted"); return new List(); } @@ -316,7 +316,7 @@ private List ReadMeshStressLayered(List panelIds, MeshResult if (smoothing == MeshResultSmoothingType.ByPanel) - Engine.Reflection.Compute.RecordWarning("Stress values have been smoothened outside the API by averaging all force values in each node"); + Engine.Base.Compute.RecordWarning("Stress values have been smoothened outside the API by averaging all force values in each node"); foreach (string caseName in cases) @@ -354,7 +354,7 @@ private List ReadMeshStressLayered(List panelIds, MeshResult } else { - Engine.Reflection.Compute.RecordWarning("Failed to extract results for element " + panelIds[i] + " for case " + caseName); + Engine.Base.Compute.RecordWarning("Failed to extract results for element " + panelIds[i] + " for case " + caseName); } } diff --git a/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs b/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs index ab1b082f..9e79941f 100644 --- a/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs +++ b/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs @@ -69,7 +69,7 @@ public IEnumerable ReadResults(NodeResultRequest request, ActionConfig case NodeResultType.NodeVelocity: case NodeResultType.NodeAcceleration: default: - Engine.Reflection.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); + Engine.Base.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); return new List(); } } diff --git a/Etabs_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs b/Etabs_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs index 1e360357..3eda9d7a 100644 --- a/Etabs_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs +++ b/Etabs_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs @@ -65,7 +65,7 @@ public IEnumerable ReadResults(PierAndSpandrelForceRequest request, Act case PierAndSpandrelResultType.PierForce: return GetPierForce(request.ObjectIds); default: - Engine.Reflection.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); + Engine.Base.Compute.RecordError("Result extraction of type " + request.ResultType + " is not yet supported"); return new List(); } } diff --git a/Etabs_Adapter/CRUD/Read/Results/Result.cs b/Etabs_Adapter/CRUD/Read/Results/Result.cs index ad98d2d4..8ea57c51 100644 --- a/Etabs_Adapter/CRUD/Read/Results/Result.cs +++ b/Etabs_Adapter/CRUD/Read/Results/Result.cs @@ -133,7 +133,7 @@ private bool SetUpCaseOrCombo(string caseName) // If that fails, try setting it as a Load Combination if (m_model.Results.Setup.SetComboSelectedForOutput(caseName) != 0) { - Engine.Reflection.Compute.RecordWarning("Failed to setup result extraction for case " + caseName); + Engine.Base.Compute.RecordWarning("Failed to setup result extraction for case " + caseName); return false; } } diff --git a/Etabs_Adapter/CRUD/Read/SectionProperty.cs b/Etabs_Adapter/CRUD/Read/SectionProperty.cs index 13bad588..38cb998b 100644 --- a/Etabs_Adapter/CRUD/Read/SectionProperty.cs +++ b/Etabs_Adapter/CRUD/Read/SectionProperty.cs @@ -173,7 +173,7 @@ private List ReadSectionProperty(List ids = null) // Check type if (myType.Any(x => x != 1)) { - Engine.Reflection.Compute.RecordWarning("BhoM can only pull Non-prismatic sections with relative length values."); + Engine.Base.Compute.RecordWarning("BhoM can only pull Non-prismatic sections with relative length values."); break; } @@ -220,7 +220,7 @@ private List ReadSectionProperty(List ids = null) else if (materialName != sec.Material.DescriptionOrName()) { materialName = ""; - Engine.Reflection.Compute.RecordWarning("All sub-sections must have the same material."); + Engine.Base.Compute.RecordWarning("All sub-sections must have the same material."); break; } } @@ -230,7 +230,7 @@ private List ReadSectionProperty(List ids = null) if (profiles.Any(x => x == null)) { - Engine.Reflection.Compute.RecordNote("Tapered profiles require the sub-profiles to be geometrically defined, they can not be any kind of explicit section."); + Engine.Base.Compute.RecordNote("Tapered profiles require the sub-profiles to be geometrically defined, they can not be any kind of explicit section."); } else { @@ -309,7 +309,7 @@ private List ReadSectionProperty(List ids = null) } if (dimensions == null) { - Engine.Reflection.Compute.RecordNote(propertyType.ToString() + " properties are not implemented in ETABS adapter. An empty section has been returned."); + Engine.Base.Compute.RecordNote(propertyType.ToString() + " properties are not implemented in ETABS adapter. An empty section has been returned."); constructSelector = "explicit"; } #endregion @@ -320,7 +320,7 @@ private List ReadSectionProperty(List ids = null) if (!bhomMaterials.TryGetValue(materialName, out material)) { material = new GenericIsotropicMaterial() { Name = materialName }; - Engine.Reflection.Compute.RecordNote("Could not get material from ETABS. GenericIsotropic material with 0 values have been extracted in its place."); + Engine.Base.Compute.RecordNote("Could not get material from ETABS. GenericIsotropic material with 0 values have been extracted in its place."); } switch (constructSelector) diff --git a/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs b/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs index 573df24d..22a4e19c 100644 --- a/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs +++ b/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs @@ -116,7 +116,7 @@ private List ReadSurfaceProperty(List ids = null) } catch (Exception) { - Engine.Reflection.Compute.RecordNote("Could not get material from ETABS. Material for surface property " + id + " will be null"); + Engine.Base.Compute.RecordNote("Could not get material from ETABS. Material for surface property " + id + " will be null"); } if (wallType == eWallPropType.AutoSelectList) diff --git a/Etabs_Adapter/CRUD/Read/_Read.cs b/Etabs_Adapter/CRUD/Read/_Read.cs index 7a590630..84544040 100644 --- a/Etabs_Adapter/CRUD/Read/_Read.cs +++ b/Etabs_Adapter/CRUD/Read/_Read.cs @@ -46,7 +46,7 @@ using BH.oM.Adapter; using System.ComponentModel; using BH.oM.Data.Requests; -using BH.oM.Reflection; +using BH.oM.Base; namespace BH.Adapter.ETABS { @@ -175,7 +175,7 @@ private static List FilterIds(IEnumerable ids, IEnumerable result = ids.Intersect(etabsIds).ToList(); if (result.Count() != ids.Count()) - Engine.Reflection.Compute.RecordWarning("Some requested ETABS ids were not present in the model."); + Engine.Base.Compute.RecordWarning("Some requested ETABS ids were not present in the model."); return result; } } diff --git a/Etabs_Adapter/CRUD/Update/Bar.cs b/Etabs_Adapter/CRUD/Update/Bar.cs index b0ee053a..678aaaa4 100644 --- a/Etabs_Adapter/CRUD/Update/Bar.cs +++ b/Etabs_Adapter/CRUD/Update/Bar.cs @@ -61,13 +61,13 @@ private bool UpdateObjects(IEnumerable bhBars) string id = bhBar.AdapterId(typeof(ETABSId)); if (id != null) { - Engine.Reflection.Compute.RecordWarning("The Bar must have an ETABS adapter id to be updated."); + Engine.Base.Compute.RecordWarning("The Bar must have an ETABS adapter id to be updated."); continue; } if (!names.Contains(id)) { - Engine.Reflection.Compute.RecordWarning("The Bar must be present in ETABS to be updated."); + Engine.Base.Compute.RecordWarning("The Bar must be present in ETABS to be updated."); continue; } @@ -79,7 +79,7 @@ private bool UpdateObjects(IEnumerable bhBars) if (GetAdapterId(bhBar.StartNode) != start || GetAdapterId(bhBar.EndNode) != end) { - Engine.Reflection.Compute.RecordWarning("ETABS16 does not support Update of Bar connectivity, which means the geometry can not be updated. \n" + + Engine.Base.Compute.RecordWarning("ETABS16 does not support Update of Bar connectivity, which means the geometry can not be updated. \n" + "To update the connectivity or position of a Bar, delete the existing Bar you want to update and create a new one."); } #endif diff --git a/Etabs_Adapter/CRUD/Update/Material.cs b/Etabs_Adapter/CRUD/Update/Material.cs index ebf9aed7..6912d698 100644 --- a/Etabs_Adapter/CRUD/Update/Material.cs +++ b/Etabs_Adapter/CRUD/Update/Material.cs @@ -62,7 +62,7 @@ private bool UpdateObjects(IEnumerable bhMaterials) { if (matType != MaterialTypeToCSI(material.IMaterialType())) { - Engine.Reflection.Compute.RecordWarning($"Failed to update material: {material.DescriptionOrName()}, can't update to another material type."); + Engine.Base.Compute.RecordWarning($"Failed to update material: {material.DescriptionOrName()}, can't update to another material type."); continue; } @@ -71,11 +71,11 @@ private bool UpdateObjects(IEnumerable bhMaterials) else { // No material of that name found - Engine.Reflection.Compute.RecordWarning($"Failed to update material: {material.DescriptionOrName()}, as no such material was present in the model."); + Engine.Base.Compute.RecordWarning($"Failed to update material: {material.DescriptionOrName()}, as no such material was present in the model."); } if (!success) - Engine.Reflection.Compute.RecordWarning($"Failed to update material: {material.DescriptionOrName()}, all BHoM properties may not have been set."); + Engine.Base.Compute.RecordWarning($"Failed to update material: {material.DescriptionOrName()}, all BHoM properties may not have been set."); } return true; diff --git a/Etabs_Adapter/CRUD/Update/Panel.cs b/Etabs_Adapter/CRUD/Update/Panel.cs index 343b09e7..72f71d4a 100644 --- a/Etabs_Adapter/CRUD/Update/Panel.cs +++ b/Etabs_Adapter/CRUD/Update/Panel.cs @@ -59,7 +59,7 @@ private bool UpdateObjects(IEnumerable bhPanels) string name = GetAdapterId(bhPanel); string propertyName = GetAdapterId(bhPanel.Property); - Engine.Reflection.Compute.RecordWarning("The Etabs API does not allow for updating of the geometry of panels. This includes the external edges as well as the openings. To update the panel geometry, delete the existing panel you want to update and create a new one."); + Engine.Base.Compute.RecordWarning("The Etabs API does not allow for updating of the geometry of panels. This includes the external edges as well as the openings. To update the panel geometry, delete the existing panel you want to update and create a new one."); m_model.AreaObj.SetProperty(name, propertyName); diff --git a/Etabs_Adapter/CRUD/Update/SectionProperty.cs b/Etabs_Adapter/CRUD/Update/SectionProperty.cs index f4ad7a63..502f35fa 100644 --- a/Etabs_Adapter/CRUD/Update/SectionProperty.cs +++ b/Etabs_Adapter/CRUD/Update/SectionProperty.cs @@ -65,7 +65,7 @@ private bool UpdateObjects(IEnumerable bhSections) if (!names.Contains(propertyName)) { - Engine.Reflection.Compute.RecordWarning($"Failed to update SectionPoperty: { propertyName }, no section with that name found in ETABS."); + Engine.Base.Compute.RecordWarning($"Failed to update SectionPoperty: { propertyName }, no section with that name found in ETABS."); continue; } diff --git a/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs b/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs index 3a17a829..c06d7088 100644 --- a/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs +++ b/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs @@ -61,7 +61,7 @@ private bool UpdateObjects(IEnumerable bhSurfaceProperties) { if (!nameArr.Contains(property2d.DescriptionOrName())) { - Engine.Reflection.Compute.RecordWarning($"Failed to update SurfaceProperty: { property2d.DescriptionOrName() }, no surface property with that name found in ETABS."); + Engine.Base.Compute.RecordWarning($"Failed to update SurfaceProperty: { property2d.DescriptionOrName() }, no surface property with that name found in ETABS."); continue; } diff --git a/Etabs_Adapter/Convert/ToCSI/BarRelease.cs b/Etabs_Adapter/Convert/ToCSI/BarRelease.cs index 81a18338..b5459370 100644 --- a/Etabs_Adapter/Convert/ToCSI/BarRelease.cs +++ b/Etabs_Adapter/Convert/ToCSI/BarRelease.cs @@ -75,17 +75,17 @@ public static bool ToCSI(this BarRelease release, ref bool[] startRestraint, ref bool success = true; if (startReleased[0] && endReleased[0]) - { Engine.Reflection.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationX for both ends"); success = false; } + { Engine.Base.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationX for both ends"); success = false; } if (startReleased[1] && endReleased[1]) - { Engine.Reflection.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationZ for both ends"); success = false; } + { Engine.Base.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationZ for both ends"); success = false; } if (startReleased[2] && endReleased[2]) - { Engine.Reflection.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationY for both ends"); success = false; } + { Engine.Base.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationY for both ends"); success = false; } if (startReleased[3] && endReleased[3]) - { Engine.Reflection.Compute.RecordWarning($"Unstable releases have not been set, can not release RotationX for both ends"); success = false; } + { Engine.Base.Compute.RecordWarning($"Unstable releases have not been set, can not release RotationX for both ends"); success = false; } if (startReleased[4] && endReleased[4] && (startReleased[2] || endReleased[2])) - { Engine.Reflection.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationY when RotationZ is released for both ends"); success = false; } + { Engine.Base.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationY when RotationZ is released for both ends"); success = false; } if (startReleased[5] && endReleased[5] && (startReleased[1] || endReleased[1])) - { Engine.Reflection.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationZ when RotationY is released for both ends"); success = false; } + { Engine.Base.Compute.RecordWarning($"Unstable releases have not been set, can not release TranslationZ when RotationY is released for both ends"); success = false; } return success; } diff --git a/Etabs_Adapter/ETABSAdapter.cs b/Etabs_Adapter/ETABSAdapter.cs index 64869aba..f7dad8a3 100644 --- a/Etabs_Adapter/ETABSAdapter.cs +++ b/Etabs_Adapter/ETABSAdapter.cs @@ -171,7 +171,7 @@ public double DatabaseLengthUnitFactor() switch (length) { case eLength.NotApplicable: - Engine.Reflection.Compute.RecordWarning("Unknow NotApplicable unit, assumed to be meter."); + Engine.Base.Compute.RecordWarning("Unknow NotApplicable unit, assumed to be meter."); factor = 1; break; case eLength.inch: diff --git a/Etabs_Adapter/Etabs_Adapter.csproj b/Etabs_Adapter/Etabs_Adapter.csproj index 07a72415..7d17d287 100644 --- a/Etabs_Adapter/Etabs_Adapter.csproj +++ b/Etabs_Adapter/Etabs_Adapter.csproj @@ -232,10 +232,12 @@ C:\ProgramData\BHoM\Assemblies\Adapter_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Adapter_oM.dll False + False False @@ -245,6 +247,7 @@ C:\ProgramData\BHoM\Assemblies\Architecture_oM.dll False + False False @@ -254,18 +257,22 @@ C:\ProgramData\BHoM\Assemblies\BHoM_Adapter.dll False + False C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Data_oM.dll False + False C:\ProgramData\BHoM\Assemblies\Dimensional_oM.dll False + False ..\packages\CSI_ETABSv2016_x64.1.0.3\lib\ETABS2016.dll @@ -290,39 +297,37 @@ C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll False + False False C:\ProgramData\BHoM\Assemblies\Physical_oM.dll False - - C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll - False - - - C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll - False - C:\ProgramData\BHoM\Assemblies\Spatial_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Spatial_oM.dll False + False C:\ProgramData\BHoM\Assemblies\Structure_AdapterModules.dll False + False C:\ProgramData\BHoM\Assemblies\Structure_Engine.dll False + False C:\ProgramData\BHoM\Assemblies\Structure_oM.dll False + False @@ -335,6 +340,7 @@ C:\ProgramData\BHoM\Assemblies\Units_Engine.dll False + False