From 85d5396c24f9b264dd03425decd9247a6c707c8c Mon Sep 17 00:00:00 2001
From: "Glen K. Halley" <Glen@GKHSoftware.com>
Date: Tue, 14 Nov 2023 20:51:16 -0600
Subject: [PATCH] Power System Stabilizer has work left.

---
 .editix/config.xml                            |  2 +-
 .editix/workspace.xml                         | 12 ++--
 CIMtoMO4.xsl                                  |  7 +-
 imports/Lines.xsl                             |  2 +-
 imports/Shunts.xsl                            |  1 +
 imports/dynamics/ExcAC1A.xsl                  |  2 +-
 imports/dynamics/ExcAC2A.xsl                  |  2 +-
 imports/dynamics/ExcIEEEAC1A.xsl              |  2 +-
 imports/dynamics/ExcIEEEAC2A.xsl              |  2 +-
 imports/dynamics/ExcIEEEDC1A.xsl              |  2 +-
 imports/dynamics/ExcIEEEST1A.xsl              |  2 +-
 imports/dynamics/ExcSCRX.xsl                  |  2 +-
 imports/dynamics/ExcSEXS.xsl                  |  2 +-
 imports/dynamics/ExcUserDefined.xsl           | 26 +++++++
 imports/dynamics/GovGAST.xsl                  |  2 +-
 imports/dynamics/GovHydro1.xsl                |  2 +-
 imports/dynamics/GovSteam0.xsl                |  2 +-
 imports/dynamics/GovSteamSGO.xsl              |  2 +-
 imports/dynamics/PSSUserDefined.xsl           | 26 +++++++
 .../dynamics/ProprietaryParameterDynamics.xsl |  4 +-
 imports/dynamics/PssIEEE2B.xsl                |  2 +-
 imports/dynamics/SynchMachineTimeConst.xsl    | 67 +++++++++----------
 imports/version4/Connections.xsl              |  4 +-
 imports/version4/Loads.xsl                    |  4 +-
 imports/version4/Transformers.xsl             |  2 +-
 25 files changed, 118 insertions(+), 65 deletions(-)
 create mode 100644 imports/dynamics/PSSUserDefined.xsl

diff --git a/.editix/config.xml b/.editix/config.xml
index b1502df..3dbaefd 100644
--- a/.editix/config.xml
+++ b/.editix/config.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><root nodestate="project/examples/nordic-44/CIM_new;project/examples/nordic-44;project/examples;project;project/examples/bus-14"/>
+<?xml version="1.0" encoding="UTF-8"?><root nodestate="project"/>
diff --git a/.editix/workspace.xml b/.editix/workspace.xml
index 0600d83..035668f 100644
--- a/.editix/workspace.xml
+++ b/.editix/workspace.xml
@@ -304,7 +304,7 @@
 <param name="xslt.param.name.4" value="time"/>
 </file>
 <file path="C:\Users\glen\IdeaProjects\XSLTConferencePaper"/>
-<file open="true" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\CIMtoMO4.xsl" type="XSLT">
+<file open="false" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\CIMtoMO4.xsl" type="XSLT">
 <param name="xslt.data.file" value="C:\Users\glen\IdeaProjects\XSLTConferencePaper\examples\bus-14\ieee14_EQ.xml"/>
 <param name="xslt.xslt.file" value="C:\Users\glen\IdeaProjects\XSLTConferencePaper\CIMtoMO4.xsl"/>
 <param name="xslt.fop" value="false"/>
@@ -317,7 +317,7 @@
 <param name="xslt.param.name.2" value="bus"/>
 <param name="xslt.param.value.5" value="1.0"/>
 <param name="xslt.param.name.0" value="filename"/>
-<param name="xslt.param.value.2" value="BUS5__24ee"/>
+<param name="xslt.param.value.2" value="BUS5"/>
 <param name="xslt.param.name.5" value="time"/>
 <param name="xslt.openFile" value="false"/>
 <param name="xslt.param.value.1" value="60.0"/>
@@ -356,7 +356,7 @@
 <param name="lastView" value="Source"/>
 </file>
 <file path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\examples\bus-14"/>
-<file open="true" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\examples\bus-14\ieee14_EQ.xml" type="XML">
+<file open="false" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\examples\bus-14\ieee14_EQ.xml" type="XML">
 <param name="lastView" value="Source"/>
 </file>
 <file open="true" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\examples\nordic-44\CIM_new\N44_BC_EQ.xml" type="XML">
