Skip to content

Commit

Permalink
Changes to be committed:
Browse files Browse the repository at this point in the history
	modified:   SAM
	modified:   SAM_Excel
	modified:   SAM_Mollier
	modified:   SAM_Systems
	modified:   SAM_Tas
	modified:   SAM_UI

 Submodule changes to be committed:

 * SAM 2c91cc91...f8008f59 (3):
   > Merge pull request #344 from HoareLea/Modifier
   > Minor Code Tweaks
   > Update SAMAnalyticalSetSystemTypeNames.cs

 * SAM_Excel 2f44e71...4965449 (1):
   > Update SAM.Core.Grasshopper.Excel.csproj

 * SAM_Mollier 7f75353...64cb9d9 (1):
   > Update SAMMollierHourlyValues.cs

 * SAM_Systems 1ea7671...b6b1c3e (3):
   > Merge pull request #10 from HoareLea/Modifier
   > Names Added for SizedValue
   > Merge pull request #9 from HoareLea/Controllers

 * SAM_Tas 0911dcf...a8c360c (3):
   > Merge pull request #76 from HoareLea/Modifier
   > Names Added for SizedValue
   > Merge pull request #75 from HoareLea/Controllers

 * SAM_UI ebfc5bb...55a0bf4 (1):
   > adjust groups
  • Loading branch information
