Merge pull request #30 from lanl-ansi/gasmodels_v4

Gasmodels v4
lanl-ansi · May 14, 2019 · 163c386 · 163c386
2 parents 749eeac + f7073bf
commit 163c386
Show file tree

Hide file tree

Showing 98 changed files with 4,093 additions and 153,634 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,29 +3,27 @@ os:
   - linux
   - osx
 julia:
-  - 0.6 
-  - nightly
-matrix:
-  allow_failures:
-    - julia: nightly
-    - os: osx
+  - 0.6
+  - 0.7
+  - 1.0
+  - 1.1
 cache:
  directories:
    - /home/travis/.julia
 addons:
   apt_packages:
     - gfortran
 before_install:
-    # don't keep an old version of the code in the cache
-  - julia -e 'if "GasGridModels" in keys(Pkg.installed()) Pkg.rm("GasGridModels"); Pkg.rm("GasGridModels") end'
-  - julia -e 'Pkg.update()' #make sure we get the latest version of METADATA
-  - julia -e 'if !("Coverage" in keys(Pkg.installed())) Pkg.add("Coverage") end'
-  - julia -e 'if !("Documenter" in keys(Pkg.installed())) Pkg.add("Documenter") end'
-script: 
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd())'
-  - julia -e 'Pkg.test("GasGridModels", coverage=true)'
+  - julia -e '(VERSION >= v"0.7" && using Pkg); Pkg.rm("GasGridModels"); Pkg.rm("GasGridModels")'
+  - julia -e '(VERSION >= v"0.7" && using Pkg); Pkg.update()'
 after_success:
-  - julia -e 'using Coverage; cd(Pkg.dir("GasGridModels")); Codecov.submit(process_folder("."));'
-  - julia -e 'cd(Pkg.dir("GasGridModels")); include(joinpath("docs", "make.jl"))'
-
+  - julia -e '(VERSION >= v"0.7" && using Pkg); Pkg.add("Coverage"); cd(Pkg.dir("GasGridModels")); using Coverage; Codecov.submit(process_folder())'
+jobs:
+  include:
+    - stage: "Documentation"
+      julia: 1.0
+      os: linux
+      script:
+        - julia --project=docs/ -e 'using Pkg; Pkg.instantiate(); Pkg.develop(PackageSpec(path=pwd()))'
+        - julia --project=docs/ docs/make.jl
+      after_success: skip
diff --git a/REQUIRE b/REQUIRE
@@ -6,6 +6,6 @@ Compat
 
 PowerModels 0.8.1 0.9-
 GasModels 0.3.1 0.4-
-InfrastructureModels
+InfrastructureModels 0.0.14 0.2-
 
