Skip to content

Commit

Permalink
resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
smohiudd committed Dec 7, 2023
2 parents 38d3e44 + 0199520 commit 130a6c9
Show file tree
Hide file tree
Showing 158 changed files with 2,655 additions and 159 deletions.
20 changes: 19 additions & 1 deletion ingestion-data/collections/CMIP245-winter-median-pr.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "NASA Center for Climate Simulation (NCCS)",
"url": "https://www.nccs.nasa.gov/services/data-collections/land-based-products/nex-gddp-cmip6",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
20 changes: 19 additions & 1 deletion ingestion-data/collections/CMIP245-winter-median-ta.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "NASA Center for Climate Simulation (NCCS)",
"url": "https://www.nccs.nasa.gov/services/data-collections/land-based-products/nex-gddp-cmip6",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
20 changes: 19 additions & 1 deletion ingestion-data/collections/CMIP585-winter-median-pr.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "NASA Center for Climate Simulation (NCCS)",
"url": "https://www.nccs.nasa.gov/services/data-collections/land-based-products/nex-gddp-cmip6",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
20 changes: 19 additions & 1 deletion ingestion-data/collections/CMIP585-winter-median-ta.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "NASA Center for Climate Simulation (NCCS)",
"url": "https://www.nccs.nasa.gov/services/data-collections/land-based-products/nex-gddp-cmip6",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,23 @@
],
"title": "VEDA Dashboard Render Parameters"
}
}
},
"providers": [
{
"name": "EPA",
"url": "https://www.epa.gov/ghgemissions/gridded-2012-methane-emissions",
"roles": [
"producer",
"processor",
"licensor"
]
},
{
"name": "NASA VEDA",
"url": "https://www.earthdata.nasa.gov/dashboard/",
"roles": [
"host"
]
}
]
}
Loading

0 comments on commit 130a6c9

Please sign in to comment.