Renoberated the derivateves

1 files changed, 6 insertions, 8 deletions

diff --git a/Examples/Funwave.kranc b/Examples/Funwave.kranc
index 4924d25..a081292 100644
--- a/Examples/Funwave.kranc
+++ b/Examples/Funwave.kranc
@@ -10,17 +10,15 @@ begin temporaries
 end temporaries
 
 begin derivatives
-    Dx1 u_i = (u_(i+1,j) - u_(i,j))/hx
-    Dy1 u_j = (u_(i,j+1) - u_(i,j))/hy
-    Dx2 v_i = (v_(i+1,j) - v_(i-1,j))/(2*hx)
-    Dy2 v_j = (v_(i,j+1) - v_(i,j-1))/(2*hy)
+    Dp u_i = (u_(i+1) - u_(i))/h
+    Dz v_i = (v_(i+1) - v_(i-1))/(2*h)
 end derivatives
 
 begin calculation sourceterms scheduled in funw_source
-  sourcex = gamma1*mask9*(-u1p + u4)*(Dx1 p + Dy1 q) + 
-    gamma1*mask9*(-(gamma2*mask9*(u1pp + u2 + u3)) + u4*Dx2 u + u*Dx2 u4 + 
-       v4*Dy2 u + v*Dy2 u4)*max(h,mindepthfrc) - 
-    cd*u*sqrt(Power(u,2) + Power(v,2))
+  sourcex = gamma1*mask9*(-u1p + u4)*(Dp_1 p + Dp_2 q) + 
+    gamma1*mask9*(-(gamma2*mask9*(u1pp + u2 + u3)) + u4*Dz_1 u + u*Dz_1 u4 + 
+       v4*Dz_2 u + v*Dz_2 u4)*max(h,mindepthfrc) - 
+    cd*u*sqrt(u**2 + v**2)
 end calculation
 
 end thorn