-Compat
+Memento 0.8 0.11-
diff --git a/data/36bus_ilic.m b/data/36bus_ilic.m
@@ -8,42 +8,42 @@
 %% bus data
 %	bus_i	type	Pd	Qd	Gs	Bs	area	Vm	Va	baseKV	zone	Vmax	Vmin
 mpc.bus = [
-	1	3	50881.65	-1871.47	0.0	0.0	1	1	1.05	500	1	1.05	0.95	
-	5028	2	706.34	-1023.08	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	70002	2	1336.3	-982.47	0.22	80.97	1	1	1.01	345	1	1.05	0.95	
-	71786	2	7573.59	-1413.69	0.0	0.0	1	1	1.04	345	1	1.05	0.95	
-	71797	2	6389.86	-113.84	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	72926	2	1935.86	-348.18	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	73106	2	1512.04	-244.86	0.0	0.0	1	1	1.02	345	1	1.05	0.95	
-	73110	2	2215.29	-351.46	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	73171	2	2212.84	-412.45	0.0	0.0	1	1	1.03	115	1	1.05	0.95	
-	73663	2	670.91	-145.2	0.0	0.0	1	1	1.02	345	1	1.05	0.95	
-	74316	2	3322.66	-248.92	0.0	0.0	1	1	1.01	345	1	1.05	0.95	
-	74327	2	11497.69	-943.68	0.0	0.0	1	1	1.02	345	1	1.05	0.95	
-	74341	2	463.14	148.48	0.0	0.0	1	1	1.01	345	1	1.05	0.95	
-	74344	2	1217.29	-239.87	0.0	0.0	1	1	1.0	345	1	1.05	0.95	
-	74347	2	1996.07	-669.1	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	75050	2	4855.08	-155.4	0.0	0.0	1	1	1.01	138	1	1.05	0.95	
-	75403	2	121.66	-181.52	0.0	0.0	1	1	1.04	345	1	1.05	0.95	
-	75405	2	1097.65	-155.87	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	76663	2	3737.64	278.44	0.0	0.0	1	1	0.98	230	1	1.05	0.95	
-	77400	2	636.02	-177.65	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	77406	2	1410.38	-1098.46	0.0	0.0	1	1	1.04	345	1	1.05	0.95	
-	77950	2	-295.41	642.52	0.0	0.0	1	1	1.0	25	1	1.05	0.95	
-	78701	2	73.1	-46.08	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	78702	2	1613.99	-257.16	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	79578	2	888.16	-345.85	0.0	0.0	1	1	1.02	765	1	1.05	0.95	
-	79581	2	-2.05	-15.7	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	79583	2	408.57	-328.0	0.0	0.0	1	1	1.02	345	1	1.05	0.95	
-	79584	2	3317.51	-617.71	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	79800	2	1616.97	-30.17	0.0	0.0	1	1	1.03	345	1	1.05	0.95	
-	80001	2	789.69	194.55	0.0	0.0	1	1	1.09	500	1	1.1	0.95	
-	80031	2	2680.09	-681.22	0.0	0.0	1	1	1.08	500	1	1.1	0.95	
-	80101	2	10660.21	406.77	0.0	0.0	1	1	1.04	500	1	1.1	0.95	
-	80121	2	1942.11	-440.63	0.0	0.0	1	1	1.08	500	1	1.1	0.95	
-	81615	2	5085.55	-2767.19	0.0	0.0	1	1	1.1	220	1	1.1	0.95	
-	84819	2	0.0	0.0	0.0	0.0	1	1	1.01	765	1	1.05	0.95	
-	87004	2	3546.17	-404.25	-0.07	71.11	1	1	1.02	345	1	1.05	0.95	
+	1	3	50881.65	-1871.47	0.0	0.0	1	1	1.05	500	1	1.05	0.95
+	5028	2	706.34	-1023.08	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	70002	2	1336.3	-982.47	0.22	80.97	1	1	1.01	345	1	1.05	0.95
+	71786	2	7573.59	-1413.69	0.0	0.0	1	1	1.04	345	1	1.05	0.95
+	71797	2	6389.86	-113.84	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	72926	2	1935.86	-348.18	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	73106	2	1512.04	-244.86	0.0	0.0	1	1	1.02	345	1	1.05	0.95
+	73110	2	2215.29	-351.46	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	73171	2	2212.84	-412.45	0.0	0.0	1	1	1.03	115	1	1.05	0.95
+	73663	2	670.91	-145.2	0.0	0.0	1	1	1.02	345	1	1.05	0.95
+	74316	2	3322.66	-248.92	0.0	0.0	1	1	1.01	345	1	1.05	0.95
+	74327	2	11497.69	-943.68	0.0	0.0	1	1	1.02	345	1	1.05	0.95
+	74341	2	463.14	148.48	0.0	0.0	1	1	1.01	345	1	1.05	0.95
+	74344	2	1217.29	-239.87	0.0	0.0	1	1	1.0	345	1	1.05	0.95
+	74347	2	1996.07	-669.1	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	75050	2	4855.08	-155.4	0.0	0.0	1	1	1.01	138	1	1.05	0.95
+	75403	2	121.66	-181.52	0.0	0.0	1	1	1.04	345	1	1.05	0.95
+	75405	2	1097.65	-155.87	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	76663	2	3737.64	278.44	0.0	0.0	1	1	0.98	230	1	1.05	0.95
+	77400	2	636.02	-177.65	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	77406	2	1410.38	-1098.46	0.0	0.0	1	1	1.04	345	1	1.05	0.95
+	77950	2	-295.41	642.52	0.0	0.0	1	1	1.0	25	1	1.05	0.95
+	78701	2	73.1	-46.08	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	78702	2	1613.99	-257.16	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	79578	2	888.16	-345.85	0.0	0.0	1	1	1.02	765	1	1.05	0.95
+	79581	2	-2.05	-15.7	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	79583	2	408.57	-328.0	0.0	0.0	1	1	1.02	345	1	1.05	0.95
+	79584	2	3317.51	-617.71	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	79800	2	1616.97	-30.17	0.0	0.0	1	1	1.03	345	1	1.05	0.95
+	80001	2	789.69	194.55	0.0	0.0	1	1	1.09	500	1	1.1	0.95
+	80031	2	2680.09	-681.22	0.0	0.0	1	1	1.08	500	1	1.1	0.95
+	80101	2	10660.21	406.77	0.0	0.0	1	1	1.04	500	1	1.1	0.95
+	80121	2	1942.11	-440.63	0.0	0.0	1	1	1.08	500	1	1.1	0.95
+	81615	2	5085.55	-2767.19	0.0	0.0	1	1	1.1	220	1	1.1	0.95
+	84819	2	0.0	0.0	0.0	0.0	1	1	1.01	765	1	1.05	0.95
+	87004	2	3546.17	-404.25	-0.07	71.11	1	1	1.02	345	1	1.05	0.95
 ];
 
 %% generator data
