Add SMO_sys for backwards compatibility (#33)

* Omitting tests from coverage

* Adding  py37 to tox.ini

* Running tests on py37

* Rolling back changes, configuring cache

* Adding .tox to appveyor cache

* Experimenting with cibuildwheel

* Experimenting with cibuildwheel

* More xp

* Adding python -version

* before-build now returns to project root dir before exiting

* Skipping py27 and win32 builds

* Trying to get cibuildwheel to run under py35

* Increase logging level

* Build verbosity 3

* Adding six to setup_requires

* Adding six to install

* installing six with CIBW_BEFORE_BUILD

* Targeting py36 and py37

* Skipping 32-bit builds

* Building microlibs

* running tests on wheels

* running tests

* Omitting top level namespace directory

* Tests require numpy

* Adding output.py module file to package data

* Trying to get module file to add

* So tired of this not working

* reworking setup.py for native namespace package

* Trying custom build_py command

* SWIG wrapper generation moved to before-build.bat

* Working on setup

* Updating comments

* Commenting on cibuildwheel for now

* bumping version, configuring cibuildwheel to run after tests pass

* configuring cibuildwheel run after test

* swmm_python doesn't declare a namespace package

* Tweaking setup so tests load in tox

* Getting tox test and cibuildwheel to both work

* Another try

* Switching to Py36-x64

* pytest==4.2.0

* Rolling back appveyor.yml

* Adding py35 to cibuildwheel

* cibuildwheel configured for py36 and py37

* Bumping version

* Adding swmm_output_enums.h

* Adding system to element type enum

* Removing DLLEXPORT from output.i

* Moving sys after pollut in enum

* Bumping version

Author: michaeltryby

before_build.bat

@@ -35,7 +35,7 @@ cd swmm
 :: Build the project
 mkdir buildprod
 cd buildprod
-cmake -G"Visual Studio 14 2015 Win64" -DBUILD_TESTS=0 ..
+cmake -G"Visual Studio 14 2015 Win64" -DBUILD_TESTS=OFF ..
 cmake --build . --config Release
 
 

setup.py

@@ -55,7 +55,7 @@ def run(self):
 
 setup(
     name=PACKAGE_NAME,
-    version="0.3.0.dev0",
+    version="0.3.0.dev1",
 
     cmdclass={
         'install': InstallCmd,

swmm_python/output/setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name = 'swmm.output',
-    version = "0.4.0.dev0",
+    version = "0.4.0.dev1",
 
     ext_modules = [
         Extension("swmm.output._output",

swmm_python/output/swmm/output/output.i

@@ -1,6 +1,6 @@
 /*
  *  swmm_output.i - SWIG interface description file for SWMM Output API
- * 
+ *
  *  Created:    11/3/2017
  *  Author:     Michael E. Tryby
  *              US EPA - ORD/NRMRL
@@ -19,98 +19,8 @@
 /* DEFINE AND TYPEDEF MUST BE INCLUDED */
 typedef void* SMO_Handle;
 
-typedef enum {
-    SMO_US,
-    SMO_SI
-} SMO_unitSystem;
-
-typedef enum {
-    SMO_CFS,
-    SMO_GPM,
-    SMO_MGD,
-    SMO_CMS,
-    SMO_LPS,
-    SMO_MLD
-} SMO_flowUnits;
-
-typedef enum {
-    SMO_MG,
-    SMO_UG,
-    SMO_COUNT,
-    SMO_NONE
-} SMO_concUnits;
-
-typedef enum {
-    SMO_subcatch,
-    SMO_node,
-    SMO_link,
-    SMO_pollut
-} SMO_elementType;
-
-typedef enum {
-    SMO_reportStep,
-    SMO_numPeriods
-} SMO_time;
-
-typedef enum {
-    SMO_rainfall_subcatch,      // (in/hr or mm/hr),
-    SMO_snow_depth_subcatch,    // (in or mm),
-    SMO_evap_loss,              // (in/hr or mm/hr),
-    SMO_infil_loss,             // (in/hr or mm/hr),
-    SMO_runoff_rate,            // (flow units),
-    SMO_gwoutflow_rate,         // (flow units),
-    SMO_gwtable_elev,           // (ft or m),
-    SMO_soil_moisture,          // unsaturated zone moisture content (-),
-    SMO_pollutant_conc_subcatch // first pollutant
-} SMO_subcatchAttribute;
-
-typedef enum {
-    SMO_invert_depth,           // (ft or m),
-    SMO_hydraulic_head,         // (ft or m),
-    SMO_stored_ponded_volume,   // (ft3 or m3),
-    SMO_lateral_inflow,         // (flow units),
-    SMO_total_inflow,           // lateral + upstream (flow units),
-    SMO_flooding_losses,        // (flow units),
-    SMO_pollutant_conc_node     // first pollutant,
-} SMO_nodeAttribute;
-
-typedef enum {
-    SMO_flow_rate_link,         // (flow units),
-    SMO_flow_depth,             // (ft or m),
-    SMO_flow_velocity,          // (ft/s or m/s),
-    SMO_flow_volume,            // (ft3 or m3),
-    SMO_capacity,               // (fraction of conduit filled),
-    SMO_pollutant_conc_link     // first pollutant,
-} SMO_linkAttribute;
-
-typedef enum {
-   SMO_air_temp,               // (deg. F or deg. C),
-    SMO_rainfall_system,        // (in/hr or mm/hr),
-    SMO_snow_depth_system,      // (in or mm),
-    SMO_evap_infil_loss,        // (in/hr or mm/hr),
-    SMO_runoff_flow,            // (flow units),
-    SMO_dry_weather_inflow,     // (flow units),
-    SMO_groundwater_inflow,     // (flow units),
-    SMO_RDII_inflow,            // (flow units),
-    SMO_direct_inflow,          // user defined (flow units),
-    SMO_total_lateral_inflow,   // (sum of variables 4 to 8) //(flow units),
-    SMO_flood_losses,           // (flow units),
-    SMO_outfall_flows,          // (flow units),
-    SMO_volume_stored,          // (ft3 or m3),
-    SMO_evap_rate               // (in/day or mm/day),
-    //p_evap_rate               // (in/day or mm/day)
-} SMO_systemAttribute;
-
-
-#ifdef WINDOWS
-  #ifdef __cplusplus
-  #define DLLEXPORT __declspec(dllexport) __cdecl
-  #else
-  #define DLLEXPORT __declspec(dllexport) __stdcall
-  #endif
-#else
-  #define DLLEXPORT
-#endif
+
+%include "swmm_output_enums.h"
 
 
 /* TYPEMAPS FOR VOID POINTER */
@@ -133,7 +43,7 @@ and return a (possibly) different pointer */
    /* INOUT in */
    SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&retval), 0, 0);
     $1 = &retval;
-} 
+}
 /* No need for special IN typemap for opaque pointers, it works anyway */
 
 
@@ -170,7 +80,7 @@ and return a (possibly) different pointer */
     if (*$1) {
         PyObject* o;
         o = PyUnicode_FromStringAndSize(*$1, *$2);
-        
+
         $result = SWIG_Python_AppendOutput($result, o);
         free(*$1);
     }
@@ -217,15 +127,15 @@ and return a (possibly) different pointer */
     if (PyObject_HasAttrString($input,"value")) {
         PyObject* o;
         o = PyObject_GetAttrString($input, "value");
-        ecode = SWIG_AsVal_int(o, &val); 
-    }   
+        ecode = SWIG_AsVal_int(o, &val);
+    }
     else {
-        SWIG_exception_fail(SWIG_ArgError(ecode), "in method '" "$symname" "', argument " "$argnum"" of type '" "$ltype""'"); 
-    }   
-    
+        SWIG_exception_fail(SWIG_ArgError(ecode), "in method '" "$symname" "', argument " "$argnum"" of type '" "$ltype""'");
+    }
+
     $1 = ($1_type)(val);
 }
