Restructure base classes #1575

ibpsa · Jun 14, 2022 · c8df97d · c8df97d
1 parent 25c9682
commit c8df97d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/IBPSA/Electrical/BaseClasses/BaseClasses/package.mo b/IBPSA/Electrical/BaseClasses/BaseClasses/package.mo
diff --git a/IBPSA/Electrical/BaseClasses/PVSystems/BaseClasses.mo b/IBPSA/Electrical/BaseClasses/PVSystems/BaseClasses.mo
@@ -0,0 +1,20 @@
+within IBPSA.Electrical.BaseClasses.PVSystems;
+package BaseClasses "Base parameters for PV Model"
+  extends Modelica.Icons.BasesPackage;
+
+  partial model PartialPVElectrical
+    "Partial electrical model for PV module model"
+    annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+          coordinateSystem(preserveAspectRatio=false)));
+  end PartialPVElectrical;
+
+  partial model PartialPVThermal
+    annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+          coordinateSystem(preserveAspectRatio=false)));
+  end PartialPVThermal;
+
+  partial model PartialPVOptical
+    annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+          coordinateSystem(preserveAspectRatio=false)));
+  end PartialPVOptical;
+end BaseClasses;
diff --git a/IBPSA/Electrical/BaseClasses/PVSystems/PVSimple.mo b/IBPSA/Electrical/BaseClasses/PVSystems/PVSimple.mo
@@ -2,15 +2,15 @@ within IBPSA.Electrical.BaseClasses.PVSystems;
 model PVSimple "Simple PV model with internal or external MPP tracking"
 
   replaceable model ElectricalModel =
-    IBPSA.Electrical.BaseClasses.BaseClasses.PartialPVElectrical
+    IBPSA.Electrical.BaseClasses.PVSystems.BaseClasses.PartialPVElectrical
    "Model with electrical characteristics";
 
   replaceable model ThermalModel =
-    IBPSA.Electrical.BaseClasses.BaseClasses.PartialPVThermal
+    IBPSA.Electrical.BaseClasses.PVSystems.BaseClasses.PartialPVThermal
     "Model with thermal characteristics";
 
   replaceable model OpticalModel =
-    IBPSA.Electrical.BaseClasses.BaseClasses.PartialPVOptical
+    IBPSA.Electrical.BaseClasses.PVSystems.BaseClasses.PartialPVOptical
     "Model with optical characteristics"
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)));

diff --git a/IBPSA/Electrical/BaseClasses/PVSystems/package.order b/IBPSA/Electrical/BaseClasses/PVSystems/package.order
@@ -1 +1,2 @@
 PVSimple
+BaseClasses
diff --git a/IBPSA/Electrical/BaseClasses/package.order b/IBPSA/Electrical/BaseClasses/package.order
@@ -1,2 +1 @@
-BaseClasses
 PVSystems