@@ -376,89 +376,89 @@
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	29	0	140674.114	0
-	31	0	140674.114	0
+	10029	0	140674.114	0
+	10031	0	140674.114	0
 	-1	0	0	0
-	64	0	56269.6455	0
+	10064	0	56269.6455	0
 	-1	0	0	0
-	66	0	56269.6455	0
+	10066	0	56269.6455	0
 	-1	0	0	0
-	64	0	140674.114	0
+	10064	0	140674.114	0
 	-1	0	0	0
-	14	0	140674.114	0
+	10014	0	140674.114	0
 	-1	0	0	0
-	29	0	56269.6455	0
-	66	0	140674.114	0
+	10029	0	56269.6455	0
+	10066	0	140674.114	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	93	0	140674.114	0
+	10093	0	140674.114	0
 	-1	0	0	0
-	62	0	140674.114	0
+	10062	0	140674.114	0
 	-1	0	0	0
-	44	0	140674.114	0
+	10044	0	140674.114	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	82	0	140674.114	0
+	10082	0	140674.114	0
 	-1	0	0	0
-	76	0	140674.114	0
+	10076	0	140674.114	0
 	-1	0	0	0
-	86	0	140674.114	0
-	91	0	140674.114	0
-	71	0	140674.114	0
+	10086	0	140674.114	0
+	10091	0	140674.114	0
+	10071	0	140674.114	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	62	0	56269.6455	0
+	10062	0	56269.6455	0
 	-1	0	0	0
 	-1	0	0	0
-	19	0	140674.114	0
-	48	0	140674.114	0
-	71	0	56269.6455	0
-	87	0	140674.114	0
+	10019	0	140674.114	0
+	10048	0	140674.114	0
+	10071	0	56269.6455	0
+	10087	0	140674.114	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	93	0	56269.6455	0
+	10093	0	56269.6455	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	100	0	140674.114	0
+	100100	0	140674.114	0
 	-1	0	0	0
 	-1	0	0	0
-	87	0	56269.6455	0
-	14	0	56269.6455	0
+	10087	0	56269.6455	0
+	10014	0	56269.6455	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	31	0	56269.6455	0
+	10031	0	56269.6455	0
 	-1	0	0	0
-	82	0	140674.114	0
+	10082	0	140674.114	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	86	0	56269.6455	0
-	21	0	140674.114	0
+	10086	0	56269.6455	0
+	10021	0	140674.114	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
-	91	0	56269.6455	0
+	10091	0	56269.6455	0
 	-1	0	0	0
-	34	0	56269.6455	0
-	66	0	140674.114	0
+	10034	0	56269.6455	0
+	10066	0	140674.114	0
 	-1	0	0	0
-	34	0	140674.114	0
+	10034	0	140674.114	0
 	-1	0	0	0
-	66	0	56269.6455	0
+	10066	0	56269.6455	0
 	-1	0	0	0
 	-1	0	0	0
 	-1	0	0	0
@@ -897,4 +897,3 @@
 %column_names%  length
 mpc.ne_branch_length = [
 ];
-