only solution files

GridTools · Nov 22, 2023 · 24e78e7 · 24e78e7
1 parent 32bd37a
commit 24e78e7
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 996 deletions.
diff --git a/docs/user/next/exercises/1_simple_addition.md b/docs/user/next/exercises/1_simple_addition.md
diff --git a/docs/user/next/exercises/1_simple_addition_solution.md b/docs/user/next/exercises/1_simple_addition_solution.md
@@ -15,50 +15,51 @@ kernelspec:
 # 1. Simple Addition
 
 ```{code-cell} ipython3
-from helpers import *
+import gt4py.next as gtx
+
+import numpy as np
+from helpers import random_field_new
 ```
 
 Next we implement the stencil and a numpy reference version, in order to verify them against each other.
 
 ```{code-cell} ipython3
-def addition_numpy(
-    a: np.array, b: np.array,
-) -> np.array:
+C = gtx.Dimension("C")
+n_cells = 42
+```
+
+```{code-cell} ipython3
+def addition_numpy(a: np.array, b: np.array) -> np.array:
     c = a + b
     return c
 ```
 
 ```{code-cell} ipython3
-@gtx.field_operator(backend=roundtrip.executor)
+@gtx.field_operator
 def addition(
-    a: gtx.Field[[C], float],
-    b: gtx.Field[[C], float],
+    a: gtx.Field[[C], float], b: gtx.Field[[C], float]
 ) -> gtx.Field[[C], float]:
-    c = a + b
-    return c
+    return a + b
 ```
 
 ```{code-cell} ipython3
-def test_mo_nh_diffusion_stencil_06():
-    
-    a = random_field((n_cells), C)
-    b = random_field((n_cells), C)
+def test_addition():
+    domain = gtx.domain({C:n_cells})
     
-    c_numpy = addition_numpy(
-        np.asarray(a), np.asarray(b)
-    )
+    a = random_field_new(domain)
+    b = random_field_new(domain)
 
-    c = zero_field((n_cells), C)
+    c_numpy = addition_numpy(a.asnumpy(), b.asnumpy())
 
-    addition(
-        a, b, out=c, offset_provider={}
-    )
-    
-    assert np.allclose(c, c_numpy)
+    c = gtx.zeros(domain)
+
+    addition(a, b, out=c, offset_provider={})
+
+    assert np.allclose(c.asnumpy(), c_numpy)
 
     print("Test successful!")
 ```
 
 ```{code-cell} ipython3
-test_mo_nh_diffusion_stencil_06()
+test_addition()
 ```
diff --git a/...r/next/exercises/3_divergence_exercise.md → ...ercises/2_divergence_exercise_solution.md b/...r/next/exercises/3_divergence_exercise.md → ...ercises/2_divergence_exercise_solution.md
diff --git a/docs/user/next/exercises/3_divergence_exercise_solution.md b/docs/user/next/exercises/3_divergence_exercise_solution.md
diff --git a/...ser/next/exercises/4_gradient_exercise.md → ...exercises/3_gradient_exercise_solution.md b/...ser/next/exercises/4_gradient_exercise.md → ...exercises/3_gradient_exercise_solution.md
@@ -49,7 +49,7 @@ def gradient_numpy(
 ```
 
 ```{code-cell} ipython3
-@gtx.field_operator(backend=roundtrip.executor)
+@gtx.field_operator
 def gradient(
     f: gtx.Field[[E], float],
     nx: gtx.Field[[E], float],
@@ -58,8 +58,8 @@ def gradient(
     A: gtx.Field[[C], float],
     edge_orientation: gtx.Field[[C, C2EDim], float],
 ) -> gtx.tuple[gtx.Field[[C], float], gtx.Field[[C], float]]:
-    f_x = A
-    f_y = A
+    f_x = neighbor_sum(f(C2E) * nx(C2E) * L(C2E) * edge_orientation, axis=C2EDim) / A
+    f_y = neighbor_sum(f(C2E) * ny(C2E) * L(C2E) * edge_orientation, axis=C2EDim) / A
     return f_x, f_y
 ```
 
@@ -82,7 +82,7 @@ def test_gradient():
         edge_orientation.asnumpy(),
     )
 
-    c2e_connectivity = gtx.NeighborTableOffsetProvider(c2e_table, C, E, 3)
+    c2e_connectivity = gtx.NeighborTableOffsetProvider(c2e_table, C, E, 3, has_skip_values=False)
 
     gradient_gt4py_x = zero_field((n_cells), C)
     gradient_gt4py_y = zero_field((n_cells), C)

diff --git a/docs/user/next/exercises/5_curl_exercise.md → ...ext/exercises/4_curl_exercise_solution.md b/docs/user/next/exercises/5_curl_exercise.md → ...ext/exercises/4_curl_exercise_solution.md
@@ -47,13 +47,19 @@ def curl_numpy(
     dualA: np.array,
     edge_orientation: np.array,
 ) -> np.array:
-    uv_curl = np.sum((u[v2e]*nx[v2e] + v[v2e]*ny[v2e]) * dualL[v2e] * edge_orientation, axis=1) / dualA
+    uv_curl = (
+        np.sum(
+            (u[v2e] * nx[v2e] + v[v2e] * ny[v2e]) * dualL[v2e] * edge_orientation,
+            axis=1,
+        )
+        / dualA
+    )
 
     return uv_curl
 ```
 
 ```{code-cell} ipython3
-@gtx.field_operator(backend=roundtrip.executor)
+@gtx.field_operator
 def curl(
     u: gtx.Field[[E], float],
     v: gtx.Field[[E], float],
@@ -63,8 +69,14 @@ def curl(
     dualA: gtx.Field[[V], float],
     edge_orientation: gtx.Field[[V, V2EDim], float],
 ) -> gtx.Field[[V], float]:
-    uv_curl = dualA
-    
+    uv_curl = (
+        neighbor_sum(
+            (u(V2E) * nx(V2E) + v(V2E) * ny(V2E)) * dualL(V2E) * edge_orientation,
+            axis=V2EDim,
+        )
+        / dualA
+    )
+
     return uv_curl
 ```
 
@@ -89,7 +101,7 @@ def test_curl():
         edge_orientation.asnumpy(),
     )
 
-    v2e_connectivity = gtx.NeighborTableOffsetProvider(v2e_table, V, E, 6)
+    v2e_connectivity = gtx.NeighborTableOffsetProvider(v2e_table, V, E, 6, has_skip_values=False)
 
     curl_gt4py = zero_field((n_vertices), V)