pvlib · cwhanse · Sep 19, 2025 · Sep 19, 2025 · Sep 19, 2025 · Sep 19, 2025
diff --git a/.github/workflows/validate_xml_with_xsd_and_schematron.yml b/.github/workflows/validate_xml_with_xsd_and_schematron.yml
@@ -20,7 +20,7 @@ on:
 
 jobs:
   discover:
-    name: Discover *.pv2 example files
+    name: Discover *.pvc2 example files
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.build.outputs.matrix }}
@@ -32,7 +32,7 @@ jobs:
           python3 - <<'PY' > matrix.json
           import json, re, pathlib
           root = pathlib.Path("Examples")
-          pattern = re.compile(r".+\.pv2$", re.IGNORECASE)
+          pattern = re.compile(r".+\.pvc2$", re.IGNORECASE)
           files = []
           if root.exists():
               for p in sorted(root.iterdir()):
@@ -64,7 +64,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           sparse-checkout: |
-            schema/pvcollada_schema_0.1.xsd
+            schema/pvcollada_schema_2.0.xsd
             schema/pvcollada_structure_2.0.sch
             schema/pvcollada_references_2.0.sch
             schema/pvcollada_business_2.0.sch
@@ -78,7 +78,7 @@ jobs:
         run: |
           python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \
             "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \
-            --xsd pvcollada_schema_0.1.xsd
+            --xsd pvcollada_schema_2.0.xsd
 
       - name: Validate against Structure Schematron
         working-directory: schema

diff --git a/diagrams/01 - Trackers in 3D.png → Development/diagrams/01 - Trackers in 3D.png b/diagrams/01 - Trackers in 3D.png → Development/diagrams/01 - Trackers in 3D.png
diff --git a/...2 - Trackers from top without strings.png → ...2 - Trackers from top without strings.png b/...2 - Trackers from top without strings.png → ...2 - Trackers from top without strings.png
diff --git a/...s/03 - Trackers from top with strings.png → ...s/03 - Trackers from top with strings.png b/...s/03 - Trackers from top with strings.png → ...s/03 - Trackers from top with strings.png
diff --git a/...4 - pvcollada2 structure - High level.png → ...4 - pvcollada2 structure - High level.png b/...4 - pvcollada2 structure - High level.png → ...4 - pvcollada2 structure - High level.png
diff --git a/... structure - High level with a module.png → ... structure - High level with a module.png b/... structure - High level with a module.png → ... structure - High level with a module.png
diff --git a/...with a terrain and a instance_terrain.png → ...with a terrain and a instance_terrain.png b/...with a terrain and a instance_terrain.png → ...with a terrain and a instance_terrain.png
diff --git a/...sic models and a simple tracker model.png → ...sic models and a simple tracker model.png b/...sic models and a simple tracker model.png → ...sic models and a simple tracker model.png
diff --git a/...te tracker model and a instance_table.png → ...te tracker model and a instance_table.png b/...te tracker model and a instance_table.png → ...te tracker model and a instance_table.png
diff --git a/...full 3D version with 3 instance_table.png → ...full 3D version with 3 instance_table.png b/...full 3D version with 3 instance_table.png → ...full 3D version with 3 instance_table.png
diff --git a/... pvcollada2_structure - pv parts only.png → ... pvcollada2_structure - pv parts only.png b/... pvcollada2_structure - pv parts only.png → ... pvcollada2_structure - pv parts only.png
diff --git a/...tructure - pv parts with references 1.png → ...tructure - pv parts with references 1.png b/...tructure - pv parts with references 1.png → ...tructure - pv parts with references 1.png
diff --git a/...tructure - pv parts with references 2.png → ...tructure - pv parts with references 2.png b/...tructure - pv parts with references 2.png → ...tructure - pv parts with references 2.png
diff --git a/...tructure - pv parts with references 3.png → ...tructure - pv parts with references 3.png b/...tructure - pv parts with references 3.png → ...tructure - pv parts with references 3.png
diff --git a/...tructure - pv parts with references 4.png → ...tructure - pv parts with references 4.png b/...tructure - pv parts with references 4.png → ...tructure - pv parts with references 4.png
diff --git a/...2_structure - pv parts with circuit 1.png → ...2_structure - pv parts with circuit 1.png b/...2_structure - pv parts with circuit 1.png → ...2_structure - pv parts with circuit 1.png
diff --git a/...2_structure - pv parts with circuit 2.png → ...2_structure - pv parts with circuit 2.png b/...2_structure - pv parts with circuit 2.png → ...2_structure - pv parts with circuit 2.png
diff --git a/...2_structure - pv parts with circuit 3.png → ...2_structure - pv parts with circuit 3.png b/...2_structure - pv parts with circuit 3.png → ...2_structure - pv parts with circuit 3.png
diff --git a/...2_structure - pv parts with circuit 4.png → ...2_structure - pv parts with circuit 4.png b/...2_structure - pv parts with circuit 4.png → ...2_structure - pv parts with circuit 4.png
diff --git a/diagrams/README.md → Development/diagrams/README.md b/diagrams/README.md → Development/diagrams/README.md
diff --git a/Development/diagrams/pvcollada2_structure_basic_1.png b/Development/diagrams/pvcollada2_structure_basic_1.png
diff --git a/Development/diagrams/pvcollada2_structure_basic_4.png b/Development/diagrams/pvcollada2_structure_basic_4.png
diff --git a/...leFixedPVC2_without_electrical_layout.pv2 → ...eFixedPVC2_without_electrical_layout.pvc2 b/...leFixedPVC2_without_electrical_layout.pv2 → ...eFixedPVC2_without_electrical_layout.pvc2
diff --git a/...rackersPVC2_without_electrical_layout.pv2 → ...ackersPVC2_without_electrical_layout.pvc2 b/...rackersPVC2_without_electrical_layout.pv2 → ...ackersPVC2_without_electrical_layout.pvc2
diff --git a/...ixedPVC2_with_basic_electrical_layout.pv2 → ...xedPVC2_with_basic_electrical_layout.pvc2 b/...ixedPVC2_with_basic_electrical_layout.pv2 → ...xedPVC2_with_basic_electrical_layout.pvc2
diff --git a/...kersPVC2_with_basic_electrical_layout.pv2 → ...ersPVC2_with_basic_electrical_layout.pvc2 b/...kersPVC2_with_basic_electrical_layout.pv2 → ...ersPVC2_with_basic_electrical_layout.pvc2
diff --git a/...impleFixedPVC2_with_electrical_layout.pv2 → ...mpleFixedPVC2_with_electrical_layout.pvc2 b/...impleFixedPVC2_with_electrical_layout.pv2 → ...mpleFixedPVC2_with_electrical_layout.pvc2
diff --git a/docs/dev_guide.md b/docs/dev_guide.md
@@ -8,7 +8,7 @@ This guide explains how to use the `pvcollada_schema_0.1.xsd` XML schema file in
 
 The schema file is located at:
 ```
-schema/pvcollada_schema_0.1.xsd
+schema/pvcollada_schema_2.0.xsd
 ```
 
 This schema imports the COLLADA schema (`collada_schema_1_5.xsd`) and defines enumerations and types specific to photovoltaic (PV) system design.
