Changeset 770 for codes/icosagcm

Timestamp:

11/05/18 14:28:31 (6 years ago)

Author:

dubos

Message:

devel/unstructured bugfix : indexing of Cartesian mesh

File:

• codes/icosagcm/devel/Python/dynamico/meshes.py (modified) (1 diff)

codes/icosagcm/devel/Python/dynamico/meshes.py

@@ -104 +104 @@
         # Python order : nqdyn,ny,nx,llm   / indices start at 0
         # indices below follow Fortran while x,y follow Python/C
-        index=lambda x,y : ((x+(nx*(y+2*ny)))%(nx*ny))+1
-        indexu=lambda x,y : 2*index(x,y)-1
-        indexv=lambda x,y : 2*index(x,y)
+        def periodize(x,nx): return (x+2*nx)%nx
+        def index(x,y):      return 1+periodize(x,nx)+nx*periodize(y,ny)
+        def indexu(x,y):     return 2*index(x,y)-1
+        def indexv(x,y):     return 2*index(x,y)
         def zeros(shape,n=1): return [np.zeros(shape) for i in range(n)] if n>1 else np.zeros(shape)
         def indices(shape,n=1): return [np.zeros(shape,np.int32) for i in range(n)] if n>1 else np.zeros(shape,np.int32)