Merged files from master

lbl-srg · Oct 5, 2014 · fb192cc · fb192cc
1 parent df52e53
commit fb192cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Buildings/Media/Interfaces/PartialSimpleMedium.mo b/Buildings/Media/Interfaces/PartialSimpleMedium.mo
@@ -32,10 +32,10 @@ partial package PartialSimpleMedium
   constant Modelica.SIunits.AbsolutePressure p0 = 3E5
     "Reference pressure for default medium pressure";
 
-  redeclare replaceable model extends BaseProperties(T(stateSelect=if
-          preferredMediumStates then StateSelect.prefer else StateSelect.default),
-      p(stateSelect=if preferredMediumStates then StateSelect.prefer else
-          StateSelect.default)) "Base properties"
+  redeclare replaceable model extends BaseProperties(
+     T(stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default),
+     p(stateSelect=if preferredMediumStates then StateSelect.prefer else StateSelect.default))
+    "Base properties"
   equation
         assert(T >= T_min and T <= T_max, "
 Temperature T (= "   + String(T) + " K) is not

diff --git a/Buildings/Resources/src/python/pythonInterpreter.c b/Buildings/Resources/src/python/pythonInterpreter.c
@@ -14,6 +14,7 @@ void pythonExchangeValuesNoModelica(const char * moduleName,
   PyObject *pArgs, *pValue;
   Py_ssize_t pIndVal;
   PyObject *pItemDbl, *pItemInt;
+  char* arg="";
   int i;
   int iArg = 0;
   int nArg = 0;
@@ -25,7 +26,7 @@ void pythonExchangeValuesNoModelica(const char * moduleName,
   // Set the entries for sys.argv.
   // This is required if a script uses sys.argv, such as bacpypes.
   // See also http://stackoverflow.com/questions/19381441/python-modelica-connection-fails-due-to-import-error
-  PySys_SetArgv(0, "");
+  PySys_SetArgv(0, &arg);
 
   ////////////////////////////////////////////////////////////////////////////
   // Load Python module