michaldengusiak committed Sep 30, 2024
1 parent 29c08ae commit 7d78fdb
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion SAM
Submodule SAM updated 243 files
2 changes: 1 addition & 1 deletion SAM_Excel
2 changes: 1 addition & 1 deletion SAM_Mollier
2 changes: 1 addition & 1 deletion SAM_Systems
Submodule SAM_Systems updated 87 files
+31 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Classes/GooSystemObject.cs
+1 −2 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemAddSystemEnergyCentre.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemComponentType.cs
+112 −0 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemConnectedSensor.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemConnectedSystemComponents.cs
+1 −2 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemConnectedSystemGroups.cs
+1 −2 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemConnectedSystemObjects.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemConnector.cs
+1 −1 ...pper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemCreateDisplaySystemConnectorManager.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemCreateDisplaySystemManager.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemCreateSystemEnergyCentre.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemCreateSystemGeometrySymbol.cs
+1 −3 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemModifyAirSystem.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemOrderedSystemComponents.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemPlantRoomRelatedObjects.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemResultValueByHourOfYear.cs
+22 −4 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemResults.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemToAHU.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemType.cs
+1 −5 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMAnalyticalSystemUpdateAirSystem.cs
+35 −0 Grasshopper/SAM.Analytical.Grasshopper.Systems/Component/SAMSystemsSystemEnergyCentreDataType.cs
+9 −0 Grasshopper/SAM.Analytical.Grasshopper.Systems/Properties/Resources.resx
+ Grasshopper/SAM.Analytical.Grasshopper.Systems/Resources/SAM3.0.png
+ Grasshopper/SAM.Analytical.Grasshopper.Systems/Resources/SAM_TasTPD.png
+ Grasshopper/SAM.Analytical.Grasshopper.Systems/Resources/SAM_TasTPD3.png
+3 −3 Grasshopper/SAM.Analytical.Grasshopper.Systems/SAM.Analytical.Grasshopper.Systems.csproj
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/DisplaySystemSensor.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemDifferenceController.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemIfLogicalController.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemMaxLogicalController.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemMinLogicalController.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemNormalController.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemNotLogicalController.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemOutdoorController.cs
+97 −0 ...Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemPassthroughController.cs
+97 −0 SAM_Systems/SAM.Analytical.Systems/Classes/DisplayObject/SystemController/DisplaySystemSigLogicalController.cs
+75 −0 SAM_Systems/SAM.Analytical.Systems/Classes/OffsetSetback.cs
+145 −0 SAM_Systems/SAM.Analytical.Systems/Classes/ProfileSetpoint.cs
+107 −0 SAM_Systems/SAM.Analytical.Systems/Classes/RangeSetpoint.cs
+135 −0 SAM_Systems/SAM.Analytical.Systems/Classes/Result/SystemEnergyCentreResult.cs
+113 −0 SAM_Systems/SAM.Analytical.Systems/Classes/Result/SystemEnergyCentreValues.cs
+1 −1 SAM_Systems/SAM.Analytical.Systems/Classes/Result/SystemSpaceResult.cs
+68 −0 SAM_Systems/SAM.Analytical.Systems/Classes/Setback.cs
+40 −0 SAM_Systems/SAM.Analytical.Systems/Classes/Setpoint.cs
+75 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SetpointSetback.cs
+0 −10 SAM_Systems/SAM.Analytical.Systems/Classes/SizableValue.cs
+36 −12 SAM_Systems/SAM.Analytical.Systems/Classes/SizedValue.cs
+51 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemController.cs
+82 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemDifferenceController.cs
+67 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemIfLogicalController.cs
+65 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemLogicalController.cs
+52 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemMaxLogicalController.cs
+52 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemMinLogicalController.cs
+111 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemNormalController.cs
+52 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemNotLogicalController.cs
+79 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemOutdoorController.cs
+86 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemPassthroughController.cs
+93 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemSensorController.cs
+88 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemSetpointController.cs
+52 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemController/SystemSigLogicalController.cs
+2 −2 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemDXCoil.cs
+1 −1 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemFan.cs
+52 −0 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemSensor.cs
+1 −1 SAM_Systems/SAM.Analytical.Systems/Classes/SystemComponent/SystemSpace.cs
+0 −5 SAM_Systems/SAM.Analytical.Systems/Classes/UnlimitedValue.cs
+36 −0 SAM_Systems/SAM.Analytical.Systems/Create/DisplayObject.cs
+9 −0 SAM_Systems/SAM.Analytical.Systems/Enums/AnalyticalSystemComponentType.cs
+14 −0 SAM_Systems/SAM.Analytical.Systems/Enums/LogicalControllerType.cs
+20 −0 SAM_Systems/SAM.Analytical.Systems/Enums/NormalControllerDataType.cs
+12 −0 SAM_Systems/SAM.Analytical.Systems/Enums/NormalControllerLimit.cs
+15 −0 SAM_Systems/SAM.Analytical.Systems/Enums/OutdoorControllerDataType.cs
+30 −0 SAM_Systems/SAM.Analytical.Systems/Enums/SystemEnergyCentreDataType.cs
+8 −0 SAM_Systems/SAM.Analytical.Systems/Interfaces/IDisplaySystemController.cs
+9 −0 SAM_Systems/SAM.Analytical.Systems/Interfaces/ISetback.cs
+8 −0 SAM_Systems/SAM.Analytical.Systems/Interfaces/ISetpoint.cs
+0 −2 SAM_Systems/SAM.Analytical.Systems/Interfaces/ISizableValue.cs
+9 −0 SAM_Systems/SAM.Analytical.Systems/Interfaces/ISystemController.cs
+0 −2 SAM_Systems/SAM.Analytical.Systems/Modify/Copy.cs
+27 −0 SAM_Systems/SAM.Analytical.Systems/Query/Type.cs
+107 −2 SAM_Systems/SAM.Core.Systems/Classes/SystemPlantRoom.cs
+1 −1 SAM_Systems/SAM.Core.Systems/Classes/SystemType.cs
+7 −0 SAM_Systems/SAM.Core.Systems/Interfaces/ISystemSensor.cs
+8 −0 SAM_Systems/SAM.Geometry.Systems/Classes/SystemGeometrySymbol.cs
+44 −0 SAM_Systems/SAM.Geometry.Systems/Query/ConvertIndex.cs
+44 −0 SAM_Systems/SAM.Geometry.Systems/Query/IndexDictionary.cs
+38 −0 SAM_Systems/SAM.Geometry.Systems/Query/Point2DDictionary.cs
+3,461 −87 files/resources/Analytical/Systems/SAM_DisplaySystemManager.JSON
2 changes: 1 addition & 1 deletion SAM_Tas
Submodule SAM_Tas updated 54 files
+4 −4 Grasshopper/SAM.Analytical.Grasshopper.Tas.TPD/Component/SAMSystemsCreateTPDBySystemEnergyCentre.cs
+5 −4 Grasshopper/SAM.Analytical.Grasshopper.Tas.TPD/Component/SAMSystemsFromTPD.cs
+36 −0 Grasshopper/SAM.Analytical.Grasshopper.Tas.TPD/Component/SAMSystemsResultPeriod.cs
+200 −0 Grasshopper/SAM.Analytical.Grasshopper.Tas.TPD/Component/TasSystemResults.cs
+5 −5 Grasshopper/SAM.Analytical.Grasshopper.Tas.TPD/Component/TasSystemSpaceResults.cs
+3 −0 Grasshopper/SAM.Analytical.Grasshopper.Tas.TPD/SAM.Analytical.Grasshopper.Tas.TPD.csproj
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Tas/Component/SAMAnalyticalSurfaceSimulationResults.cs
+1 −1 Grasshopper/SAM.Analytical.Grasshopper.Tas/Component/TasTSDDailyIndoorComfortTemperatures.cs
+5 −3 Grasshopper/SAM.Core.Grasshopper.Tas/SAM.Core.Grasshopper.Tas.csproj
+0 −10 SAM_Tas/SAM.Analytical.Tas.TPD/Classes/LuaModifier.cs
+15 −2 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/Duty.cs
+2 −2 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/Modifier.cs
+54 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/NormalControllerDataType.cs
+24 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/NormalControllerLimit.cs
+54 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/OutdoorControllerDataType.cs
+72 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/ResultDataType.cs
+32 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/ResultPeriod.cs
+146 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/SystemController.cs
+2 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/SystemDXCoil.cs
+14 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/SystemModel.cs
+2 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToSAM/SystemPlantRoom.cs
+54 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/Controller.cs
+29 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/DXCoil.cs
+25 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/DesiccantWheel.cs
+20 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/Optimiser.cs
+44 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/SprayHumidifier.cs
+25 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/SteamHumidifier.cs
+21 −2 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/TPD.cs
+73 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/tpdResultVectorType.cs
+31 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Convert/ToTPD/tpdResultsPeriod.cs
+41 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Create/ObjectReference.cs
+73 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Create/Reference.cs
+15 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Enums/ResultPeriod.cs
+96 −45 SAM_Tas/SAM.Analytical.Tas.TPD/Modify/Add.cs
+485 −23 SAM_Tas/SAM.Analytical.Tas.TPD/Modify/Connect.cs
+0 −1 SAM_Tas/SAM.Analytical.Tas.TPD/Modify/CopyResults.cs
+3 −3 SAM_Tas/SAM.Analytical.Tas.TPD/Query/AnalyticalSystemComponentType.cs
+32 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/ChainControlArcs.cs
+1 −2 SAM_Tas/SAM.Analytical.Tas.TPD/Query/ConnectedSystemComponents.cs
+108 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/ControlArcs.cs
+99 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/Controller.cs
+31 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/ControllerProfilePoints.cs
+57 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/Controllers.cs
+29 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/DesignConditionLoads.cs
+60 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/Ducts.cs
+106 −1 SAM_Tas/SAM.Analytical.Tas.TPD/Query/Point2Ds.cs
+48 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/Reference.cs
+32 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/SensorArcs.cs
+1 −1 SAM_Tas/SAM.Analytical.Tas.TPD/Query/SystemComponent.cs
+102 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/SystemController.cs
+108 −0 SAM_Tas/SAM.Analytical.Tas.TPD/Query/SystemEnergyCentreResults.cs
+1 −3 SAM_Tas/SAM.Analytical.Tas/Delegates/WorkflowCalculatorUpdatedEventHandler.cs
+1 −6 SAM_Tas/SAM.Analytical.Tas/Modify/RunWorkflow.cs
+0 −8 SAM_Tas/SAM.Core.Tas/SAM.Core.Tas.csproj

0 comments on commit 7d78fdb

Please sign in to comment.