ticket:2250

Added time derived units. Fixed a typo.
OpenModelica · Apr 28, 2016 · 58a8915 · 58a8915
1 parent 688abe8
commit 58a8915
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Compiler/runtime/unitparser.cpp b/Compiler/runtime/unitparser.cpp
@@ -1125,10 +1125,15 @@ void UnitParser::initSIUnits() {
 
   addDerived("power, radiant flux", "kilowatt", "kW", "J/s", Rational(0), Rational(1000), Rational(0), true);
   addDerived("power, radiant flux", "milliwatt", "mW", "J/s", Rational(0), Rational(1, 1000), Rational(0), true);
-  addDerived("power, radiant flux", "megawatt", "MA", "J/s", Rational(0), Rational(1000000), Rational(0), true);
+  addDerived("power, radiant flux", "megawatt", "MW", "J/s", Rational(0), Rational(1000000), Rational(0), true);
 
   addDerived("pressure", "bar", "bar", "Pa", Rational(0), Rational(100000), Rational(0), true);
 
+  addDerived("time", "millisecond", "ms", "s", Rational(0), Rational(1, 1000), Rational(0), true);
+  addDerived("time", "minute", "min", "s", Rational(0), Rational(60), Rational(0), true);
+  addDerived("time", "hour", "h", "s", Rational(0), Rational(60 * 60), Rational(0), true);
+  addDerived("time", "day", "d", "s", Rational(0), Rational(60 * 60 * 24), Rational(0), true);
+
   commit();
 }