@@ -42,8 +42,8 @@ A Python script is provided at `schema/validate.py` that uses `lxml` to validate
 ```python
 from lxml import etree
 
-XML_FILE_PATH = "../Examples/05 - VerySimpleFixedPVC2_with_electrical_layout_v3.pvc"
-XSD_FILE_PATH = "pvcollada_schema_0.1.xsd"
+XML_FILE_PATH = "../Examples/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2"
+XSD_FILE_PATH = "pvcollada_schema_2.0.xsd"
 
 with open(XML_FILE_PATH, "rb") as xml:
     xml_doc = etree.XML(xml.read())
@@ -67,7 +67,7 @@ else:
 ### Automatically (using GitHub Actions)
 
 The repository includes a GitHub Actions workflow:  
-`.github/workflows/validate_xml_with_xsd.yml`
+`.github/workflows/validate_xml_with_xsd_and_schematron.yml`
 
 This workflow automatically validates example PVCollada XML files on every push or pull request affecting relevant files.
 
@@ -82,25 +82,24 @@ Key steps:
 
 Example XMLs are found in the `Examples/` directory.  
 Example:  
-`Examples/05 - VerySimpleFixedPVC2_with_electrical_layout_v3.pvc`
+`Examples/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2`
 
 ---
 
 ## 5. Extending the Schema
 
 If you need to add new enumerations or elements:
-- Edit `schema/pvcollada_schema_0.1.xsd`.
-- Ensure new values are added as `<xs:enumeration value="..."/>` or new types as needed.
+- Edit `schema/pvcollada_schema_2.0.xsd`.
 - Update or add example XML files to reflect the changes.
 - Run the validation script to confirm correctness.
 
 ---
 
 ## 6. References
 
-- [pvcollada_schema_0.1.xsd (GitHub link)](https://github.com/pvlib/pvcollada/blob/main/schema/pvcollada_schema_0.1.xsd)
+- [pvcollada_schema_2.0.xsd (GitHub link)](https://github.com/pvlib/pvcollada/blob/main/schema/pvcollada_schema_2.0.xsd)
 - [validate.py](https://github.com/pvlib/pvcollada/blob/main/schema/validate.py)
-- [Validation Workflow](https://github.com/pvlib/pvcollada/blob/main/.github/workflows/validate_xml_with_xsd.yml)
+- [Validation Workflow](https://github.com/pvlib/pvcollada/blob/main/.github/workflows/validate_xml_with_xsd_and_schematron.yml)
 - [Browse more files in the repository](https://github.com/pvlib/pvcollada)
 
 ---

diff --git a/schema/pvcollada_schema_1_4.xsd → schema/pvcollada_schema_1.0.xsd b/schema/pvcollada_schema_1_4.xsd → schema/pvcollada_schema_1.0.xsd
diff --git a/schema/pvcollada_schema_0.1.xsd → schema/pvcollada_schema_2.0.xsd b/schema/pvcollada_schema_0.1.xsd → schema/pvcollada_schema_2.0.xsd
diff --git a/schema/validate.py b/schema/validate.py
@@ -14,8 +14,8 @@
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 # Default file paths
-DEFAULT_XML_FILE = os.path.join(SCRIPT_DIR, "../Examples/05 - VerySimpleFixedPVC2_with_electrical_layout.pv2")
-XSD_FILE_PATH = os.path.join(SCRIPT_DIR, "pvcollada_schema_0.1.xsd")
+DEFAULT_XML_FILE = os.path.join(SCRIPT_DIR, "../Examples/05 - VerySimpleFixedPVC2_with_electrical_layout.pvc2")
+XSD_FILE_PATH = os.path.join(SCRIPT_DIR, "pvcollada_schema_2.0.xsd")
 SCH_STRUCTURE_FILE = os.path.join(SCRIPT_DIR, "pvcollada_structure_2.0.sch")
 SCH_REFERENCES_FILE = os.path.join(SCRIPT_DIR, "pvcollada_references_2.0.sch")
 SCH_BUSINESS_FILE = os.path.join(SCRIPT_DIR, "pvcollada_business_2.0.sch")