@@ -408,7 +408,7 @@
 <file open="false" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\ieee14.mo" type="">
 <param name="lastView" value="Source"/>
 </file>
-<file open="true" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\examples\bus-14\ieee14_DY.xml" type="XML">
+<file open="false" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\examples\bus-14\ieee14_DY.xml" type="XML">
 <param name="lastView" value="Source"/>
 </file>
 <file path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\imports\dynamics\PowerSystemStabilizerUserDefined.xsl"/>
@@ -439,4 +439,8 @@
 </file>
 <file path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\imports\version4\Transformers.xsl"/>
 <file path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\imports\version4"/>
+<file open="false" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\imports\dynamics\PSSUserDefined.xsl">
+<param name="encoding" value="AUTOMATIC"/>
+</file>
+<file open="false" path="C:\Users\glen\IdeaProjects\XSLTConferencePaper\imports\dynamics\PssIEEE2B.xsl" type="XSLT"/>
 </root>
diff --git a/CIMtoMO4.xsl b/CIMtoMO4.xsl
index 8e73b22..3a08699 100644
--- a/CIMtoMO4.xsl
+++ b/CIMtoMO4.xsl
@@ -43,6 +43,9 @@
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:function>
+	<xsl:function name="gkh:powerBase" as="xs:double">
+		<xsl:value-of select="$base * 10*e6"/>
+	</xsl:function>
 	<xsl:function name="gkh:baseImpedance" as="xs:double?">
 		<xsl:param name="basePower" as="xs:double?"/>
 		<xsl:param name="voltage" as="xs:double?"/>
