Skip to content

Commit 71e3c47

Browse files
durack1durack1
authored
Merge pull request #35 from PCMDI/issue17_durack1_ReviseMACA3-0Registration
updated MACA3-0 registration, institution_id; augmented daily variables
2 parents 6298cea + 57177c3 commit 71e3c47

File tree

7 files changed

+163
-42
lines changed

7 files changed

+163
-42
lines changed

‎DRCDP_institution_id.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"contact":"Katharine Hayhoe; [email protected]",
77
"name":"Texas Tech University, 2520 Broadway Avenue, Lubbock, TX 79409, USA"
88
},
9-
"UCM-SNRI":{
9+
"UCM-ACSL":{
1010
"ROR":"00d9ah105",
1111
"URL":"https://www.climatologylab.org",
1212
"contact":"John T. Abatzoglou; [email protected]",
13-
"name":"Sierra Nevada Research Institute, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA"
13+
"name":"Applied Climate Science Laboratory, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA"
1414
},
1515
"UCSD-SIO":{
1616
"ROR":"04v7hvq31",

‎DRCDP_source_id.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"further_info_url":"https://www.climatologylab.org/maca.html",
4343
"grid":"10 x 10 km latitude x longitude",
4444
"grid_label":"gn",
45-
"institution_id":"UCM-SNRI",
45+
"institution_id":"UCM-ACSL",
4646
"license":"CC0 1.0",
4747
"nominal_resolution":"10 km",
4848
"product":"downscaled-statistical",

‎Tables/DRCDP_APday.json‎

Lines changed: 124 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,60 @@
88
"int_missing_value":"-999",
99
"missing_value":"1e20",
1010
"product":"DRCDP",
11-
"table_date":"2025-02-15",
11+
"table_date":"2025-02-20",
1212
"table_id":"APday"
1313
},
1414
"variable_entry":{
15+
"hursmax":{
16+
"cell_measures":"area: areacella",
17+
"cell_methods":"area: mean time: maximum",
18+
"comment":"The relative humidity with respect to liquid water for T>0 C, and with respect to ice for T<0 C",
19+
"dimensions":[
20+
"longitude",
21+
"latitude",
22+
"time",
23+
"height2m"
24+
],
25+
"frequency":"day",
26+
"long_name":"Daily Maximum Near-Surface Relative Humidity",
27+
"modeling_realm":[
28+
"atmos"
29+
],
30+
"ok_max_mean_abs":"",
31+
"ok_min_mean_abs":"",
32+
"out_name":"hursmax",
33+
"positive":"",
34+
"standard_name":"relative_humidity",
35+
"type":"real",
36+
"units":"%",
37+
"valid_max":"",
38+
"valid_min":""
39+
},
40+
"hursmin":{
41+
"cell_measures":"area: areacella",
42+
"cell_methods":"area: mean time: minimum",
43+
"comment":"The relative humidity with respect to liquid water for T>0 C, and with respect to ice for T<0 C",
44+
"dimensions":[
45+
"longitude",
46+
"latitude",
47+
"time",
48+
"height2m"
49+
],
50+
"frequency":"day",
51+
"long_name":"Daily Minimum Near-Surface Relative Humidity",
52+
"modeling_realm":[
53+
"atmos"
54+
],
55+
"ok_max_mean_abs":"",
56+
"ok_min_mean_abs":"",
57+
"out_name":"hursmin",
58+
"positive":"",
59+
"standard_name":"relative_humidity",
60+
"type":"real",
61+
"units":"%",
62+
"valid_max":"",
63+
"valid_min":""
64+
},
1565
"pr":{
1666
"cell_measures":"area: areacella",
1767
"cell_methods":"area: time: mean",
@@ -36,6 +86,55 @@
3686
"valid_max":"",
3787
"valid_min":""
3888
},
89+
"rsds":{
90+
"cell_measures":"area: areacella",
91+
"cell_methods":"area: time: mean",
92+
"comment":"Surface solar irradiance for UV calculations",
93+
"dimensions":[
94+
"longitude",
95+
"latitude",
96+
"time"
97+
],
98+
"frequency":"day",
99+
"long_name":"Surface Downwelling Shortwave Radiation",
100+
"modeling_realm":[
101+
"atmos"
102+
],
103+
"ok_max_mean_abs":"",
104+
"ok_min_mean_abs":"",
105+
"out_name":"rsds",
106+
"positive":"down",
107+
"standard_name":"surface_downwelling_shortwave_flux_in_air",
108+
"type":"real",
109+
"units":"W m-2",
110+
"valid_max":"",
111+
"valid_min":""
112+
},
113+
"sfcWind":{
114+
"cell_measures":"area: areacella",
115+
"cell_methods":"area: time: mean",
116+
"comment":"near-surface (usually, 10 meters) wind speed",
117+
"dimensions":[
118+
"longitude",
119+
"latitude",
120+
"time",
121+
"height10m"
122+
],
123+
"frequency":"day",
124+
"long_name":"Daily-Mean Near-Surface Wind Speed",
125+
"modeling_realm":[
126+
"atmos"
127+
],
128+
"ok_max_mean_abs":"",
129+
"ok_min_mean_abs":"",
130+
"out_name":"sfcWind",
131+
"positive":"",
132+
"standard_name":"wind_speed",
133+
"type":"real",
134+
"units":"m s-1",
135+
"valid_max":"",
136+
"valid_min":""
137+
},
39138
"tasmax":{
40139
"cell_measures":"area: areacella",
41140
"cell_methods":"area: mean time: maximum",
@@ -85,6 +184,30 @@
85184
"units":"K",
86185
"valid_max":"",
87186
"valid_min":""
187+
},
188+
"tdps":{
189+
"cell_measures":"area: areacella",
190+
"cell_methods":"area: time: mean",
191+
"comment":"Dew point temperature is the temperature at which a parcel of air reaches saturation upon being cooled at constant pressure and specific humidity",
192+
"dimensions":[
193+
"longitude",
194+
"latitude",
195+
"time"
196+
],
197+
"frequency":"day",
198+
"long_name":"2m Dewpoint Temperature",
199+
"modeling_realm":[
200+
"atmos"
201+
],
202+
"ok_max_mean_abs":"",
203+
"ok_min_mean_abs":"",
204+
"out_name":"tdps",
205+
"positive":"",
206+
"standard_name":"dew_point_temperature",
207+
"type":"real",
208+
"units":"K",
209+
"valid_max":"",
210+
"valid_min":""
88211
}
89212
}
90213
}