-%apply EnumeratedType {SMO_unit, SMO_elementType, SMO_time, SMO_subcatchAttribute, 
+%apply EnumeratedType {SMO_unit, SMO_elementType, SMO_time, SMO_subcatchAttribute,
 SMO_nodeAttribute, SMO_linkAttribute, SMO_systemAttribute};
 
 
@@ -249,56 +159,56 @@ SMO_nodeAttribute, SMO_linkAttribute, SMO_systemAttribute};
     }
 }
 
-/* INSERT EXCEPTION HANDLING FOR THESE FUNCTIONS */  
+/* INSERT EXCEPTION HANDLING FOR THESE FUNCTIONS */
 
-int DLLEXPORT SMO_open(SMO_Handle p_handle, const char* path);
+int SMO_open(SMO_Handle p_handle, const char* path);
 
-int DLLEXPORT SMO_getVersion(SMO_Handle p_handle, int* int_out);
-int DLLEXPORT SMO_getProjectSize(SMO_Handle p_handle, int** int_out, int* int_dim);
-int DLLEXPORT SMO_getUnits(SMO_Handle p_handle, int** int_out, int* int_dim);
-//int DLLEXPORT SMO_getFlowUnits(SMO_Handle p_handle, int* int_out);
-//int DLLEXPORT SMO_getPollutantUnits(SMO_Handle p_handle, int** int_out, int* int_dim);
-int DLLEXPORT SMO_getStartDate(SMO_Handle p_handle, double* double_out);
-int DLLEXPORT SMO_getTimes(SMO_Handle p_handle, SMO_time code, int* int_out);
-int DLLEXPORT SMO_getElementName(SMO_Handle p_handle, SMO_elementType type, 
+int SMO_getVersion(SMO_Handle p_handle, int* int_out);
+int SMO_getProjectSize(SMO_Handle p_handle, int** int_out, int* int_dim);
+int SMO_getUnits(SMO_Handle p_handle, int** int_out, int* int_dim);
+//int SMO_getFlowUnits(SMO_Handle p_handle, int* int_out);
+//int SMO_getPollutantUnits(SMO_Handle p_handle, int** int_out, int* int_dim);
+int SMO_getStartDate(SMO_Handle p_handle, double* double_out);
+int SMO_getTimes(SMO_Handle p_handle, SMO_time code, int* int_out);
+int SMO_getElementName(SMO_Handle p_handle, SMO_elementType type,
     int elementIndex, char** string_out, int* slen);
 
-int DLLEXPORT SMO_getSubcatchSeries(SMO_Handle p_handle, int subcatchIndex,
+int SMO_getSubcatchSeries(SMO_Handle p_handle, int subcatchIndex,
     SMO_subcatchAttribute attr, int startPeriod, int endPeriod, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getNodeSeries(SMO_Handle p_handle, int nodeIndex, SMO_nodeAttribute attr,
+int SMO_getNodeSeries(SMO_Handle p_handle, int nodeIndex, SMO_nodeAttribute attr,
     int startPeriod, int endPeriod, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getLinkSeries(SMO_Handle p_handle, int linkIndex, SMO_linkAttribute attr,
+int SMO_getLinkSeries(SMO_Handle p_handle, int linkIndex, SMO_linkAttribute attr,
     int startPeriod, int endPeriod, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getSystemSeries(SMO_Handle p_handle, SMO_systemAttribute attr,
+int SMO_getSystemSeries(SMO_Handle p_handle, SMO_systemAttribute attr,
     int startPeriod, int endPeriod, float** float_out, int* int_dim);
 
-int DLLEXPORT SMO_getSubcatchAttribute(SMO_Handle p_handle, int timeIndex,
+int SMO_getSubcatchAttribute(SMO_Handle p_handle, int timeIndex,
     SMO_subcatchAttribute attr, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getNodeAttribute(SMO_Handle p_handle, int timeIndex,
+int SMO_getNodeAttribute(SMO_Handle p_handle, int timeIndex,
     SMO_nodeAttribute attr, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getLinkAttribute(SMO_Handle p_handle, int timeIndex,
+int SMO_getLinkAttribute(SMO_Handle p_handle, int timeIndex,
     SMO_linkAttribute attr, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getSystemAttribute(SMO_Handle p_handle, int timeIndex,
+int SMO_getSystemAttribute(SMO_Handle p_handle, int timeIndex,
     SMO_systemAttribute attr, float** float_out, int* int_dim);
 
-int DLLEXPORT SMO_getSubcatchResult(SMO_Handle p_handle, int timeIndex,
+int SMO_getSubcatchResult(SMO_Handle p_handle, int timeIndex,
     int subcatchIndex, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getNodeResult(SMO_Handle p_handle, int timeIndex,
+int SMO_getNodeResult(SMO_Handle p_handle, int timeIndex,
     int nodeIndex, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getLinkResult(SMO_Handle p_handle, int timeIndex,
+int SMO_getLinkResult(SMO_Handle p_handle, int timeIndex,
     int linkIndex, float** float_out, int* int_dim);
-int DLLEXPORT SMO_getSystemResult(SMO_Handle p_handle, int timeIndex,
+int SMO_getSystemResult(SMO_Handle p_handle, int timeIndex,
     int dummyIndex, float** float_out, int* int_dim);
 
-%exception;        
+%exception;
 
-/* NO EXCEPTION HANDLING FOR THESE FUNCTIONS */        
-int DLLEXPORT SMO_init(SMO_Handle* p_handle_out);
-int DLLEXPORT SMO_close(SMO_Handle* p_handle_inout);
-void DLLEXPORT SMO_free(void** array);
+/* NO EXCEPTION HANDLING FOR THESE FUNCTIONS */
+int SMO_init(SMO_Handle* p_handle_out);
+int SMO_close(SMO_Handle* p_handle_inout);
+void SMO_free(void** array);
 
-void DLLEXPORT SMO_clearError(SMO_Handle p_handle);
-int DLLEXPORT SMO_checkError(SMO_Handle p_handle, char** msg_buffer);
+void SMO_clearError(SMO_Handle p_handle);
+int SMO_checkError(SMO_Handle p_handle, char** msg_buffer);
 
 
 /* CODE ADDED DIRECTLY TO SWIGGED INTERFACE MODULE */
@@ -319,7 +229,7 @@ class FlowUnits(enum.Enum):
     LPS = SMO_LPS
     MLD = SMO_MLD
 
-class ConcUnits(enum.Enum):  
+class ConcUnits(enum.Enum):
     MG = SMO_MG
     UG = SMO_UG
     COUNT = SMO_COUNT
@@ -330,6 +240,7 @@ class ElementType(enum.IntEnum):
     NODE = SMO_node
     LINK = SMO_link
     POLLUT = SMO_pollut
+    SYSTEM = SMO_sys
 
 class Time(enum.Enum):
     REPORT_STEP = SMO_reportStep
@@ -354,7 +265,7 @@ class NodeAttribute(aenum.Enum):
     TOTAL_INFLOW = SMO_total_inflow
     FLOODING_LOSSES = SMO_flooding_losses
     POLLUT_CONC_0 = SMO_pollutant_conc_node
-    
+
 class LinkAttribute(aenum.Enum):
     FLOW_RATE = SMO_flow_rate_link
     FLOW_DEPTH = SMO_flow_depth