Skip to content

Commit

Permalink
v3.0.5
Browse files Browse the repository at this point in the history 
bug fixed about modification of load cases, load combos and result combos
  • Loading branch information
@diego-apellaniz
diego-apellaniz committed Jul 23, 2021
1 parent a3fe33f commit dbe5983
Show file tree
Hide file tree
Showing 25 changed files with 70,897 additions and 43,150 deletions.
Binary file modified Parametric_FEM_Toolbox/.vs/Parametric_FEM_Toolbox/v16/.suo
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/GUI/SubComponent_RFLoadCombo_Assemble_GUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,19 @@ public override void SolveInstance(IGH_DataAccess DA, out string msg, out GH_Run
if (DA.GetData(4, ref design))
{
rfLoadCcombo.DesignSituation = (DesignSituationType)design;
// Check Action Category
if (rfLoadCcombo.DesignSituation == DesignSituationType.UnknownDesignSituation)
{
msg = "Design Situation Type not supported. ";
level = GH_RuntimeMessageLevel.Warning;
return;
}
}
if (DA.GetData(5, ref toSolve))
{
rfLoadCcombo.ToSolve = toSolve;
}

// Check Action Category
if (rfLoadCcombo.DesignSituation == DesignSituationType.UnknownDesignSituation)
{
msg = "Design Situation Type not supported. ";
level = GH_RuntimeMessageLevel.Warning;
return;
}

DA.SetData(0, rfLoadCcombo);
}
}
Expand Down
16 changes: 8 additions & 8 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/GUI/SubComponent_RFResultCombo_Assemble_GUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,19 @@ public override void SolveInstance(IGH_DataAccess DA, out string msg, out GH_Run
if (DA.GetData(4, ref design))
{
rfLoadCcombo.DesignSituation = (DesignSituationType)design;
// Check Action Category
if (rfLoadCcombo.DesignSituation == DesignSituationType.UnknownDesignSituation)
{
msg = "Design Situation Type not supported. ";
level = GH_RuntimeMessageLevel.Warning;
return;
}
}
if (DA.GetData(5, ref toSolve))
{
rfLoadCcombo.ToSolve = toSolve;
}

// Check Action Category
if (rfLoadCcombo.DesignSituation == DesignSituationType.UnknownDesignSituation)
{
msg = "Design Situation Type not supported. ";
level = GH_RuntimeMessageLevel.Warning;
return;
}

DA.SetData(0, rfLoadCcombo);
}
}
Expand Down
26 changes: 18 additions & 8 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/HelperLibraries/Component_SetData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public static class Component_SetData
// Tolerance for merging nodes closer to this distance [m].
static double tol = 0.001;

#region Model Data
public static void SetRFNodes(this IModelData data, List<GH_RFEM> ghNodes, ref List<RFNode> index)
{
var newData = false;
Expand Down Expand Up @@ -313,9 +314,6 @@ public static void SetRFLines2(this IModelData data, List<GH_RFEM> ghLines, ref
// Remove duplicate points
}




public static RFLine SetRFLine(this IModelData data, ref RFLine rfLine, ref List<RFNode> existingNodes, ref List<RFLine> existingLines, ref int lastNoNo, ref int lastLineNo)
{
var newNodes = false;
Expand All @@ -336,8 +334,7 @@ public static RFLine SetRFLine(this IModelData data, ref RFLine rfLine, ref List
}
}
rfLine.NodeList = nodeList.Substring(0, nodeList.Length - 1);
}

}

// Check if line already exists in RFEM
if (!newNodes)
Expand Down Expand Up @@ -1615,6 +1612,10 @@ public static RFMaterial SetMaterial(this IModelData data, ref RFMaterial rFMat,
return rFMat;
}

#endregion

#region Load Data