‎Tables/DRCDP_CV.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"contact":"Katharine Hayhoe; [email protected]",
2121
"name":"Texas Tech University, 2520 Broadway Avenue, Lubbock, TX 79409, USA"
2222
},
23-
"UCM-SNRI":{
23+
"UCM-ACSL":{
2424
"ROR":"00d9ah105",
2525
"URL":"https://www.climatologylab.org",
2626
"contact":"John T. Abatzoglou; [email protected]",
27-
"name":"Sierra Nevada Research Institute, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA"
27+
"name":"Applied Climate Science Laboratory, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA"
2828
},
2929
"UCSD-SIO":{
3030
"ROR":"04v7hvq31",
@@ -142,7 +142,7 @@
142142
"further_info_url":"https://www.climatologylab.org/maca.html",
143143
"grid":"10 x 10 km latitude x longitude",
144144
"grid_label":"gn",
145-
"institution_id":"UCM-SNRI",
145+
"institution_id":"UCM-ACSL",
146146
"license":"CC0 1.0",
147147
"nominal_resolution":"10 km",
148148
"product":"downscaled-statistical",

‎Tables/DRCDP_grids.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"cmor_version":"3.9.0",
44
"data_specs_version":"6.5.0.0; input4MIPs-cmor-tables; e4fa82f330125fbdd78fa8315225829eabffee70",
55
"product":"DRCDP",
6-
"table_date":"2025-02-15"
6+
"table_date":"2025-02-20"
77
},
88
"axis_entry":{
99
"grid_latitude":{

‎src/createCVs.ipynb‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"PJD 18 Feb 2025 - updated to remove variant_info and variant_label from required_global_attributes<br>\n",
6060
"PJD 18 Feb 2025 - updated to remove variant_label from DRS<br>\n",
6161
"PJD 20 Feb 2025 - updated tracking_id -> tracking_id_prefix<br>\n",
62+
"PJD 20 Feb 2025 - update MACA3-0 registration, augment with available variables<br>\n",
6263
"TODO:\n",
6364
"\n",
6465
"**Links**"
@@ -82,8 +83,8 @@
8283
"name": "stdout",
8384
"output_type": "stream",
8485
"text": [
85-
"CPU times: user 37 ms, sys: 14.7 ms, total: 51.7 ms\n",
86-
"Wall time: 59.8 ms\n"
86+
"CPU times: user 42.1 ms, sys: 18.4 ms, total: 60.4 ms\n",
87+
"Wall time: 64.2 ms\n"
8788
]
8889
}
8990
],
@@ -119,8 +120,8 @@
119120
"3 nominal_resolution\n",
120121
"4 realm\n",
121122
"5 source_type\n",
122-
"CPU times: user 40.7 ms, sys: 16.4 ms, total: 57.1 ms\n",
123-
"Wall time: 1.11 s\n"
123+
"CPU times: user 42.6 ms, sys: 18.4 ms, total: 61 ms\n",
124+
"Wall time: 1.14 s\n"
124125
]
125126
}
126127
],
@@ -297,8 +298,8 @@
297298
{
298299
"data": {
299300
"text/plain": [
300-
"{'institution_id': {'UCM-SNRI': {'contact': 'John T. Abatzoglou; [email protected]',\n",
301-
" 'name': 'Sierra Nevada Research Institute, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA',\n",
301+
"{'institution_id': {'UCM-ACSL': {'contact': 'John T. Abatzoglou; [email protected]',\n",
302+
" 'name': 'Applied Climate Science Laboratory, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA',\n",
302303
" 'ROR': '00d9ah105',\n",
303304
" 'URL': 'https://www.climatologylab.org'},\n",
304305
" 'UCSD-SIO': {'contact': 'Daniel Feldman; [email protected]',\n",
@@ -319,15 +320,15 @@
319320
"source": [
320321
"institution_id = {}\n",
321322
"institution_id[\"institution_id\"] = {}\n",
322-
"institution_id[\"institution_id\"][\"UCM-SNRI\"] = {}\n",
323-
"institution_id[\"institution_id\"][\"UCM-SNRI\"][\n",
323+
"institution_id[\"institution_id\"][\"UCM-ACSL\"] = {}\n",
324+
"institution_id[\"institution_id\"][\"UCM-ACSL\"][\n",
324325
" \"contact\"\n",
325326
"] = \"John T. Abatzoglou; [email protected]\"\n",
326-
"institution_id[\"institution_id\"][\"UCM-SNRI\"][\n",
327+
"institution_id[\"institution_id\"][\"UCM-ACSL\"][\n",
327328
" \"name\"\n",
328-
"] = \"Sierra Nevada Research Institute, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA\"\n",
329-
"institution_id[\"institution_id\"][\"UCM-SNRI\"][\"ROR\"] = \"00d9ah105\"\n",
330-
"institution_id[\"institution_id\"][\"UCM-SNRI\"][\"URL\"] = \"https://www.climatologylab.org\"\n",
329+
"] = \"Applied Climate Science Laboratory, University of California, Merced, 5200 N. Lake Road, Merced, CA 95343, USA\"\n",
330+
"institution_id[\"institution_id\"][\"UCM-ACSL\"][\"ROR\"] = \"00d9ah105\"\n",
331+
"institution_id[\"institution_id\"][\"UCM-ACSL\"][\"URL\"] = \"https://www.climatologylab.org\"\n",
331332
"institution_id[\"institution_id\"][\"UCSD-SIO\"] = {}\n",
332333
"institution_id[\"institution_id\"][\"UCSD-SIO\"][\n",
333334
" \"contact\"\n",
@@ -668,7 +669,7 @@
668669
" 'further_info_url': 'https://www.climatologylab.org/maca.html',\n",
669670
" 'grid': '10 x 10 km latitude x longitude',\n",
670671
" 'grid_label': 'gn',\n",
671-
" 'institution_id': 'UCM-SNRI',\n",
672+
" 'institution_id': 'UCM-ACSL',\n",
672673
" 'license': 'CC0 1.0',\n",
673674
" 'nominal_resolution': '10 km',\n",
674675
" 'product': 'downscaled-statistical',\n",
@@ -770,7 +771,7 @@
770771
"] = \"https://www.climatologylab.org/maca.html\"\n",
771772
"source_id[\"source_id\"][\"MACA3-0\"][\"grid\"] = \"10 x 10 km latitude x longitude\"\n",
772773
"source_id[\"source_id\"][\"MACA3-0\"][\"grid_label\"] = \"gn\"\n",
773-
"source_id[\"source_id\"][\"MACA3-0\"][\"institution_id\"] = \"UCM-SNRI\"\n",
774+
"source_id[\"source_id\"][\"MACA3-0\"][\"institution_id\"] = \"UCM-ACSL\"\n",
774775
"source_id[\"source_id\"][\"MACA3-0\"][\n",
775776
" \"license\"\n",
776777
"] = \"CC0 1.0\" # https://www.climatologylab.org/maca.html#References\n",
@@ -973,8 +974,8 @@
973974
"name": "stdout",
974975
"output_type": "stream",
975976
"text": [
976-
"CPU times: user 477 μs, sys: 577 μs, total: 1.05 ms\n",
977-
"Wall time: 760 μs\n"
977+
"CPU times: user 496 μs, sys: 782 μs, total: 1.28 ms\n",
978+
"Wall time: 664 μs\n"
978979
]
979980
}
980981
],
@@ -1004,14 +1005,6 @@
10041005
"with open(outFile, \"w\") as f:\n",
10051006
" json.dump(CV, f, ensure_ascii=True, sort_keys=True, indent=4, separators=(\",\", \":\"))"
10061007
]
1007-
},
1008-
{
1009-
"cell_type": "code",
1010-
"execution_count": null,
1011-
"id": "011f199a-3e03-48c8-b578-22b208879fc7",
1012-
"metadata": {},
1013-
"outputs": [],
1014-
"source": []
10151008
}
10161009
],
10171010
"metadata": {

‎src/pullTable.ipynb‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"PJD 14 Feb 2025 - updated with coordinate, formula_terms and grids<br>\n",
5757
"PJD 15 Feb 2025 - added \"Header\" to DRCDP_grids.json, may need to tweak this as grid_mapping functions are used (Header caused issues with coordinate, formula_terms)<br>\n",
5858
"PJD 15 Feb 2025 - correct DRCDP_grids, erroneously was copy of coordinate info<br>\n",
59+
"PJD 20 Feb 2025 - added hursmax, hursmin, rsds, sfcWind, and tdps variables<br>\n",
5960
"TODO:\n",
6061
"\n",
6162
"**Links**"
@@ -79,8 +80,8 @@
7980
"name": "stdout",
8081
"output_type": "stream",
8182
"text": [
82-
"CPU times: user 29.2 ms, sys: 12.2 ms, total: 41.4 ms\n",
83-
"Wall time: 57.1 ms\n"
83+
"CPU times: user 35.7 ms, sys: 14.4 ms, total: 50.2 ms\n",
84+
"Wall time: 61.5 ms\n"
8485
]
8586
}
8687
],
@@ -114,8 +115,8 @@
114115
"1 coordinate\n",
115116
"2 formula_terms\n",
116117
"3 grids\n",
117-
"CPU times: user 34.6 ms, sys: 14.1 ms, total: 48.7 ms\n",
118-
"Wall time: 20.7 s\n"
118+
"CPU times: user 28.2 ms, sys: 11.5 ms, total: 39.7 ms\n",
119+
"Wall time: 847 ms\n"
119120
]
120121
}
121122
],
@@ -161,7 +162,7 @@
161162
"outputs": [],
162163
"source": [
163164
"keyList = list(APday[\"variable_entry\"].keys())\n",
164-
"keepKeys = [\"pr\", \"tasmax\", \"tasmin\"]\n",
165+
"keepKeys = [\"hursmax\", \"hursmin\", \"pr\", \"rsds\", \"sfcWind\", \"tasmax\", \"tasmin\", \"tdps\"]\n",
165166
"for count, key in enumerate(keyList):\n",
166167
" if key not in keepKeys:\n",
167168
" APday[\"variable_entry\"].pop(key)"
@@ -184,7 +185,7 @@
184185
{
185186
"data": {
186187
"text/plain": [
187-
"dict_keys(['pr', 'tasmax', 'tasmin'])"
188+
"dict_keys(['hursmax', 'hursmin', 'pr', 'rsds', 'sfcWind', 'tasmax', 'tasmin', 'tdps'])"
188189
]
189190
},
190191
"execution_count": 4,
@@ -193,6 +194,10 @@
193194
}
194195
],
195196
"source": [
197+
"# cleanup comments\n",
198+
"for key in APday[\"variable_entry\"].keys():\n",
199+
" APday[\"variable_entry\"][key][\"comment\"] = APday[\"variable_entry\"][key][\"comment\"].replace(\".\",\"\")\n",
200+
" APday[\"variable_entry\"][key][\"comment\"] = APday[\"variable_entry\"][key][\"comment\"].replace(\"T> 0\",\"T>0\")\n",
196201
"APday[\"variable_entry\"].keys()"
197202
]
198203
},
@@ -247,8 +252,8 @@
247252
"text": [
248253
"mipTHash: f42386929a0057ed15e66a3bac045b8c00d33c0f\n",
249254
"inp4Hash: e4fa82f330125fbdd78fa8315225829eabffee70\n",
250-
"CPU times: user 17.1 ms, sys: 4.46 ms, total: 21.5 ms\n",
251-
"Wall time: 10.7 s\n"
255+
"CPU times: user 17 ms, sys: 4.61 ms, total: 21.6 ms\n",
256+
"Wall time: 667 ms\n"
252257
]
253258
}
254259
],
@@ -269,7 +274,7 @@
269274
},
270275
{
271276
"cell_type": "code",
272-
"execution_count": null,
277+
"execution_count": 7,
273278
"id": "b759f7d8-8deb-4069-b385-93e4c61e9610",
274279
"metadata": {},
275280
"outputs": [
@@ -284,7 +289,7 @@
284289
" 'int_missing_value': '-999',\n",
285290
" 'missing_value': '1e20',\n",
286291
" 'product': 'DRCDP',\n",
287-
" 'table_date': '2025-02-14',\n",
292+
" 'table_date': '2025-02-20',\n",
288293
" 'table_id': 'APday'}"
289294
]
290295
},

0 commit comments

Comments
 (0)