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 |
|
AF1111
|
5d4b178c7d
|
Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: b8cf137069d8c54ccb6bdde8b8c7f298fb99b1e2
|
2020-02-06 18:58:50 -05:00 |
|
AF1111
|
624a1dc551
|
Final changes, besides any name change
Former-commit-id: fa9f95b760ea3a76910531d36bbd70cb7b490d52
|
2020-02-06 18:58:15 -05:00 |
|
Michael T. Kelbaugh
|
2930e4577e
|
fixing filenames
Former-commit-id: b24b68c677dd3506cd95af04b9ee4197199be1c5
|
2020-02-06 12:28:47 -05:00 |
|
Michael T. Kelbaugh
|
d3ed9fd946
|
schema cleanup
Former-commit-id: 9272d5748b8a9dd2c03b8aba62571a13e7c76602
|
2020-01-31 11:03:53 -05:00 |
|
Michael T. Kelbaugh
|
9fa519e514
|
Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: 08f2c7b391d024b6b5a215b86d61d9b97a1d75a5
|
2020-01-30 17:20:16 -05:00 |
|
Michael T. Kelbaugh
|
794598d346
|
removing misplaced folder
Former-commit-id: cced0f9a0ef49d7294250819b3082734d49f26af
|
2020-01-30 17:19:34 -05:00 |
|
AF1111
|
6bb6c53b44
|
Was used for storage, not necessary for any of the models
Former-commit-id: fbc59b1bb7289e4049fd1c10b1f0e48b38536637
|
2020-01-30 16:53:49 -05:00 |
|
Michael T. Kelbaugh
|
15afaa4981
|
removing logic to save files to the database from the outer wrapper
Former-commit-id: 418a79d31be603db006e85d3f89eb23d1bc0e2c3
|
2020-01-29 11:34:31 -05:00 |
|
Michael T. Kelbaugh
|
9a5201c84c
|
comments and cleanup
Former-commit-id: 3bf37c2510aa614ee1e01fc7b3329b6c159498e2
|
2020-01-29 10:31:33 -05:00 |
|
Michael T. Kelbaugh
|
0f54f52966
|
use f strings instead of format
Former-commit-id: 375ad1725b2f4815e8c6e1ab02461331733f5e04
|
2020-01-28 15:53:16 -05:00 |
|
Michael T. Kelbaugh
|
5d790b2e5d
|
new graphs built from clipped shapefiles (state, county, NERC, HUC8, lat-lon grid) with consistent scope, instance graph includes UnitedStates area
Former-commit-id: 0ed0a00b8b1e0f57c77fbff2cb1b4d9be415f402
|
2020-01-28 14:40:34 -05:00 |
|
Michael T. Kelbaugh
|
340422c546
|
automatic granularity translation
Former-commit-id: c93920e8c7a1c62d42b0c63062bd21e4d5f190c6
|
2020-01-28 14:31:45 -05:00 |
|
Michael T. Kelbaugh
|
2eab6e0325
|
updating aggregators and disaggregators, specify desired granularity and translation functions to use in schemas)
Former-commit-id: 4ab7ffd96422aadb3134e05493124dfb2f5d7ed8
|
2020-01-28 14:21:40 -05:00 |
|
Michael T. Kelbaugh
|
c582362b29
|
remove manual translation from inner wrappers
Former-commit-id: ef786795884ff67362a8bcbc59018d0575cb91c7
|
2020-01-28 14:04:11 -05:00 |
|
Michael T. Kelbaugh
|
2acaafdeb0
|
add leading zeros to county and state FIPS codes in config files
Former-commit-id: 2b7f92804edad7c63631d46bd322b60736f6fa0e
|
2020-01-28 14:01:33 -05:00 |
|
Michael T. Kelbaugh
|
006184158e
|
simplified function (remove x.demand_y)
Former-commit-id: 03918d450676f97f5bb69d0bb2a13e7ff36a607a
|
2020-01-28 13:50:34 -05:00 |
|
Michael T. Kelbaugh
|
4c5c3cdc22
|
use lat lon coords for climate square IDs
Former-commit-id: 4c8fc1e78cbf12ddbdfe8d59ec231952fab10f48
|
2020-01-28 13:49:37 -05:00 |
|
Michael T. Kelbaugh
|
378d831710
|
moving list of weights to a separate file
Former-commit-id: 9f1c917060c63bd0ebc6fb6aea9ef5028a1cc599
|
2020-01-28 13:46:37 -05:00 |
|
Michael T. Kelbaugh
|
21cef55871
|
moving pip install packages from Dockerfile to requirements.txt
Former-commit-id: 2c6f954f49d0a4fa708b5506f630daaf2c8ad01c
|
2019-11-22 18:23:14 -05:00 |
|
Michael T. Kelbaugh
|
7f8526ef13
|
removing automatic visualizations at each timestep
Former-commit-id: 90eef331270f803459b87ec41a02da398b9f17c5
|
2019-11-22 18:01:04 -05:00 |
|
Michael T. Kelbaugh
|
3313cb3d2d
|
removing food models
Former-commit-id: e2dfcdc10bdf58d8f89513c435ba94c06ccf664c
|
2019-10-03 14:57:05 -04:00 |
|
Michael T. Kelbaugh
|
180bd71692
|
renaming water demand model
Former-commit-id: a36476f7791cee9881d1ae4ce6f3b42c93634b33
|
2019-08-13 16:37:15 -04:00 |
|
Michael T. Kelbaugh
|
562fffbf66
|
getting rid of dummy water model
Former-commit-id: 9941031d8aedb250bedb120f004c735ff65c4c3f
|
2019-08-13 15:58:52 -04:00 |
|
djfiume
|
e1a230f322
|
Merge branch 'Alex' into dev
Former-commit-id: 4140981ad833e1ab4641328b0f7decb7d46d258e
|
2019-08-13 15:25:45 -04:00 |
|
djfiume
|
011d9ced42
|
Merge branch 'jalen' into dev
Former-commit-id: 8bb6827eef9db52fa093b0d79cf45a24c84e26ab
|
2019-08-13 14:47:12 -04:00 |
|
djfiume
|
5edf45bd6b
|
Merge branch 'dev' of https://github.com/circuitinstitute/simon into dev
Former-commit-id: 2047ded150e94eb794da94b1a019c1c5f1f00f86
|
2019-08-13 13:39:13 -04:00 |
|
Michael T. Kelbaugh
|
002d1f510e
|
Merge branch 'master' into dev
Former-commit-id: 668154885d84b374ff0107eb82170baae20aa046
|
2019-08-13 13:01:56 -04:00 |
|
Michael T. Kelbaugh
|
3e75217e7e
|
publish data with metadata for current year
Former-commit-id: 855354f8639d4c9a4f8a5d7ff602e5281460b57f
|
2019-08-13 12:55:23 -04:00 |
|
djfiume
|
d284586014
|
Merge branch 'master' into dev
Former-commit-id: 0c76f9e45585bb81291c134c2f6bb89b502225b4
|
2019-08-13 12:02:11 -04:00 |
|
Michael T. Kelbaugh
|
71dec850c3
|
Merge branch 'master' into Alex
Former-commit-id: b847c310d96600574f29f9cf7e353e5430c96890
|
2019-08-05 12:10:59 -04:00 |
|
Michael T. Kelbaugh
|
f7422e6fda
|
Merge branch 'master' into jalen
Former-commit-id: d896e60a80d625967a0464d191aed02aa231d7ac
|
2019-08-05 12:10:32 -04:00 |
|
Michael T. Kelbaugh
|
078660317d
|
adding dockerignore file
Former-commit-id: c0dbb7cf3ae4163d30cc2aea63d49fbd33979582
|
2019-08-05 12:10:03 -04:00 |
|
Michael T. Kelbaugh
|
4e35c1d0d6
|
Merge branch 'Alex' of https://github.com/circuitinstitute/simon into Alex
Former-commit-id: e959691833b54692d4df4603678404d04c5e5dd9
|
2019-07-29 16:11:35 -04:00 |
|
Michael T. Kelbaugh
|
addb06edbb
|
translate rainfall to HUC8s
Former-commit-id: 6da19d4a9a53cdfd82769d9a4fddd55ffd091412
|
2019-07-29 15:41:24 -04:00 |
|
Michael T. Kelbaugh
|
45faba4259
|
merging jalen branch for granularity capability
Former-commit-id: 9f51d8f285555c374268e4bb4f3f063b33851a3c
|
2019-07-29 15:41:04 -04:00 |
|
Alex Fiallos
|
9b89ce7f6c
|
Added surface water runoff(mm) to model
Former-commit-id: 875543cd6403320402d5e4b80aeddfdbe41a10fa
|
2019-07-29 11:46:32 -04:00 |
|
Michael T. Kelbaugh
|
b5124e3ab0
|
Merge branch 'granularity' into jalen
Former-commit-id: 4b66b453daf23bbb2079ec64e8446281e5381aa4
|
2019-07-26 16:09:08 -04:00 |
|
Michael T. Kelbaugh
|
77a173a015
|
translating power supply from county to NERC
Former-commit-id: 30fac6bcb4e611768c0420eedc26946bf4cd5d3d
|
2019-07-26 11:54:53 -04:00 |
|
Michael T. Kelbaugh
|
4df0e87dea
|
Merge branch 'master' into granularity
Former-commit-id: 589eb6db32007dbc38660e66ad5dfeee8333bc83
|
2019-07-26 10:02:00 -04:00 |
|
Alex Fiallos
|
c554855897
|
Converted decimals to underscore to play nice with mongodb
Former-commit-id: 35fb44b9efcf7c16fde01e65f49f42ca8b2efbfd
|
2019-07-25 14:34:42 -04:00 |
|
Alex Fiallos
|
941b37e902
|
Restricted grid output to U.S only
Former-commit-id: ff00099b5c7d246c43d7ab60f9438dd5276010cc
|
2019-07-25 14:16:18 -04:00 |
|
Michael T. Kelbaugh
|
56595da125
|
making correction to the merge
Former-commit-id: 36a454d2dd0e297e37e22bd0bfadb6c1b78179fe
|
2019-07-25 12:11:15 -04:00 |
|
Michael T. Kelbaugh
|
5d4545e5dc
|
Merge branch 'Alex' of https://github.com/circuitinstitute/simon into Alex
Former-commit-id: b9df6b79dcd5fab1a222d6b9e1a9e3f56b3d8fbc
|
2019-07-25 11:58:07 -04:00 |
|
Michael T. Kelbaugh
|
eed6581d7b
|
setting up structure to publish both global mean temp and climate grid data
Former-commit-id: 6b6f466d3b8d21492e8c8fe08c5357fb7c47ceba
|
2019-07-25 11:45:10 -04:00 |
|