Skip to content

Commit 7798957

Browse files
cwhansecwhanse
committed
move cable_to_parent to module_array
1 parent e783fee commit 7798957

File tree

2 files changed

+8
-35
lines changed

2 files changed

+8
-35
lines changed

‎Examples/05 - VerySimpleFixedPVC2_with_electrical_layout_v3.pvc‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -179,32 +179,24 @@
179179
<!-- first string tag => the string connected to this mppt input -->
180180
<pv:string id="string1">
181181
<pv:module_array>
182+
<!-- Cable between the module_array and the inverter -->
183+
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance4" />
182184
<pv:module_layout url="#rackId1">
183-
<!-- Cable between the string and the inverter -->
184-
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance4" />
185185
<pv:position_in_string>1</pv:position_in_string>
186186
<pv:row>1</pv:row>
187187
<pv:column>1</pv:column>
188188
</pv:module_layout>
189189
<pv:module_layout url="#rackId1">
190-
<!-- Cable between the module and its neighbor in the string -->
191-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance5" />
192190
<pv:position_in_string>2</pv:position_in_string>
193191
<pv:row>1</pv:row>
194192
<pv:column>2</pv:column>
195193
</pv:module_layout>
196194
<pv:module_layout url="#rackId1">
197-
<!-- Cable between the module and its neighbor in the string -->
198-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance6" />
199195
<pv:position_in_string>3</pv:position_in_string>
200196
<pv:row>1</pv:row>
201197
<pv:column>3</pv:column>
202198
</pv:module_layout>
203199
<pv:module_layout url="#rackId1">
204-
<!-- Cable between the module and its neighbor in the string -->
205-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance7" />
206-
<!-- Cable between the string and the inverter -->
207-
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance8" />
208200
<pv:position_in_string>4</pv:position_in_string>
209201
<pv:row>1</pv:row>
210202
<pv:column>4</pv:column>
@@ -225,32 +217,24 @@
225217
<!-- second string tag => the string connected to this mppt input -->
226218
<pv:string id="string2">
227219
<pv:module_array>
220+
<!-- Cable between the module_array and the inverter -->
221+
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance10" />
228222
<pv:module_layout url="#rackId2">
229-
<!-- Cable between the string and the inverter -->
230-
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance10" />
231223
<pv:position_in_string>1</pv:position_in_string>
232224
<pv:row>1</pv:row>
233225
<pv:column>1</pv:column>
234226
</pv:module_layout>
235227
<pv:module_layout url="#rackId2">
236-
<!-- Cable between the module and its neighbor in the string -->
237-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance11" />
238228
<pv:position_in_string>2</pv:position_in_string>
239229
<pv:row>1</pv:row>
240230
<pv:column>2</pv:column>
241231
</pv:module_layout>
242232
<pv:module_layout url="#rackId2">
243-
<!-- Cable between the module and its neighbor in the string -->
244-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance12" />
245233
<pv:position_in_string>3</pv:position_in_string>
246234
<pv:row>1</pv:row>
247235
<pv:column>3</pv:column>
248236
</pv:module_layout>
249237
<pv:module_layout url="#rackId2">
250-
<!-- Cable between the module and its neighbor in the string -->
251-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance13" />
252-
<!-- Cable between the string and the inverter -->
253-
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance14" />
254238
<pv:position_in_string>4</pv:position_in_string>
255239
<pv:row>1</pv:row>
256240
<pv:column>4</pv:column>
@@ -271,32 +255,24 @@
271255
<!-- third string tag => the string connected to this mppt input -->
272256
<pv:string id="string3">
273257
<pv:module_array>
258+
<!-- Cable between the module_array and the inverter -->
259+
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance16" />
274260
<pv:module_layout url="#rackId3">
275-
<!-- Cable between the string and the inverter -->
276-
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance16" />
277261
<pv:position_in_string>1</pv:position_in_string>
278262
<pv:row>1</pv:row>
279263
<pv:column>1</pv:column>
280264
</pv:module_layout>
281265
<pv:module_layout url="#rackId3">
282-
<!-- Cable between the module and its neighbor in the string -->
283-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance17" />
284266
<pv:position_in_string>2</pv:position_in_string>
285267
<pv:row>1</pv:row>
286268
<pv:column>2</pv:column>
287269
</pv:module_layout>
288270
<pv:module_layout url="#rackId3">
289-
<!-- Cable between the module and its neighbor in the string -->
290-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance18" />
291271
<pv:position_in_string>3</pv:position_in_string>
292272
<pv:row>1</pv:row>
293273
<pv:column>3</pv:column>
294274
</pv:module_layout>
295275
<pv:module_layout url="#rackId3">
296-
<!-- Cable between the module and its neighbor in the string -->
297-
<pv:cable_to_neighbor url="#DCCableModel1" length="1" id="cableInstance19" />
298-
<!-- Cable between the string and the inverter -->
299-
<pv:cable_to_parent url="#DCCableModel1" length="3" id="cableInstance20" />
300276
<pv:position_in_string>4</pv:position_in_string>
301277
<pv:row>1</pv:row>
302278
<pv:column>4</pv:column>

‎schema/pvcollada_schema_0.1.xsd‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -614,16 +614,13 @@ xmlns:collada="http://www.collada.org/2008/03/COLLADASchema">
614614
<!-- module_array: contains one or more module_layout elements -->
615615
<xs:complexType name="module_array_type">
616616
<xs:sequence>
617+
<xs:element name="cable_to_parent" type="cable_to_type" />
617618
<xs:element name="module_layout" type="module_layout_type" maxOccurs="unbounded" />
618619
</xs:sequence>
619620
</xs:complexType>
620-
<!-- module_layout: must have at least one cable (either cable_to_parent or cable_to_neighbor) plus one row and one column -->
621+
<!-- module_layout: must describe position (row, column) and position in string -->
621622
<xs:complexType name="module_layout_type">
622623
<xs:sequence>
623-
<xs:choice maxOccurs="2">
624-
<xs:element name="cable_to_parent" type="cable_to_type" />
625-
<xs:element name="cable_to_neighbor" type="cable_to_type" />
626-
</xs:choice>
627624
<xs:element name="position_in_string" type="xs:integer" />
628625
<xs:element name="row" type="xs:integer" />
629626
<xs:element name="column" type="xs:integer" />

0 commit comments

Comments
 (0)