Merge pull request #43 from OpenWaterAnalytics/swig_dev

Expanding solver interface to include toolkit api functions

Author: jennwuu

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "swmm-toolkit/swmm-solver"]
-	path = swmm-toolkit/swmm-solver
-	url = https://github.com/SWMM-Project/swmm-solver.git
+    path = swmm-toolkit/swmm-solver
+    url = https://github.com/OpenWaterAnalytics/Stormwater-Management-Model.git
+    branch = swig

swmm-toolkit/CMakeLists.txt

@@ -16,7 +16,7 @@ project(swmm-toolkit)
 
 set(Python_FIND_VIRTUALENV FIRST)
 set(Python_ROOT_DIR "/usr/local/anaconda3")
-find_package(Python 3.7 COMPONENTS Development Interpreter)
+find_package(Python 3.7 COMPONENTS Development Interpreter REQUIRED)
 
 
 find_package(SWIG REQUIRED)
@@ -35,7 +35,7 @@ add_subdirectory(src/swmm/toolkit)
 if(APPLE)
     install(CODE "execute_process(
         COMMAND
-            ${PROJECT_SOURCE_DIR}/swmm-solver/tools/relocate.zsh ${EXTERN_LIB_PATH}
+            ${PROJECT_SOURCE_DIR}/tools/relocate.zsh ${EXTERN_LIB_PATH}
         WORKING_DIRECTORY
             ${CMAKE_INSTALL_PREFIX}
         )"

swmm-toolkit/README.md

@@ -15,6 +15,33 @@
 ## Installation
 
 
+## Build 
+1. Initialize submodule
+```cmd
+git submodule init
+git submodule update 
+```
+2. Create virtual environment
+3. `pip install` from requirements.txt
+4. `python setup.py build`
+ 
+## Troubleshoot
+
+Steps to try if `python setup.py build` fails 
+
+### Establish working swmm-solver build
+1. Create an environment variable `BOOST_ROOT_1_67_0` and set the variable to boost install location
+2. Confirm swmm-solver directory is initialized
+3. Confirm swmm-solver build is working 
+
+```
+cd swmm-solver 
+mkdir buildprod
+cd buildprod
+cmake -G "Visual Studio 14 2015 Win64" ..
+cmake --build . --config Release --target install 
+```
+
 ## Basic Usage
 
 Run a SWMM simulation. 

swmm-toolkit/setup.py

@@ -58,7 +58,7 @@ def run(self):
 
 # Set Platform specific cmake args here
 if platform_system == "Windows":
-    cmake_args = ["-GVisual Studio 14 2015 Win64"]
+    cmake_args = ["-GVisual Studio 15 2017 Win64"]
 
 elif platform_system == "Darwin":
     cmake_args = ["-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.10"]

swmm-toolkit/src/swmm/toolkit/CMakeLists.txt

@@ -68,7 +68,7 @@ set_target_properties(output
 install(
     FILES
         "__init__.py"
-        "output_enum.py"
+        "toolkit_enum.py"
         "output_metadata.py"
         "${CMAKE_CURRENT_BINARY_DIR}/output.py"
     DESTINATION

swmm-toolkit/src/swmm/toolkit/output.i

@@ -47,8 +47,8 @@ and return a (possibly) different pointer */
 %typemap(in) SMO_Handle *p_handle_inout (SMO_Handle retval)
 {
    /* INOUT in */
-   SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&retval), 0, 0);
-    $1 = &retval;
+   SWIG_ConvertPtr($input, SWIG_as_voidptrptr(&retval), 0, 0);
+   $1 = &retval;
 }
 /* No need for special IN typemap for opaque pointers, it works anyway */