NE-260 Power at the Transformer not correctly compared

derrickoswald · Jan 25, 2018 · 3de0664 · 3de0664
1 parent c30c43f
commit 3de0664
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CIMWeb/src/main/scala/ch/ninecode/cim/cimweb/ShortCircuitCalculation.scala b/CIMWeb/src/main/scala/ch/ninecode/cim/cimweb/ShortCircuitCalculation.scala
@@ -51,7 +51,7 @@ class ShortCircuitCalculation extends RESTful
                 spec.setFunctionName (CIMInteractionSpec.EXECUTE_CIM_FUNCTION)
                 val input = getInputRecord ("input record containing the function to run")
                 // ToDo: get the default from parameters
-                val options = ShortCircuitOptions (false, 200.0, -70.0, transformer, null)
+                val options = ShortCircuitOptions (false, 200.0, -70.0, 1.0, 0.90, 1.0, 1.0, transformer, null)
                 val query = ShortCircuitFunction (options, spreadsheet)
                 input.asInstanceOf[map].put (CIMFunction.FUNCTION, query)
                 val interaction = connection.createInteraction

diff --git a/GridLAB-D/src/main/scala/ch/ninecode/esl/Einspeiseleistung.scala b/GridLAB-D/src/main/scala/ch/ninecode/esl/Einspeiseleistung.scala
@@ -237,7 +237,7 @@ case class Einspeiseleistung (session: SparkSession, options: EinspeiseleistungO
         }
 
         // P = VI = 400 / sqrt(3) * I [one phase] = sqrt(3) * 400 * I [three phase] 
-        val i = if (options.three) power / (400.0 * math.sqrt (3)) else math.sqrt (3) * power / 400.0
+        val i = if (options.three) power / (400.0 * math.sqrt (3)) else power / 400.0
         val overI = elements.filter (if (options.three) interesting3ph (i) else interesting1ph (i))
         overI.flatMap (assign (experiments))
     }