Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Zero_engine.alpx
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,6 @@
<Folder>
<Id>1752681631114</Id>
<Name><![CDATA[GIS]]></Name>
<ParentId>1752677832758</ParentId>
</Folder>
<Folder>
<Id>1752681639768</Id>
Expand Down
51 changes: 9 additions & 42 deletions _alp/Agents/EnergyModel/EmbeddedObjects.xml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -223,9 +223,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -967,7 +964,7 @@
<Name><![CDATA[p_curtailmentMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_address]]></Name>
Expand All @@ -990,9 +987,6 @@
<Parameter>
<Name><![CDATA[p_eigenOprit]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_address]]></Name>
</Parameter>
Expand All @@ -1011,9 +1005,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_buildingType_heatingPBL]]></Name>
</Parameter>
Expand Down Expand Up @@ -1153,7 +1144,7 @@
<Name><![CDATA[p_curtailmentMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_address]]></Name>
Expand All @@ -1173,9 +1164,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1291,7 +1279,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -1311,9 +1299,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1429,7 +1414,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand Down Expand Up @@ -1488,9 +1473,6 @@
<Parameter>
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
</Parameter>
Expand All @@ -1506,9 +1488,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1624,7 +1603,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -1641,9 +1620,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -1759,7 +1735,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -1779,9 +1755,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -2236,7 +2209,7 @@
<Name><![CDATA[p_curtailmentMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_address]]></Name>
Expand Down Expand Up @@ -2286,9 +2259,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down Expand Up @@ -2405,7 +2375,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand Down Expand Up @@ -2458,9 +2428,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCDistrictHeating/AOC.GCDistrictHeating.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -84,9 +84,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCEnergyConversion/AOC.GCEnergyConversion.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -85,9 +85,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCEnergyProduction/AOC.GCEnergyProduction.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -84,9 +84,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCGridBattery/AOC.GCGridBattery.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -84,9 +84,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCHouse/AOC.GCHouse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<Name><![CDATA[p_curtailmentMode]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_address]]></Name>
Expand All @@ -84,9 +84,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCIndustry/AOC.GCIndustry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -85,9 +85,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCNeighborhood/AOC.GCNeighborhood.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -84,9 +84,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCPublicCharger/AOC.GCPublicCharger.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -84,9 +84,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
5 changes: 1 addition & 4 deletions _alp/Agents/GCUtility/AOC.GCUtility.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<Name><![CDATA[p_purposeBAG]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_name]]></Name>
<Name><![CDATA[p_annotation]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_curtailmentMode]]></Name>
Expand All @@ -84,9 +84,6 @@
<Parameter>
<Name><![CDATA[v_isActive]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_uid]]></Name>
</Parameter>
</Parameters>
<Generic>false</Generic>
<GenericParameter>
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/GridConnection/Code/Functions.java
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){

f_connectToParents();
if ( p_parentNodeElectric == null ) {
traceln("GC: %s with id %s and name %s", this, p_gridConnectionID, p_name);
traceln("GC: %s with id %s", this, p_gridConnectionID);
traceln("GN id %s", p_parentNodeElectricID);
throw new RuntimeException("Exception: GridConnection not connected to GridNodeElectric!");
}
Expand Down
Loading