Skip to content
This repository has been archived by the owner on Aug 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #14 from speckleworks/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@nic-burgers-arup
nic-burgers-arup authored Feb 28, 2020
2 parents 208982f + 9c5abfb commit e2a29c2
Show file tree
Hide file tree
Showing 10 changed files with 424 additions and 323 deletions.
Binary file modified SpeckleStructuralGSA.Test/SpeckleGSAProxy.dll
View file
Binary file not shown.
208 changes: 90 additions & 118 deletions SpeckleStructuralGSA.Test/TestData/TestGwaRecords.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,21 @@
{
"GwaCommand": "SET\tGRID_PLANE.4\t1\tAlignment One\tGENERAL\t0\t0\t0\t0"
},
{
"GwaCommand": "SET\tGRID_PLANE.4\t2\tLive load panel\tGENERAL\t1\t-11.58\t0\t0"
},
{
"GwaCommand": "SET\tGRID_PLANE.4\t3\tDead load panel\tGENERAL\t2\t-17.37\t0\t0"
},
{
"GwaCommand": "SET\tGRID_SURFACE.1\t1\tAlignment One\t1\t2\tall\t0.01\tONE\t0"
},
{
"GwaCommand": "SET\tGRID_SURFACE.1\t2\tLive load panel\t2\t2\tall\t0.01\tONE\t0"
},
{
"GwaCommand": "SET\tGRID_SURFACE.1\t3\tDead load panel\t3\t2\tall\t0.01\tONE\t0"
},
{
"ApplicationId": "AL1",
"GwaCommand": "SET\tALIGN.1:{speckle_app_id:AL1}\t1\tAlignment One\t1\t3\t0\t0\t40\t-0.01\t80\t-0.01"
Expand Down Expand Up @@ -53,96 +65,6 @@
"ApplicationId": "gh/a461ec766c5e867d96a5036dc53c811a",
"GwaCommand": "SET\tMEMB.7:{speckle_app_id:gh/a461ec766c5e867d96a5036dc53c811a}\t5\t \tNO_RGB\t2D_VOID_CUTTER\t1\t0\t29 30 31 32 33 34 35 \t0\t0\t1\tMESH\tLINEAR\t0\t0\t0\t0\t0\tACTIVE\tNO\t0\tALL"
},
{
"ApplicationId": "concrete",
"GwaCommand": "SET\tMAT_CONCRETE.17:{speckle_app_id:concrete}\t1\tMAT.8\tConcrete\tYES\t28000000000\t0.2\t11666700000\t2400\t1E-05\tMAT_ANAL.1\tConcrete\t-268435456\tMAT_ELAS_ISO\t6\t28000000000\t0.2\t2400\t1E-05\t11666700000\t0\t0\t0\t0\t0\t0\t0\t0\tMAT_CURVE_PARAM.2\t\tUNDEF\t1\t1\tMAT_CURVE_PARAM.2\t\tUNDEF\t1\t1\t0\tCYLINDER\tN\t40000000\t0\t0\t0\t0\t0\t1\t2\t0.00218389285990043\t0.0035\t0.00041125\t0.003\t0.0035\t0.002\t0.0035\tNO\t0.02\t0\t1\t0.8825\t0\t0\t0\t0\t0"
},
{
"ApplicationId": "gh/0e14ea030d377c1860dc6b72453e58fc",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/0e14ea030d377c1860dc6b72453e58fc}\t1\tLSP-General\tNO_RGB\tGLOBAL\tGENERAL\t0\t12\t0\t15\t0\t20\t0\t25\t0\t30\t0\t38\t0.21"
},
{
"ApplicationId": "gh/34a7311a137096403bbe0296bbed53b7",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/34a7311a137096403bbe0296bbed53b7}\t2\tLSP-Axial\tNO_RGB\tGLOBAL\tAXIAL\t12\t0.21"
},
{
"ApplicationId": "gh/d3acde535f3ecd3a9d384929810714dc",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/d3acde535f3ecd3a9d384929810714dc}\t3\tLSP-Torsional\tNO_RGB\tGLOBAL\tTORSIONAL\t25\t0.21"
},
{
"ApplicationId": "gh/150a6a79e8ecbc0f7efb4fa822d67558",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/150a6a79e8ecbc0f7efb4fa822d67558}\t4\tLSP-Compression\tNO_RGB\tGLOBAL\tCOMPRESSION\t12\t0.21"
},
{
"ApplicationId": "gh/ee71ea28e5836bad65af7cdde55f37ec",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/ee71ea28e5836bad65af7cdde55f37ec}\t5\tLSP-Tension\tNO_RGB\tGLOBAL\tTENSION\t12\t0.21"
},
{
"ApplicationId": "gh/6854f7b9522dd1c5d13cf369b726cef1",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/6854f7b9522dd1c5d13cf369b726cef1}\t6\tLSP-Lockup\tNO_RGB\tGLOBAL\tLOCKUP\t12\t0.21\t0\t0"
},
{
"ApplicationId": "gh/75e517bb9ccbecdd6b844a57a73f2edb",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/75e517bb9ccbecdd6b844a57a73f2edb}\t7\tLSP-Gap\tNO_RGB\tGLOBAL\tGAP\t12\t0.21"
},
{
"ApplicationId": "gh/a2f49ec8a94bdebe19c1433d95294955",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/a2f49ec8a94bdebe19c1433d95294955}\t8\tLSP-Friction\tNO_RGB\tGLOBAL\tFRICTION\t12\t15\t20\t0\t0.21"
},
{
"ApplicationId": "Live",
"GwaCommand": "SET\tLOAD_GRID_AREA.2:{speckle_app_id:Live}\tLive load panel\t2\tPOLYGON\t(14.756140625,24.6719296875) (-24.843859375,24.6719296875) (-24.843859375,-2.52719870209193) (14.756140625,4.8719296875)\t1\tGLOBAL\tNO\tZ\t-4.8"
},
{
"GwaCommand": "SET\tGRID_SURFACE.1\t2\tLive load panel\t2\t2\tall\t0.01\tONE\t0"
},
{
"GwaCommand": "SET\tAXIS.1\t1\tLive load panel\tCART\t0\t0\t0\t1\t0\t0\t0\t-1\t0"
},
{
"GwaCommand": "SET\tGRID_PLANE.4\t2\tLive load panel\tGENERAL\t1\t-11.58\t0\t0"
},
{
"ApplicationId": "SDL",
"GwaCommand": "SET\tLOAD_GRID_AREA.2:{speckle_app_id:SDL}\tDead load panel\t3\tPOLYGON\t(44.456140625,4.8719296875) (54.356140625,-74.3280703125) (74.156140625,-67.7347695434277) (74.156140625,4.8719296875)\t2\tGLOBAL\tNO\tZ\t-1.2"
},
{
"GwaCommand": "SET\tGRID_SURFACE.1\t3\tDead load panel\t3\t2\tall\t0.01\tONE\t0"
},
{
"GwaCommand": "SET\tAXIS.1\t2\tDead load panel\tCART\t0\t0\t0\t1\t0\t0\t0\t-1\t0"
},
{
"GwaCommand": "SET\tGRID_PLANE.4\t3\tDead load panel\tGENERAL\t2\t-17.37\t0\t0"
},
{
"ApplicationId": "LT1",
"GwaCommand": "SET\tTASK.1:{speckle_app_id:LT1}\t1\t\t0\tGSS\tSTATIC\t1\t0\t128\tSELF\tnone\tnone\tDRCMEFNSQBHU*\tMIN\tAUTO\t0\t0\t0\tNONE\tFATAL\tNONE\tNONE\tRAFT_LO\tRESID_NO\t0\t1"
},
{
"ApplicationId": "LT1",
"GwaCommand": "SET\tANAL.1:{speckle_app_id:LT1}\t1\tLoad task 1\t1\t1.1L1 + 1L2 + L3"
},
{
"ApplicationId": "LT2",
"GwaCommand": "SET\tTASK.1:{speckle_app_id:LT2}\t2\t\t0\tGSS\tSTATIC\t1\t0\t128\tSELF\tnone\tnone\tDRCMEFNSQBHU*\tMIN\tAUTO\t0\t0\t0\tNONE\tFATAL\tNONE\tNONE\tRAFT_LO\tRESID_NO\t0\t1"
},
{
"ApplicationId": "LT2",
"GwaCommand": "SET\tANAL.1:{speckle_app_id:LT2}\t2\tLoad task 2\t2\t1.1L1 + 1L2 + L3"
},
{
"ApplicationId": "columnProp",
"GwaCommand": "SET\tPROP_SEC.3:{speckle_app_id:columnProp}\t1\tColumn property\tNO_RGB\tCONCRETE\t1\t0\tGEO%P()%M(-0.836|-1.141)%L(-3.799|3.396)%L(1.71|0.992)%L(0.931|-0.92)%M(-1.881|1.512)%L(-0.247|1.195)%L(-0.431|-0.418)%M(1.313|0.588)%L(1.098|0.683)%L(1.115|0.273)%L(1.24|0.259)\t0"
},
{
"ApplicationId": "slabProp",
"GwaCommand": "SET\tPROP_2D.5:{speckle_app_id:slabProp}\t1\tSlab property\tNO_RGB\tSHELL\tGLOBAL\t0\tCONCRETE\t1\t0\t0.3\tCENTROID\t0\t0\t100%\t100%\t100%\t100%\tNO_ENV"
},
{
"ApplicationId": "ComboOne",
"GwaCommand": "SET\tCOMBINATION.1:{speckle_app_id:ComboOne}\t1\tCombo One\t1.5A1 + 1.25A2"
},
{
"ApplicationId": "gh/71aeda7ba88bbbc6dc8f8966d24045bc",
"GwaCommand": "SET\tMEMB.7:{speckle_app_id:gh/71aeda7ba88bbbc6dc8f8966d24045bc}\t6\tColumn 0\tNO_RGB\tCOLUMN\t1\t6\t36 37 \t0\t0\t0\tMESH\tBEAM\t0\t0\t0\t0\t0\tACTIVE\t3\t3\tAUTOMATIC\t0\t0\tMAN\tMAN\tNO\t0\t0\t0\t0\tALL"
Expand Down Expand Up @@ -331,6 +253,84 @@
"ApplicationId": "Slab4",
"GwaCommand": "SET\tMEMB.7:{speckle_app_id:Slab4}\t52\tSlab 4\tNO_RGB\tSLAB\t1\t52\t148 149 150 151 152 153 154\t0\t0\t5\tMESH\tLINEAR\t0\t0\t0\t0\t0\tACTIVE\tNO\t0\tALL"
},
{
"ApplicationId": "concrete",
"GwaCommand": "SET\tMAT_CONCRETE.17:{speckle_app_id:concrete}\t1\tMAT.8\tConcrete\tYES\t28000000000\t0.2\t11666700000\t2400\t1E-05\tMAT_ANAL.1\tConcrete\t-268435456\tMAT_ELAS_ISO\t6\t28000000000\t0.2\t2400\t1E-05\t11666700000\t0\t0\t0\t0\t0\t0\t0\t0\tMAT_CURVE_PARAM.2\t\tUNDEF\t1\t1\tMAT_CURVE_PARAM.2\t\tUNDEF\t1\t1\t0\tCYLINDER\tN\t40000000\t0\t0\t0\t0\t0\t1\t2\t0.00218389285990043\t0.0035\t0.00041125\t0.003\t0.0035\t0.002\t0.0035\tNO\t0.02\t0\t1\t0.8825\t0\t0\t0\t0\t0"
},
{
"ApplicationId": "gh/0e14ea030d377c1860dc6b72453e58fc",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/0e14ea030d377c1860dc6b72453e58fc}\t1\tLSP-General\tNO_RGB\tGLOBAL\tGENERAL\t0\t12\t0\t15\t0\t20\t0\t25\t0\t30\t0\t38\t0.21"
},
{
"ApplicationId": "gh/34a7311a137096403bbe0296bbed53b7",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/34a7311a137096403bbe0296bbed53b7}\t2\tLSP-Axial\tNO_RGB\tGLOBAL\tAXIAL\t12\t0.21"
},
{
"ApplicationId": "gh/d3acde535f3ecd3a9d384929810714dc",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/d3acde535f3ecd3a9d384929810714dc}\t3\tLSP-Torsional\tNO_RGB\tGLOBAL\tTORSIONAL\t25\t0.21"
},
{
"ApplicationId": "gh/150a6a79e8ecbc0f7efb4fa822d67558",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/150a6a79e8ecbc0f7efb4fa822d67558}\t4\tLSP-Compression\tNO_RGB\tGLOBAL\tCOMPRESSION\t12\t0.21"
},
{
"ApplicationId": "gh/ee71ea28e5836bad65af7cdde55f37ec",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/ee71ea28e5836bad65af7cdde55f37ec}\t5\tLSP-Tension\tNO_RGB\tGLOBAL\tTENSION\t12\t0.21"
},
{
"ApplicationId": "gh/6854f7b9522dd1c5d13cf369b726cef1",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/6854f7b9522dd1c5d13cf369b726cef1}\t6\tLSP-Lockup\tNO_RGB\tGLOBAL\tLOCKUP\t12\t0.21\t0\t0"
},
{
"ApplicationId": "gh/75e517bb9ccbecdd6b844a57a73f2edb",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/75e517bb9ccbecdd6b844a57a73f2edb}\t7\tLSP-Gap\tNO_RGB\tGLOBAL\tGAP\t12\t0.21"
},
{
"ApplicationId": "gh/a2f49ec8a94bdebe19c1433d95294955",
"GwaCommand": "SET\tPROP_SPR.3:{speckle_app_id:gh/a2f49ec8a94bdebe19c1433d95294955}\t8\tLSP-Friction\tNO_RGB\tGLOBAL\tFRICTION\t12\t15\t20\t0\t0.21"
},
{
"ApplicationId": "Live",
"GwaCommand": "SET\tLOAD_GRID_AREA.2:{speckle_app_id:Live}\tLive load panel\t2\tPOLYGON\t(14.756140625,24.6719296875) (-24.843859375,24.6719296875) (-24.843859375,-2.52719870209193) (14.756140625,4.8719296875)\t1\tGLOBAL\tNO\tZ\t-4.8"
},
{
"ApplicationId": "SDL",
"GwaCommand": "SET\tLOAD_GRID_AREA.2:{speckle_app_id:SDL}\tDead load panel\t3\tPOLYGON\t(44.456140625,4.8719296875) (54.356140625,-74.3280703125) (74.156140625,-67.7347695434277) (74.156140625,4.8719296875)\t2\tGLOBAL\tNO\tZ\t-1.2"
},
{
"GwaCommand": "SET\tAXIS.1\t1\tLive load panel\tCART\t0\t0\t0\t1\t0\t0\t0\t-1\t0"
},
{
"GwaCommand": "SET\tAXIS.1\t2\tDead load panel\tCART\t0\t0\t0\t1\t0\t0\t0\t-1\t0"
},
{
"ApplicationId": "LT1",
"GwaCommand": "SET\tTASK.1:{speckle_app_id:LT1}\t1\t\t0\tGSS\tSTATIC\t1\t0\t128\tSELF\tnone\tnone\tDRCMEFNSQBHU*\tMIN\tAUTO\t0\t0\t0\tNONE\tFATAL\tNONE\tNONE\tRAFT_LO\tRESID_NO\t0\t1"
},
{
"ApplicationId": "LT2",
"GwaCommand": "SET\tTASK.1:{speckle_app_id:LT2}\t2\t\t0\tGSS\tSTATIC\t1\t0\t128\tSELF\tnone\tnone\tDRCMEFNSQBHU*\tMIN\tAUTO\t0\t0\t0\tNONE\tFATAL\tNONE\tNONE\tRAFT_LO\tRESID_NO\t0\t1"
},
{
"ApplicationId": "LT1",
"GwaCommand": "SET\tANAL.1:{speckle_app_id:LT1}\t1\tLoad task 1\t1\t1.1L1 + 1L2 + L3"
},
{
"ApplicationId": "LT2",
"GwaCommand": "SET\tANAL.1:{speckle_app_id:LT2}\t2\tLoad task 2\t2\t1.1L1 + 1L2 + L3"
},
{
"ApplicationId": "columnProp",
"GwaCommand": "SET\tPROP_SEC.3:{speckle_app_id:columnProp}\t1\tColumn property\tNO_RGB\tCONCRETE\t1\t0\tGEO%P()%M(-0.836|-1.141)%L(-3.799|3.396)%L(1.71|0.992)%L(0.931|-0.92)%M(-1.881|1.512)%L(-0.247|1.195)%L(-0.431|-0.418)%M(1.313|0.588)%L(1.098|0.683)%L(1.115|0.273)%L(1.24|0.259)\t0"
},
{
"ApplicationId": "slabProp",
"GwaCommand": "SET\tPROP_2D.5:{speckle_app_id:slabProp}\t1\tSlab property\tNO_RGB\tSHELL\tGLOBAL\t0\tCONCRETE\t1\t0\t0.3\tCENTROID\t0\t0\t100%\t100%\t100%\t100%\tNO_ENV"
},
{
"ApplicationId": "ComboOne",
"GwaCommand": "SET\tCOMBINATION.1:{speckle_app_id:ComboOne}\t1\tCombo One\t1.5A1 + 1.25A2"
},
{
"ApplicationId": "TL1",
"GwaCommand": "SET\tLOAD_2D_THERMAL.2:{speckle_app_id:TL1}\tGeneral\tG48 G49 G50 G51 G52\t3\tDZ\t239\t509"
Expand Down Expand Up @@ -386,33 +386,5 @@
{
"ApplicationId": "Stage1",
"GwaCommand": "SET\tGEN_REST.2:{speckle_app_id:Stage1}\tNode Restraints One\t1\t0\t0\t1\t0\t1\t156 158\t2"
},
{
"ApplicationId": "gh/ad4558d6e5a0784fe711195b15dbb60d",
"GwaCommand": "SET\tNODE.2:{speckle_app_id:gh/ad4558d6e5a0784fe711195b15dbb60d}\t168\t \tNO_RGB\t14.7561403508772\t-4.8719298245614\t0\tNO_GRID\t0\tREST\t1\t1\t1\t1\t1\t1\tNO_STIFF\tNO_MESH"
},
{
"ApplicationId": "gh/460a05faac77730b25727b360f7d0cec",
"GwaCommand": "SET\tNODE.2:{speckle_app_id:gh/460a05faac77730b25727b360f7d0cec}\t169\t \tNO_RGB\t74.1561403508772\t-4.8719298245614\t0\tNO_GRID\t0\tREST\t1\t1\t1\t1\t1\t1\tNO_STIFF\tNO_MESH"
},
{
"ApplicationId": "gh/e9901628ee704568be982cf978f99ebb",
"GwaCommand": "SET\tNODE.2:{speckle_app_id:gh/e9901628ee704568be982cf978f99ebb}\t170\t \tNO_RGB\t74.1561403508772\t94.1280701754386\t0\tNO_GRID\t0\tREST\t1\t1\t1\t1\t1\t1\tNO_STIFF\tNO_MESH"
},
{
"ApplicationId": "gh/fbcd9cadcbb666d66ffe391c8ef78fa8",
"GwaCommand": "SET\tNODE.2:{speckle_app_id:gh/fbcd9cadcbb666d66ffe391c8ef78fa8}\t171\t \tNO_RGB\t34.5561403508772\t54.5280701754386\t0\tNO_GRID\t0\tREST\t1\t1\t1\t1\t1\t1\tNO_STIFF\tNO_MESH"
},
{
"ApplicationId": "gh/f16de03fe77b08cc3c9dceb84920aff8",
"GwaCommand": "SET\tNODE.2:{speckle_app_id:gh/f16de03fe77b08cc3c9dceb84920aff8}\t172\t \tNO_RGB\t-24.8438596491228\t54.5280701754386\t0\tNO_GRID\t0\tREST\t1\t1\t1\t1\t1\t1\tNO_STIFF\tNO_MESH"
},
{
"ApplicationId": "gh/aad3349332e757ba1c6bc306b2a56957",
"GwaCommand": "SET\tNODE.2:{speckle_app_id:gh/aad3349332e757ba1c6bc306b2a56957}\t173\t \tNO_RGB\t-24.8438596491228\t-24.6719298245614\t0\tNO_GRID\t0\tREST\t1\t1\t1\t1\t1\t1\tNO_STIFF\tNO_MESH"
},
{
"ApplicationId": "gh/81377a0b1382a79b6833ab88c0a0e311",
"GwaCommand": "SET\tNODE.2:{speckle_app_id:gh/81377a0b1382a79b6833ab88c0a0e311}\t174\t \tNO_RGB\t14.7561403508772\t-24.6719298245614\t0\tNO_GRID\t0\tREST\t1\t1\t1\t1\t1\t1\tNO_STIFF\tNO_MESH"
}
]
Loading

0 comments on commit e2a29c2

Please sign in to comment.