100 Commits

Author SHA1 Message Date
Michael T. Kelbaugh
a4a5efe97b adjust position of graph diagram
Former-commit-id: 467a3ea35d262a3b0db5160e4e65585ee397581c
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
44b0b5e67e translate power demand config from county to nerc
Former-commit-id: 8b4fdff9199be7e888026d3df78e6baca725e843
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
975991ce3a temp bug fix: round negative population values to zero
Former-commit-id: fdb6e6fc3f43b9133bdc029fca7c6d8ae9c77cfc
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
ed0278b5d4 switch power supply model from state to nerc profile
Former-commit-id: c5ed8a55059b684cdab4c2950447ddf1cb7c0c51
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
542f2b5d6e style fix
Former-commit-id: 217d3ec0992873f9a2a6eb5ea181db82b051ab2f
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
f6de1fd6f8 add thermo water config to water demand
Former-commit-id: cf5f3eff014538e27804882819520da55bbbf75c
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
c188c99685 change power supply from state to nerc level
Former-commit-id: ff1015ce11386090e4762cd884d25e9785d60f35
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
b8052a89f8 trim rcp config files
Former-commit-id: e69d210f94418ee57ebb179b11a65027e861e54d
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
5bb6575ee6 more updates to the model descriptions
Former-commit-id: 0434348b14004db5d823a1ebae181a3a10668e7f
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
1ed2b0c732 black . -l 79
Former-commit-id: aa4366d836072c442919fbca3b091a089fab5f32
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
7ea44ffa79 connect power supply (thermo water) to water demand
Former-commit-id: 9789f2d584efd641a39138107c2bb70691499599
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
8b2af7659c adding units
Former-commit-id: 2ee2db80b24ea29438b7bbafafa1c372e2464fcd
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
aecc01a36d fix model descriptions
Former-commit-id: 7bf57f0a368509bdb53119033b355c1772ce4393
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
807e9ca6c2 remove defunct files
Former-commit-id: 1138759d1c5d7f2e28194c8d1e8977b9638acf08
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
566dd85a0c black . -l 79
Former-commit-id: 8f0b33b3653c1866411d30cdaab7b41d8cae2a16
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
a45b2ac377 readme updates
Former-commit-id: 43dd31813b8165ffae41dbea0a6013a5ab26bbaf
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
a97cd08027 removing rcp 60
Former-commit-id: ee57ee597a96fec7b7527ff5400a21afc72ecddf
2020-04-14 10:25:15 -04:00
Michael T. Kelbaugh
f93ffbde21 formatting fixes
Former-commit-id: d325f641ac33c21480bd635c1ac61e7b298e310b
2020-03-13 17:57:12 -04:00
Michael T. Kelbaugh
683d47ef27 updating readme documentation
Former-commit-id: 64fe286c4ab46b7255d8b6eeea3f6eba8b618858
2020-03-13 17:47:06 -04:00
Michael T. Kelbaugh
902170b9f9 add reference for Holt's method
Former-commit-id: 256ee703242130509232553c8c6eea01a88e5439
2020-03-05 10:22:19 -05:00
Michael T. Kelbaugh
e471c0395e updating template model
Former-commit-id: 004a8f88a5f3088279363bd9d4b3357596d34f42
2020-03-05 10:17:29 -05:00
Michael T. Kelbaugh
9c8bd9837e new readme for models
Former-commit-id: fb24e18a8f9bd1b967d8503582adf6e33dc29e24
2020-03-03 12:55:02 -05:00
Michael T. Kelbaugh
55de2d113f comment population model
Former-commit-id: 7f538a6af92485530c7b37973026b89539452ff7
2020-02-28 14:14:57 -05:00
Michael T. Kelbaugh
2dcafe8174 option for a null granularity
Former-commit-id: 7ef31b53b077ba0f3909558d88a029de4d1dcbd0
2020-02-28 11:07:47 -05:00
AF1111
c0204c6c00 Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: cc70cf0cd3388fccf1c101e52367d067844a2b0c
2020-02-28 10:23:30 -05:00
AF1111
b09d0e21dc fixing indices for new configs
Former-commit-id: 822cb4de6e5182203b8af6c483992e75f33e0f56
2020-02-28 10:23:03 -05:00
Michael T. Kelbaugh
4de5a3d635 Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: 2a6e6a2f56c6e5adb405fce7b261073ff6e9e3a5
2020-02-28 10:14:45 -05:00
Michael T. Kelbaugh
aaf06713c4 issue #9 replace print statements with logging calls
Former-commit-id: 6f3bc8f697aa387ad84e5ff16fc57f0b29fbc472
2020-02-28 10:12:57 -05:00
AF1111
9fb4bab657 Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: cc8db637f30cf9785c490d285e8e5010c7feda24
2020-02-27 17:20:19 -05:00
AF1111
482a18f0f2 trimming down config files
Former-commit-id: 773886c93306529a5bfe95a5d0495c357497ff33
2020-02-27 17:19:01 -05:00
Michael T. Kelbaugh
cc52d3b10a specify versions for Python packages
Former-commit-id: 76e8b32774be8c25403485ed90ebc69860da0a32
2020-02-27 13:28:14 -05:00
Michael T. Kelbaugh
ab895dfc3f remove superfluous imports
Former-commit-id: f1eef12a4575d9526bb285a8f404c0bbcc9d4bfe
2020-02-26 16:23:25 -05:00
Michael T. Kelbaugh
0ca5a587c0 remove models not used for open source release
Former-commit-id: 33541c63e689812c6108b8a1992fd0d617affbf5
2020-02-26 13:33:00 -05:00
Michael T. Kelbaugh
1bcb765ae2 remove redundant Holt calculation to speed up population model
Former-commit-id: 8850b8c8b2726a47fffcd6f175d26f11f11712ec
2020-02-26 13:28:21 -05:00
Michael T. Kelbaugh
a8bce12e92 cleaning up comments, adding copyright notice
Former-commit-id: 68a41c12d8d419d5ef4acac015f4ca6f8c3c2460
2020-02-26 11:14:53 -05:00
Michael T. Kelbaugh
0e5acf13b9 lowercase granularity names
Former-commit-id: a44cb8aeb64157c8d35f2460121bf4aad3d1bf3f
2020-02-12 10:33:59 -05:00
AF1111
cb0807c8ab fixing indexing issue
Former-commit-id: fddfff2225769cd11123eb277e3e3c58ce5943d1
2020-02-11 17:57:47 -05:00
AF1111
0acce8c49f my changes, to be overwritten:
Former-commit-id: 3a87289824110e1fa380289f564d8498cf63e021
2020-02-11 17:16:47 -05:00
Michael T. Kelbaugh
7c1959f5e4 removing bokeh requirement
Former-commit-id: 00a423d21ad64cdf2860eca606ec47aa1a6a2bcc
2020-02-11 13:54:48 -05:00
Michael T. Kelbaugh
2148dee3c5 Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: cb7b98610a155587d092940d5c404ac928d7694f
2020-02-11 10:21:08 -05:00
Michael T. Kelbaugh
865671b19a updating latlon grid squares in the instance graph to have mongo-friendly formatting
Former-commit-id: d46dc0c7daf9b66ba811b994fb50d407e7378f55
2020-02-11 10:03:43 -05:00
Michael T. Kelbaugh
8fa18b6d5a python black formatting (black simon -S -l 79)
Former-commit-id: f599b58ae5f4562ad00034ecd5b26a51e8ae6fbf
2020-02-07 11:57:40 -05:00
Michael T. Kelbaugh
be62d62a02 replacing null value for DC (FIPS 11001) with 0
Former-commit-id: d6baec428c0a002101d31e594ac980aaff5bbc3f
2020-02-07 11:57:00 -05:00
Michael T. Kelbaugh
d63f1cf6aa renaming output schema for power supply
Former-commit-id: 91572066ceeae61f6acca3ea5367f78c7635257c
2020-02-07 11:28:23 -05:00
AF1111
dc507cb3c7 Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: 487fa2ef99f721fd8888697343b6c84b83318a47
2020-02-07 10:44:28 -05:00
AF1111
849ffb48f3 temp change until I remove the unused data from json
Former-commit-id: 2db75ec9f6742d8f0fe3e5c84e7fe4334abdfaa0
2020-02-07 10:43:52 -05:00
Michael T. Kelbaugh
29cef6603b Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: 72fb011c1e0d481bd0ae17c5ba5f93706e3368fd
2020-02-07 10:38:14 -05:00
Michael T. Kelbaugh
fbc534172d renaming rcp_climate model to gfdl_cm3
Former-commit-id: f5d6e3457a907e04f56be38668a23ff57d1d952b
2020-02-07 10:07:01 -05:00
Michael T. Kelbaugh
8604eb3c55 removing counties outside of scope (the contiguous USA)
Former-commit-id: 2ff9985b0dacb1bdfee8a6caa6985ba879520f33
2020-02-07 10:06:17 -05:00
Michael T. Kelbaugh
635d68beea consistent population for Oglala Lakota County (FIPS 46102)
Former-commit-id: 3fd6d884acfff1e25f155c9d109dff010006ae2a
2020-02-07 10:05:50 -05:00