public static void SetRFNodalLoads(this IModelData data, ILoads loads, List<GH_RFEM> ghNodes, ref List<RFNodalLoad> index)
{
var newData = false;
Expand All @@ -1623,9 +1624,7 @@ public static void SetRFNodalLoads(this IModelData data, ILoads loads, List<GH_R
var lastNoNo = 0;
var lastNLNo = 0;

inNLoads = ghNodes.Select(x => new RFNodalLoad((RFNodalLoad)x.Value)).ToList();


inNLoads = ghNodes.Select(x => new RFNodalLoad((RFNodalLoad)x.Value)).ToList();

foreach (var rfLoad in inNLoads)
{
Expand Down Expand Up @@ -2115,6 +2114,10 @@ public static RFFreeLineLoad SetRFFreeLineLoad(this IModelData data, ILoadCase l
return rfLineLoad;
}

#endregion

#region Load Cases and Combos

public static void SetRFLoadCases(this IModelData data, ILoads loads, List<GH_RFEM> ghLoadCases, ref List<RFLoadCase> index, ref List<string> errorMsg)
{
var newData = false;
Expand Down Expand Up @@ -2174,6 +2177,7 @@ public static RFLoadCase SetRFLoadCase(this IModelData data, ILoads loads, ref R
loads.FinishModification();
return rfLoadCase;
}

// Set node without provided index number
lastLCNo += 1;
rfLoadCase.No = lastLCNo;
Expand Down Expand Up @@ -2325,6 +2329,10 @@ public static RFResultCombo SetRFResultCombo(this IModelData data, ILoads loads,
return rfLoadCombo;
}

#endregion

#region Clear Output

public static void ClearOutput(ref List<RFNode> nodelist, ref List<RFLine> linelist, ref List<RFMember> memberlist,
ref List<RFSurface> srfclist, ref List<RFOpening> oplist, ref List<RFSupportP> supPlist, ref List<RFSupportL> supLlist,
ref List<RFLineHinge> lineHingelist, ref List<RFCroSec> croSeclist, ref List<RFMaterial> matlist,
Expand Down Expand Up @@ -2460,5 +2468,7 @@ public static void ClearOutput(ref List<RFNode> nodelist, ref List<RFLine> linel
resultComboList.Clear();
freeLineLoadList.Clear();
}

#endregion
}
}
2 changes: 1 addition & 1 deletion Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public override string AssemblyVersion
{
get
{
return "1.3.2";
return "1.3.5";
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,18 @@
<Reference Include="Eto">
<HintPath>C:\Users\diego\.nuget\packages\eto.forms\2.4.1\lib\netstandard1.0\Eto.dll</HintPath>
</Reference>
<Reference Include="GH_IO, Version=7.6.21127.19001, Culture=neutral, PublicKeyToken=6a29997d2e6b4f97, processorArchitecture=MSIL">
<Reference Include="GH_IO, Version=6.34.21034.7001, Culture=neutral, PublicKeyToken=6a29997d2e6b4f97, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files\Rhino 6\Plug-ins\Grasshopper\GH_IO.dll</HintPath>
<HintPath>C:\Program Files\Rhino 7\Plug-ins\Grasshopper\GH_IO.dll</HintPath>
</Reference>
<Reference Include="Grasshopper, Version=7.6.21127.19001, Culture=neutral, PublicKeyToken=dda4f5ec2cd80803, processorArchitecture=MSIL">
<Reference Include="Grasshopper, Version=6.34.21034.7001, Culture=neutral, PublicKeyToken=dda4f5ec2cd80803, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files\Rhino 6\Plug-ins\Grasshopper\Grasshopper.dll</HintPath>
<HintPath>C:\Program Files\Rhino 7\Plug-ins\Grasshopper\Grasshopper.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="RhinoCommon, Version=7.6.21127.19001, Culture=neutral, PublicKeyToken=552281e97c755530, processorArchitecture=MSIL">
<Reference Include="RhinoCommon, Version=6.34.21034.7001, Culture=neutral, PublicKeyToken=552281e97c755530, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files\Rhino 6\System\RhinoCommon.dll</HintPath>
<HintPath>C:\Program Files\Rhino 7\System\RhinoCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/Parametric_FEM_Toolbox.csproj.user
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<StartProgram>C:\Program Files\Rhino 6\System\Rhino.exe</StartProgram>
<StartProgram>C:\Program Files\Rhino 7\System\Rhino.exe</StartProgram>
<StartAction>Program</StartAction>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
Expand Down
6 changes: 6 additions & 0 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/RFEM/RFLoadCase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ public RFLoadCase(LoadCase load)
ToDelete = false;
}

public RFLoadCase(RFLoadCase other) : this((LoadCase)other)
{
ToModify = other.ToModify;
ToDelete = other.ToDelete;
}

//Properties to Wrap Fields from RFEM Struct
public string Comment { get; set; }
public string ID { get; set; }
Expand Down
7 changes: 7 additions & 0 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/RFEM/RFLoadCombo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ public RFLoadCombo(LoadCombination load)
ToDelete = false;
}

public RFLoadCombo(RFLoadCombo other) : this((LoadCombination)other)
{
ToModify = other.ToModify;
ToDelete = other.ToDelete;
}


//Properties to Wrap Fields from RFEM Struct
public string Comment { get; set; }
public string ID { get; set; }
Expand Down
6 changes: 6 additions & 0 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/RFEM/RFResultCombo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ public RFResultCombo(ResultCombination load)
ToDelete = false;
}

public RFResultCombo(RFResultCombo other) : this((ResultCombination)other)
{
ToModify = other.ToModify;
ToDelete = other.ToDelete;
}

//Properties to Wrap Fields from RFEM Struct
public string Comment { get; set; }
public string ID { get; set; }
Expand Down
Binary file modified Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/GH_IO.dll
View file
Binary file not shown.
19 changes: 19 additions & 0 deletions Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/GH_IO.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/GH_Util.dll
View file
Binary file not shown.
Binary file modified Parametric_FEM_Toolbox/Parametric_FEM_Toolbox/bin/x64/Debug/Grasshopper.dll
View file
Binary file not shown.
Loading

0 comments on commit dbe5983

Please sign in to comment.