Merge pull request #852 in VECTO/vecto-sim from develop to master

* commit '0e5dbdc0':
  add missing HVAC power demands (needed for VTP simulations
  remove invalid characters (such as / or \) from mod-filename (e.g. if VIN contains illegal characters)
  adding steering pump power demand for RD cycle groups 10-16 (needed for VTP simulations)

VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs

@@ -103,7 +103,7 @@ namespace TUGraz.VectoCore.OutputData.FileIO
 				modFileName = string.Format("{0}{1}", runName, Constants.FileExtensions.ModDataFile);
 			}
 
-			return Path.Combine(BasePath, modFileName);
+			return Path.Combine(BasePath, string.Concat(modFileName.Split(Path.GetInvalidFileNameChars())));
 		}
 
 		public void WriteModData(int jobRunId, string runName, string cycleName, string runSuffix, DataTable modData)

VectoCore/VectoCore/Resources/Declaration/VAUX/HVAC-Table.csv

@@ -10,13 +10,13 @@ None       , 11        , 0         , 0                 , 0              , 0
 None       , 12        , 0         , 0                 , 0              , 0                 , 0
 None       , 16        , 0         , 0                 , 0              , 0                 , 0
 #
-Default    , 1         ,           , 150               , 150            ,                   ,
+Default    , 1         , 200       , 150               , 150            ,                   ,
 Default    , 2         , 200       , 200               , 150            ,                   ,
-Default    , 3         ,           , 200               , 150            ,                   ,
+Default    , 3         , 200       , 200               , 150            ,                   ,
 Default    , 4         , 350       , 200               , 150            , 300               , 200
 Default    , 5         , 350       , 200               , 150            ,                   , 200
 Default    , 9         , 350       , 200               , 150            , 300               , 200
-Default    , 10        , 350       , 200               ,                ,                   , 200
-Default    , 11        , 350       , 200               ,                , 300               , 200
-Default    , 12        , 350       , 200               ,                ,                   , 200
-Default    , 16        ,           ,                   ,                ,                   , 200
+Default    , 10        , 350       , 200               , 150            ,                   , 200
+Default    , 11        , 350       , 200               , 150            , 300               , 200
+Default    , 12        , 350       , 200               , 150            ,                   , 200
+Default    , 16        , 350       , 200               , 150            ,                   , 200

VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv

@@ -8,7 +8,7 @@ HDV Group , Long haul , Regional delivery , Urban delivery , Municipal utility ,
 7         ,           ,                   ,                ,                   ,
 8         ,           ,                   ,                ,                   ,
 9         , 600/120/0 , 490/60/40         , 440/50/50      , 430/30/50         , 640/50/80
-10        , 450/120/0 , 440/90/40         ,                ,                   , 640/50/80
-11        , 600/120/0 , 490/60/40         ,                , 430/30/50         , 640/50/80
-12        , 450/120/0 , 440/90/40         ,                ,                   , 640/50/80
-16        ,           ,                   ,                ,                   , 640/50/80
\ No newline at end of file
+10        , 450/120/0 , 440/90/40         , 390/80/50      ,                   , 640/50/80
+11        , 600/120/0 , 490/60/40         , 370/60/50      , 430/30/50         , 640/50/80
+12        , 450/120/0 , 440/90/40         , 390/80/50      ,                   , 640/50/80
+16        , 490/100/0 , 550/90/40         , 490/80/60      ,                   , 640/50/80
\ No newline at end of file