Skip to content

Commit

Permalink
Merge branch 'under_review' into 'production'
Browse files Browse the repository at this point in the history 
A few fixes and a new record

See merge request gnome/oil_database/noaa-oil-data!18
  • Loading branch information
@ChrisBarker-NOAA
ChrisBarker-NOAA committed Nov 16, 2022
2 parents cdf54e5 + 84be1ed commit c5e9c99
Show file tree
Hide file tree
Showing 5 changed files with 1,038 additions and 23 deletions.
363 changes: 350 additions & 13 deletions data/oil/AD/AD01717.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,25 @@
"Crude Oil",
"Medium Crude"
],
"model_completeness": 48,
"gnome_suitable": true
"model_completeness": 59,
"gnome_suitable": true,
"change_log": [
{
"name": "jeff",
"date": "2022-11-14T10:03:09.611-08:00",
"comment": "corrected DV and expanded data set"
},
{
"name": "jeff",
"date": "2022-11-14T10:08:03.481-08:00",
"comment": "added data"
},
{
"name": "jeff",
"date": "2022-11-14T10:09:46.101-08:00",
"comment": "save"
}
]
},
"sub_samples": [
{
Expand Down Expand Up @@ -82,18 +99,11 @@
"value": 0.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"viscosity": {
"value": 22.1,
"unit": "kg/(m s)",
"unit_type": "dynamicviscosity"
},
"ref_temp": {
"value": 15.0,
"unit": "C",
"unit_type": "temperature"
"shear_rate": {
"value": 10.0,
"unit": "1/s",
"unit_type": "angularvelocity"
}
}
],
Expand Down Expand Up @@ -291,6 +301,333 @@
}
}
]
},
{
"metadata": {
"name": "11% Evaporated",
"short_name": "11% Evaporated",
"fraction_evaporated": {
"value": 11.0,
"unit": "%",
"unit_type": "massfraction"
}
},
"physical_properties": {
"pour_point": {
"measurement": {
"value": 18.0,
"unit": "C",
"unit_type": "temperature"
}
},
"flash_point": {
"measurement": {
"value": 49.0,
"unit": "C",
"unit_type": "temperature"
}
},
"densities": [
{
"density": {
"value": 0.8898,
"unit": "g/cm^3",
"unit_type": "density"
},
"ref_temp": {
"value": 0.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"density": {
"value": 0.8765,
"unit": "g/cm^3",
"unit_type": "density"
},
"ref_temp": {
"value": 15.0,
"unit": "C",
"unit_type": "temperature"
}
}
],
"dynamic_viscosities": [
{
"viscosity": {
"value": 2820.0,
"unit": "cP",
"unit_type": "dynamicviscosity"
},
"ref_temp": {
"value": 0.0,
"unit": "C",
"unit_type": "temperature"
},
"shear_rate": {
"value": 10.0,
"unit": "1/s",
"unit_type": "angularvelocity"
}
}
]
},
"SARA": {
"saturates": {
"value": 68.0,
"unit": "%",
"unit_type": "massfraction"
},
"aromatics": {
"value": 24.0,
"unit": "%",
"unit_type": "massfraction"
},
"resins": {
"value": 5.0,
"unit": "%",
"unit_type": "massfraction"
},
"asphaltenes": {
"value": 3.0,
"unit": "%",
"unit_type": "massfraction"
}
},
"distillation_data": {
"type": "mass fraction",
"cuts": [
{
"fraction": {
"value": 5.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 151.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 10.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 179.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 15.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 210.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 20.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 234.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 25.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 255.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 30.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 279.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 35.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 302.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 40.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 321.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 45.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 344.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 50.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 367.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 55.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 390.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 60.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 413.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 65.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 436.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 70.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 461.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 75.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 490.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 80.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 524.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 85.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 567.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 90.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 618.0,
"unit": "C",
"unit_type": "temperature"
}
},
{
"fraction": {
"value": 95.0,
"unit": "%",
"unit_type": "concentration"
},
"vapor_temp": {
"value": 695.0,
"unit": "C",
"unit_type": "temperature"
}
}
]
}
}
],
"status": [
Expand Down
3 changes: 0 additions & 3 deletions data/oil/EC/EC00690.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4368,9 +4368,6 @@
]
}
],
"status": [
"E060: Oil fraction in distillation cuts is not accumulative"
],
"review_status": {
"status": "Not Reviewed"
}
Expand Down
Loading

0 comments on commit c5e9c99

Please sign in to comment.