@@ -156,8 +159,8 @@ OpenIPSL.Electrical.Events.PwFault Fault (R = </xsl:text>
 		<xsl:text>
 equation
 </xsl:text>
-		<xsl:apply-templates select="cim:Terminal"/>
-		<xsl:text>// -- Connect fault event:
+<xsl:apply-templates select="cim:Terminal"/>
+<xsl:text>// -- Connect fault event:
 		
 connect(Fault.p, </xsl:text>
 		<xsl:copy-of select="$bus"/>
diff --git a/imports/Lines.xsl b/imports/Lines.xsl
index beca571..60e0723 100644
--- a/imports/Lines.xsl
+++ b/imports/Lines.xsl
@@ -6,7 +6,7 @@
 	<xsl:output method="text" indent="no"/>
 	<xsl:template match="cim:ACLineSegment">
 		<xsl:variable name="baseVoltage" select="gkh:baseVoltage(cim:ConductingEquipment.BaseVoltage/substring(@rdf:resource,2))"/>
-		<xsl:variable name="baseImpedance" select="gkh:baseImpedance(10002020,$baseVoltage)"/>
+		<xsl:variable name="baseImpedance" select="gkh:baseImpedance(gkh:powerBase,$baseVoltage)"/>
 		<xsl:text>OpenIPSL.Electrical.Branches.PwLine </xsl:text>
 		<xsl:value-of select="gkh:compliantName(concat('L',cim:IdentifiedObject.name))"/>
 		<xsl:text>(R=</xsl:text>
diff --git a/imports/Shunts.xsl b/imports/Shunts.xsl
index 298fe4c..ac10552 100644
--- a/imports/Shunts.xsl
+++ b/imports/Shunts.xsl
@@ -6,6 +6,7 @@
 	<xsl:output method="text" indent="no"/>
 	<xsl:template match="cim:LinearShuntCompensator">
 		<xsl:text>OpenIPSL.Electrical.Banks.PSSE.Shunt </xsl:text>
+<xsl:value-of select="concat('SH',cim:IdentifiedObject.name)"/>
 		<xsl:text>(G = </xsl:text>
 		<xsl:value-of select="format-number(cim:LinearShuntCompensator.gPerSection,'0.0000000000#')"/>
 		<xsl:text>,B = </xsl:text>
diff --git a/imports/dynamics/ExcAC1A.xsl b/imports/dynamics/ExcAC1A.xsl
index a3465b7..80c84a7 100644
--- a/imports/dynamics/ExcAC1A.xsl
+++ b/imports/dynamics/ExcAC1A.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcAC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excac1a" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcAC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="AC1A-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcAC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics"><!-- EXAC1 -->
 		<xsl:value-of select="../cim:IdentifiedObject.name"/>
diff --git a/imports/dynamics/ExcAC2A.xsl b/imports/dynamics/ExcAC2A.xsl
index af30fca..eead648 100644
--- a/imports/dynamics/ExcAC2A.xsl
+++ b/imports/dynamics/ExcAC2A.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcAC2A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excac2a" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcAC2A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="AC2A-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcAC2A/cim:ExcitationSystemDynamic.SynchronousMachineDynamics"><!-- EXAC2 -->
 		<xsl:value-of select="../cim:IdentifiedObject.name"/>
diff --git a/imports/dynamics/ExcIEEEAC1A.xsl b/imports/dynamics/ExcIEEEAC1A.xsl
index 38a46fb..61102f6 100644
--- a/imports/dynamics/ExcIEEEAC1A.xsl
+++ b/imports/dynamics/ExcIEEEAC1A.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcIEEEAC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excieeeac1a" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcIEEEAC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="IEEEAC1A-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcAC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics"><!-- EXAC1 -->
 		<xsl:value-of select="../cim:IdentifiedObject.name"/>
diff --git a/imports/dynamics/ExcIEEEAC2A.xsl b/imports/dynamics/ExcIEEEAC2A.xsl
index f218220..af65486 100644
--- a/imports/dynamics/ExcIEEEAC2A.xsl
+++ b/imports/dynamics/ExcIEEEAC2A.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcIEEEAC2A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excieeeac2a" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcIEEEAC2A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="IEEEAC2A-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcAC2A/cim:ExcitationSystemDynamic.SynchronousMachineDynamics"><!-- EXAC2 -->
 		<xsl:value-of select="../cim:IdentifiedObject.name"/>
diff --git a/imports/dynamics/ExcIEEEDC1A.xsl b/imports/dynamics/ExcIEEEDC1A.xsl
index 18eb6da..9619268 100644
--- a/imports/dynamics/ExcIEEEDC1A.xsl
+++ b/imports/dynamics/ExcIEEEDC1A.xsl
@@ -16,7 +16,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcIEEEDC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excieeedc1a" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcIEEEDC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="IEEEDC1A-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcIEEEDC1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics"><!-- ESDC1A -->
 		<xsl:value-of select="../cim:IdentifiedObject.name"/>
diff --git a/imports/dynamics/ExcIEEEST1A.xsl b/imports/dynamics/ExcIEEEST1A.xsl
index 8539e4c..52dbcd5 100644
--- a/imports/dynamics/ExcIEEEST1A.xsl
+++ b/imports/dynamics/ExcIEEEST1A.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcIEEEST1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excieeest1a" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcIEEEST1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="IEEEST1A-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcIEEEST1A/cim:ExcitationSystemDynamics.SynchronousMachineDynamics"><!-- ESST1 -->
 		<xsl:value-of select="../cim:IdentifiedObject.name"/>
diff --git a/imports/dynamics/ExcSCRX.xsl b/imports/dynamics/ExcSCRX.xsl
index 1ac26d2..a07b8ae 100644
--- a/imports/dynamics/ExcSCRX.xsl
+++ b/imports/dynamics/ExcSCRX.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcSCRX/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excscrx" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcSCRX/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="SCRX-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcSCRX/cim:ExcitationSystemDynamics.SynchronousMachineDynamics">
 		<xsl:text>OpenIPSL.Electrical.Controls.PSSE.ES.SCRX exciter(T_AT_B = </xsl:text>
diff --git a/imports/dynamics/ExcSEXS.xsl b/imports/dynamics/ExcSEXS.xsl
index 16ef04f..52aefd9 100644
--- a/imports/dynamics/ExcSEXS.xsl
+++ b/imports/dynamics/ExcSEXS.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ExcSEXS/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="excsexs" use="substring(rdf:resource,2)"/>
+	<xsl:key match="cim:ExcSEXS/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="SEXS-Index" use="substring(rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ExcSEXS/cim:ExcitationSystemDynamics.SynchronousMachineDynamics"><!-- SEXS -->
 		<xsl:value-of select="../cim:IdentifiedObject.name"/>
diff --git a/imports/dynamics/ExcUserDefined.xsl b/imports/dynamics/ExcUserDefined.xsl
index e69de29..22c9e84 100644
--- a/imports/dynamics/ExcUserDefined.xsl
+++ b/imports/dynamics/ExcUserDefined.xsl
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- New XSLT document created with EditiX XML Editor (http://www.editix.com) at Tues Nov 14 18:07:00 CDT 2023 -->
+
+<xsl:stylesheet version="2.0" 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:fn="http://www.w3.org/2005/xpath-functions"
+	xmlns:xdt="http://www.w3.org/2005/xpath-datatypes"
+	xmlns:err="http://www.w3.org/2005/xqt-errors"
+	xmlns:cim="http://iec.ch/TC57/2013/CIM-schema-cim16#"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	exclude-result-prefixes="xs xdt err fn">
+
+	<xsl:output method="text" indent="no"/>
+
+	
+	<xsl:key match="cim:ExcitationSystemUserDefined/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="ExcUser-Index" use="substring(@rdf:resource,2)"/>
+
+	
+	<xsl:template match="cim:ExcitationSystemUserDefined/cim:ExcitationSystemDynamics.SynchronousMachineDynamics">
+		<xsl:value-of select="../cim:IdentifiedObject.name"/><xsl:text> exciter (</xsl:text>
+		<xsl:apply-templates select="key('ExcSys-Index',../@rdf:ID)"/>
+	</xsl:template>
+	
+</xsl:stylesheet>
diff --git a/imports/dynamics/GovGAST.xsl b/imports/dynamics/GovGAST.xsl
index ed2047e..7c375db 100644
--- a/imports/dynamics/GovGAST.xsl
+++ b/imports/dynamics/GovGAST.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:GovGAST/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="governorGAST" use="substring(@rdf:resource,2)"/>
+	<xsl:key match="cim:GovGAST/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="GovGAST-Index" use="substring(@rdf:resource,2)"/>
 	
 	<xsl:template match="cim:GovGAST/cim:TurbineGovernorDynamics.SynchronousMachineDynamics">
 		<xsl:text>OpenIPSL.Electrical.Controls.PSSE.TG.GAST governor(R = </xsl:text>
diff --git a/imports/dynamics/GovHydro1.xsl b/imports/dynamics/GovHydro1.xsl
index b81b180..f934267 100644
--- a/imports/dynamics/GovHydro1.xsl
+++ b/imports/dynamics/GovHydro1.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:GovHydro1/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="governorHydro1" use="substring(@rdf:resource,2)"/>
+	<xsl:key match="cim:GovHydro1/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="Hydro1-Index" use="substring(@rdf:resource,2)"/>
 	
 	<xsl:template match="cim:GovHydro1/cim:TurbineGovernorDynamics.SynchronousMachineDynamics">
 		<xsl:text>OpenIPSL.Electrical.Controls.PSSE.TG.HYGOV governor(R = </xsl:text>
diff --git a/imports/dynamics/GovSteam0.xsl b/imports/dynamics/GovSteam0.xsl
index 6d77be9..b5d5a82 100644
--- a/imports/dynamics/GovSteam0.xsl
+++ b/imports/dynamics/GovSteam0.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:GovSteam0/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="governor" use="substring(@rdf:resource,2)"/>
+	<xsl:key match="cim:GovSteam0/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="TGOV1-Index" use="substring(@rdf:resource,2)"/>
 	
 	<xsl:template match="cim:GovSteam0/cim:TurbineGovernorDynamics.SynchronousMachineDynamics">
 		<xsl:text>OpenIPSL.Electrical.Controls.PSSE.TG.TGOV1 governor(R = </xsl:text>
diff --git a/imports/dynamics/GovSteamSGO.xsl b/imports/dynamics/GovSteamSGO.xsl
index 474509a..2782502 100644
--- a/imports/dynamics/GovSteamSGO.xsl
+++ b/imports/dynamics/GovSteamSGO.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:GovSteamSGO/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="governorSG" use="substring(@rdf:resource,2)"/>
+	<xsl:key match="cim:GovSteamSGO/cim:TurbineGovernorDynamics.SynchronousMachineDynamics" name="GovSG-Index" use="substring(@rdf:resource,2)"/>
 	
 	<xsl:template match="cim:GovSteamSGO/cim:TurbineGovernorDynamics.SynchronousMachineDynamics">
 		<xsl:text>OpenIPSL.Electrical.Controls.PSSE.TG.IEESGO governor(T_1 = </xsl:text>
diff --git a/imports/dynamics/PSSUserDefined.xsl b/imports/dynamics/PSSUserDefined.xsl
new file mode 100644
index 0000000..69e025d
--- /dev/null
+++ b/imports/dynamics/PSSUserDefined.xsl
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- New XSLT document created with EditiX XML Editor (http://www.editix.com) at Sun Mar 27 13:52:00 CDT 2022 -->
+
+<xsl:stylesheet version="2.0" 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:fn="http://www.w3.org/2005/xpath-functions"
+	xmlns:xdt="http://www.w3.org/2005/xpath-datatypes"
+	xmlns:err="http://www.w3.org/2005/xqt-errors"
+	xmlns:cim="http://iec.ch/TC57/2013/CIM-schema-cim16#"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	exclude-result-prefixes="xs xdt err fn">
+
+	<xsl:output method="text" indent="no"/>
+
+	
+	<xsl:key match="cim:PowerSystemStabilizerUserDefined/cim:PowerSystemStabilizerDynamics.ExcitationSystemDynamics" name="PSSUser-Index" use="substring(@rdf:resource,2)"/>
+	
+	<xsl:template match="cim:PowerSystemStabilizerUserDefined/cim:PowerSystemStabilizerDynamics.ExcitationSystemDynamics">
+		<xsl:text>
+	OpenIPSL.Electrical.Controls.PSSE.PSS.STAB2A pss(</xsl:text>
+		<xsl:apply-templates select="key('PSSsys-Index',@rdf:ID)"/>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/imports/dynamics/ProprietaryParameterDynamics.xsl b/imports/dynamics/ProprietaryParameterDynamics.xsl
index 2d12953..73d6151 100644
--- a/imports/dynamics/ProprietaryParameterDynamics.xsl
+++ b/imports/dynamics/ProprietaryParameterDynamics.xsl
@@ -14,8 +14,8 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:ProprietaryParameterDynamics/cim:ProprietaryParameterDynamics.ExcitationSystemUserDefined" name="ppdynamics" use="substring(@rdf:resource,2)"/>
-	<xsl:key match="cim:ExcitationSystemUserDefined/cim:ExcitationSystemDynamics.SynchronousMachineDynamics" name="execsysuser" use="substring(@rdf:resource,2)"/>
+	<xsl:key match="cim:ProprietaryParameterDynamics/cim:ProprietaryParameterDynamics.PowerSystemStabilizerUserDefined" name="PSSsys-Index" use="substring(@rdf:resource,2)"/>
+	<xsl:key match="cim:ProprietaryParameterDynamics/cim:ProprietaryParameterDynamics.ExcitationSystemUserDefined" name="ExcSys-Index" use="substring(@rdf:resource,2)"/>
 	
 	<xsl:template match="cim:ProprietaryParameterDynamics/cim:ProprietaryParameterDynamics.PowerSystemStabilizerUserDefined">
 		<xsl:if test="../cim:ProprietaryParameterDynamics.parameterNumber='0'">
diff --git a/imports/dynamics/PssIEEE2B.xsl b/imports/dynamics/PssIEEE2B.xsl
index bfaf029..1217fdf 100644
--- a/imports/dynamics/PssIEEE2B.xsl
+++ b/imports/dynamics/PssIEEE2B.xsl
@@ -14,7 +14,7 @@
 
 	<xsl:output method="text" indent="no"/>
 	
-	<xsl:key match="cim:PssIEEE2B/cim:PowerSystemStabilizerDynamics.ExcitationSystemDynamics" name="pssieee2b" use="substring(@rdf:resource,2)"/>
+	<xsl:key match="cim:PssIEEE2B/cim:PowerSystemStabilizerDynamics.ExcitationSystemDynamics" name="PSS2B-Index" use="substring(@rdf:resource,2)"/>
 	
 	<xsl:template match="cim:PssIEEE2B/cim:PowerSystemStabilizerDynamics.ExcitationSystemDynamics">
 		<xsl:text>
diff --git a/imports/dynamics/SynchMachineTimeConst.xsl b/imports/dynamics/SynchMachineTimeConst.xsl
index 84190b8..5414baf 100644
--- a/imports/dynamics/SynchMachineTimeConst.xsl
+++ b/imports/dynamics/SynchMachineTimeConst.xsl
@@ -16,19 +16,13 @@
 	<xsl:include href="ExcIEEEAC2A.xsl"/>
 	<xsl:include href="ExcIEEEDC1A.xsl"/>
 	<xsl:include href="ExcIEEEST1A.xsl"/>
-	<!--<xsl:include href="ExcUserDefined.xsl"/>-->
+	<xsl:include href="ExcUserDefined.xsl"/>
 	<xsl:include href="PssIEEE2B.xsl"/>
-	<!--<xsl:include href="PSSUserDefined.xsl"/>
--->
+	<xsl:include href="PSSUserDefined.xsl"/>
 	<xsl:include href="ProprietaryParameterDynamics.xsl"/>
 	<xsl:template match="cim:SynchronousMachineTimeConstantReactance">
 		<xsl:param name="MainName"/>
-		<xsl:param name="M_b"/><!-- Exciters -->
-		<xsl:variable name="ieeeac1a" select="key('excieeeac1a',@rdf:ID)"/>
-		<xsl:variable name="ac1a" select="key('excac1a',@rdf:ID)"/>
-		<xsl:variable name="ac2a" select="key('excac2a',@rdf:ID)"/>
-		<xsl:variable name="ieeest1a" select="key('excieeest1a',@rdf:ID)"/>
-		<xsl:variable name="ieeedc1a" select="key('excieeedc1a',@rdf:ID)"/>
+		<xsl:variable name="M_b" select="gkh:powerBase"/><!-- Exciters -->
 		<xsl:variable name="GenType">
 			<xsl:if test="cim:SynchronousMachineTimeConstantReactance.rotorType/@rdf:resource='http://iec.ch/TC57/2013/CIM-schema-cim16#RotorKind.roundRotor'">
 				<xsl:value-of select="cim:IdentifiedObject.name"/>
@@ -39,7 +33,8 @@
 		</xsl:variable>
 		<xsl:text>  
 OpenIPSL.Electrical.Machines.PSSE.</xsl:text>
-		<xsl:copy-of select="$GenType"/><xsl:text> machine(Tpd0 = </xsl:text>
+		<xsl:copy-of select="$GenType"/>
+		<xsl:text> machine(Tpd0 = </xsl:text>
 		<xsl:value-of select="format-number(cim:SynchronousMachineTimeConstantReactance.tpdo,'0.000000000#')"/>
 		<xsl:text>, Tppd0 = </xsl:text>
 		<xsl:value-of select="format-number(cim:SynchronousMachineTimeConstantReactance.tppdo,'0.000000000#')"/>
@@ -76,10 +71,10 @@ OpenIPSL.Electrical.Machines.PSSE.</xsl:text>
 		<xsl:text>, R_a = </xsl:text>
 		<xsl:value-of select="gkh:defaultNumbers(cim:SynchronousMachineTimeConstantReactance.statorResistance,0.000000000)"/>
 		<xsl:text>, M_b = </xsl:text><xsl:value-of select="$M_b * 1000000"/>
+
 		<xsl:text>, V_b = V_b, P_0 = P_0, Q_0 = Q_0, v_0 = v_0, angle_0 = angle_0) annotation(Placement(transformation(extent = {{20, -10}, {40, 10}})));
-</xsl:text><!--Modelica.Blocks.Sources.Constant uel(k = 0) annotation(Placement(transformation(extent = {{-40, -62}, {-20, -42}})));
-	Modelica.Blocks.Sources.Constant oel(k = 0) annotation(Placement(transformation(extent = {{-40, -94}, {-20, -74}})));
---><!--<xsl:choose>
+</xsl:text>
+		<xsl:choose>
 			<xsl:when test="key('TGOV1-Index',@rdf:ID)">
 				<xsl:apply-templates select="key('TGOV1-Index',@rdf:ID)"/>
 			</xsl:when>
@@ -93,57 +88,56 @@ OpenIPSL.Electrical.Machines.PSSE.</xsl:text>
 				<xsl:apply-templates select="key('GovGAST-Index',@rdf:ID)"/>
 			</xsl:when>
 			<xsl:otherwise>
-<xsl:text>  // No turbine-governor
+				<xsl:text>  // No turbine-governor
 OpenIPSL.Electrical.Controls.PSSE.TG.ConstantPower governor annotation(Placement(transformation(extent = {{-30, 20}, {-10, 40}})));</xsl:text>
 			</xsl:otherwise>
 		</xsl:choose>
--->
 		<xsl:text>
-OpenIPSL.Electrical.Controls.PSSE.ES.</xsl:text><!--		<xsl:choose>
+OpenIPSL.Electrical.Controls.PSSE.ES.</xsl:text>
+		<xsl:choose>
 			<xsl:when test="key('SCRX-Index',@rdf:ID)">
 				<xsl:apply-templates select="key('SCRX-Index',@rdf:ID)"/>
 			</xsl:when>
 			<xsl:when test="key('SEXS-Index',@rdf:ID)">
 				<xsl:apply-templates select="key('SEXS-Index',@rdf:ID)"/>
 			</xsl:when>
-			<xsl:when test="key('ExcUserDefined',@rdf:ID)">
-				<xsl:apply-templates select="key('ExcUserDefined',@rdf:ID)"/>
+			<xsl:when test="key('ExcUser-Index',@rdf:ID)">
+				<xsl:apply-templates select="key('ExcUser-Index',@rdf:ID)"/>
 			</xsl:when>
-			<xsl:when test="$ieeeac1a">
-				<xsl:apply-templates select="$ieeeac1a"/>
+			<xsl:when test="key('IEEEAC1A-Index',@rdf:ID)">
+				<xsl:apply-templates select="key('IEEEAC1A-Index',@rdf:ID)"/>
 			</xsl:when>
-			<xsl:when test="$ac1a">
-				<xsl:apply-templates select="$ac1a"/>
+			<xsl:when test="key('AC1A-Index',@rdf:ID)">
+				<xsl:apply-templates select="key('AC1A-Index',@rdf:ID)"/>
 			</xsl:when>
 			<xsl:when test="key('IEEEAC2A-Index',@rdf:ID)">
 				<xsl:apply-templates select="key('IEEEAC2A-Index',@rdf:ID)"/>
 			</xsl:when>
-			<xsl:when test="$ac2a">
-				<xsl:apply-templates select="$ac2a"/>
+			<xsl:when test="key('AC2A-Index',@rdf:ID)">
+				<xsl:apply-templates select="key('AC2A-Index',@rdf:ID)"/>
 			</xsl:when>
-			<xsl:when test="$ieeest1a">
-				<xsl:apply-templates select="$ieeest1a"/>
+			<xsl:when test="key('IEEEST1A-Index',@rdf:ID)">
+				<xsl:apply-templates select="key('IEEEST1A-Index',@rdf:ID)"/>
 			</xsl:when>
-			<xsl:when test="$ieeedc1a">
-				<xsl:apply-templates select="$ieeedc1a"/>
+			<xsl:when test="key('IEEEDC1A-Index',@rdf:ID)">
+				<xsl:apply-templates select="key('IEEEDC1A-Index',@rdf:ID)"/>
 			</xsl:when>
 			<xsl:otherwise>
-<xsl:text>  
+				<xsl:text>  
 // No exciter
 </xsl:text>
 			</xsl:otherwise>
 		</xsl:choose>
---><!--		<xsl:choose>
+		<xsl:choose>
 			<xsl:when test="key('PSS2B-Index',key('IEEEAC2A-Index',@rdf:ID)/../@rdf:ID)">
 				<xsl:apply-templates select="key('PSS2B-Index',key('IEEEAC2A-Index',@rdf:ID)/../@rdf:ID)"/>
 			</xsl:when>
-			<xsl:when test="key('PSSUser-Index',key('IEEEAC2A-Index',@rdf:ID)/../@rdf:ID)">
-					<xsl:apply-templates select="key('PSSUser-Index',key('IEEEAC2A-Index',@rdf:ID)/../@rdf:ID)">
-						<xsl:sort data-type="number" order="ascending" select="../cim:ProprietaryParameterDynamics.parameterNumber"/>
-					</xsl:apply-templates>
+			<xsl:when test="key('PSS2B-Index',key('IEEEAC2A-Index',@rdf:ID)/../@rdf:ID)">
+				<xsl:apply-templates select="key('PSSUser-Index',key('IEEEAC2A-Index',@rdf:ID)/../@rdf:ID)">
+					<xsl:sort data-type="number" order="ascending" select="../cim:ProprietaryParameterDynamics.parameterNumber"/>
+				</xsl:apply-templates>
 			</xsl:when>
-	
-		<xsl:when test="key('PSSUser-Index',key('PSS2B-Index',@rdf:ID)/../@rdf:ID)">
+			<xsl:when test="key('PSSUser-Index',key('PSS2B-Index',@rdf:ID)/../@rdf:ID)">
 				<xsl:apply-templates select="key('PSS2B-Index',key('IEEEAC2A-Index',@rdf:ID)/../@rdf:ID)">
 					<xsl:sort data-type="number" order="ascending" select="../cim:ProprietaryParameterDynamics.parameterNumber"/>
 				</xsl:apply-templates>
@@ -154,7 +148,6 @@ OpenIPSL.Electrical.Controls.PSSE.PSS.DisabledPSS stabilizer annotation(Placemen
 </xsl:text>
 			</xsl:otherwise>
 		</xsl:choose>
--->
 		<xsl:text>  Modelica.Blocks.Sources.Constant zero(k = 0) annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, origin = {-10, -52.042}, rotation = -270), visible = true));
 
 equation
diff --git a/imports/version4/Connections.xsl b/imports/version4/Connections.xsl
index d54f233..a763295 100644
--- a/imports/version4/Connections.xsl
+++ b/imports/version4/Connections.xsl
@@ -18,7 +18,7 @@
 			<xsl:value-of select="key('BusConn-Index',cim:Terminal.ConnectivityNode/substring(@rdf:resource,2))/normalize-space(cim:IdentifiedObject.name)"/>
 			<xsl:text>.p, </xsl:text>
 			<xsl:if test="key('Sync-Index',cim:Terminal.ConductingEquipment/substring(@rdf:resource,2))">
-				<xsl:text>g</xsl:text>
+				<xsl:text>gen</xsl:text>
 				<xsl:value-of select="key('Sync-Index',cim:Terminal.ConductingEquipment/substring(@rdf:resource,2))/cim:IdentifiedObject.name"/>
 				<xsl:text>.p</xsl:text>
 			</xsl:if>
@@ -52,7 +52,7 @@
 					</xsl:when>
 				</xsl:choose>
 			</xsl:if>
-			<xsl:text>)
+<xsl:text>);
 </xsl:text>
 		</xsl:if>
 	</xsl:template>
diff --git a/imports/version4/Loads.xsl b/imports/version4/Loads.xsl
index b2b46d1..1863e19 100644
--- a/imports/version4/Loads.xsl
+++ b/imports/version4/Loads.xsl
@@ -16,13 +16,13 @@
 	exclude-result-prefixes="xs xdt err fn">
 
 	<xsl:output method="text" indent="no"/>
-	
+	<xsl:key name="VoltLevel-Index" match="cim:VoltageLevel" use="@rdf:ID"/>
 	<xsl:template match="cim:ConformLoad">
 		<xsl:text>OpenIPSL.Electrical.Loads.PSSE.Load </xsl:text>
 		<xsl:copy-of select="gkh:compliantName(concat('CL',cim:IdentifiedObject.name))"/>
 		<xsl:variable name="svVolt" select="gkh:CNVoltTree(gkh:CNfromCE(@rdf:ID))"/>
 		<xsl:variable name="svLoad" select="gkh:TMLoadTree(gkh:TMfromCE(@rdf:ID))"/>
-		<xsl:variable name="baseVoltage" select="100000.0"/>
+		<xsl:variable name="baseVoltage" select="gkh:baseVoltage(key('VoltLevel-Index',cim:Equipment.EquipmentContainer/substring(@rdf:resource,2))/cim:VoltageLevel.BaseVoltage/substring(@rdf:resource,2))"/>
 		<!--
 cim:ConnectivityNode.ConnectivityNodeContainer rdf:resource   cim:VoltageLevel rdf:ID-->
 		<xsl:variable name="response" select="gkh:response(cim:EnergyConsumer.LoadResponse/substring(@rdf:resource,2))"/>
diff --git a/imports/version4/Transformers.xsl b/imports/version4/Transformers.xsl
index 7ba7e8a..d0a81ab 100644
--- a/imports/version4/Transformers.xsl
+++ b/imports/version4/Transformers.xsl
@@ -7,7 +7,7 @@
 	<xsl:key name="End-Index" match="cim:PowerTransformerEnd/cim:PowerTransformerEnd.PowerTransformer" use="substring(@rdf:resource,2)"/>
 	<xsl:template match="cim:PowerTransformer">
 		<xsl:text>OpenIPSL.Electrical.Branches.PSSE.TwoWindingTransformer </xsl:text>
-		<xsl:value-of select="gkh:compliantName(cim:IdentifiedObject.description)"/>
+		<xsl:value-of select="gkh:compliantName(concat('T',cim:IdentifiedObject.description))"/>
 		<xsl:text>(CZ=</xsl:text>
 		<xsl:value-of select="pti:PowerTransformer.cz"/>
 		<xsl:text>,CW=</xsl:text>