Skip to content

Commit 2cfa4fb

Browse files
committed
Merge branch 'fix-open-dataset-respecting-method'
2 parents cc0f91a + 10fcce0 commit 2cfa4fb

6 files changed

Lines changed: 7513 additions & 399 deletions

File tree

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
"id": "556f084f-684f-41e4-b004-4fde273a8217",
66
"metadata": {},
77
"source": [
8-
"# Level 3 matchups with PACE data\n",
8+
"# PACE Level 3\n",
9+
"<br>\n",
910
"\n",
10-
"```\n",
11-
"import point_collocation as pc\n",
12-
"```\n",
11+
"**Steps:**\n",
1312
"\n",
1413
"* Create a plan for files to use `pc.plan()`\n",
1514
"* Print the plan to check it `print(plan.summary())`\n",
@@ -260,7 +259,6 @@
260259
],
261260
"source": [
262261
"%%time\n",
263-
"# orig / new 2 second\n",
264262
"res = pc.matchup(plan, variables=[\"Rrs\"])\n",
265263
"res"
266264
]
@@ -356,7 +354,6 @@
356354
],
357355
"source": [
358356
"%%time\n",
359-
"# old 1.5 s / new 1.2 sseems to vary\n",
360357
"import point_collocation as pc\n",
361358
"plan = pc.plan(\n",
362359
" df,\n",
@@ -653,7 +650,6 @@
653650
],
654651
"source": [
655652
"%%time\n",
656-
"# 4-5 s\n",
657653
"import earthaccess\n",
658654
"import point_collocation as pc\n",
659655
"\n",
@@ -715,7 +711,6 @@
715711
],
716712
"source": [
717713
"%%time\n",
718-
"# 8.3 s / 20.6s, later 8.6, 14, 11, 10 !!\n",
719714
"res = pc.matchup(plan, variables = [\"avw\"])"
720715
]
721716
},
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
"id": "556f084f-684f-41e4-b004-4fde273a8217",
66
"metadata": {},
77
"source": [
8-
"# Level 2 matchups with PACE data\n",
8+
"# PACE Level 2\n",
9+
"<br>\n",
10+
"\n",
11+
"**Steps:**\n",
912
"\n",
1013
"* Create a plan for files to use `pc.plan()`\n",
1114
"* Print the plan to check it `print(plan.summary())`\n",
12-
"* Do the plan and get matchups `pc.matchup(plan, open_method=\"datatree-merge\", spatial_method=\"xoak\")`\n",
15+
"* Do the plan and get matchups `pc.matchup(plan, spatial_method=\"xoak\")`\n",
1316
"\n",
1417
"## Prerequisite -- Login to EarthData\n",
1518
"\n",
@@ -207,7 +210,6 @@
207210
],
208211
"source": [
209212
"%%time\n",
210-
"# time 11 s / 5 s\n",
211213
"import point_collocation as pc\n",
212214
"plan = pc.plan(\n",
213215
" df_points[0:50], \t\n",
@@ -339,7 +341,6 @@
339341
],
340342
"source": [
341343
"%%time\n",
342-
"# 1 min /\n",
343344
"res = pc.matchup(plan, spatial_method=\"xoak\", variables=[\"Rrs\"])"
344345
]
345346
},

examples/docs_3_many_points.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"id": "c46b9f0e-346f-47fb-8f14-98d35b827626",
66
"metadata": {},
77
"source": [
8-
"# Large number of point matchups\n",
8+
"# 1000s of points\n",
9+
"<br>\n",
910
"\n",
1011
"When we have 10s of thousands of points for matchups, we need to be careful with memory. `point-collocation` will try to minimize memory accummulation, but you may still need to use a machine with more RAM to handle the task. 5Gb RAM is needed for the example with 15k+ points here. The amount of memory needed depends a bit on how your points are distributed across the grid and how they match up with the underlying netcdf chunking. The user doesn't have to worry abou that however. The package is designed to take care of using memory efficient approaches.\n",
1112
"\n",
@@ -277,4 +278,4 @@
277278
},
278279
"nbformat": 4,
279280
"nbformat_minor": 5
280-
}
281+
}

0 commit comments

Comments
 (0)