Changeset 689 for codes/icosagcm/devel/Python/dynamico/meshes.py

Timestamp:

04/09/18 15:24:15 (6 years ago)

Author:

dubos

Message:

devel/unstructured : select double or single precision for physical quantities

File:

• codes/icosagcm/devel/Python/dynamico/meshes.py (modified) (5 diffs)

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

@@ -13 +13 @@
 
 radian=180/math.pi
+
+def zeros(dims): return np.zeros([n for n in dims if n>1], dtype=unst.np_num)
 
 #------------------- Hybrid mass-based coordinate -------------
@@ -68 +70 @@
 
 #----------------------- Cartesian mesh -----------------------
-
-def squeeze(dims): return np.zeros([n for n in dims if n>1])
 
 # arrays is a list of arrays
@@ -177 +177 @@
                   Aiv,Aiv,f+0.*Aiv,le_de,Riv2,-wee)
 
-    def field_theta(self,n=1): return squeeze((n,self.nqdyn,self.ny,self.nx,self.llm))
-    def field_mass(self,n=1): return squeeze((n,self.ny,self.nx,self.llm))
-    def field_z(self,n=1): return squeeze((n,self.ny,self.nx,self.llm))
-    def field_w(self,n=1): return squeeze((n,self.ny,self.nx,self.llm+1))
+    def field_theta(self,n=1): return zeros((n,self.nqdyn,self.ny,self.nx,self.llm))
+    def field_mass(self,n=1): return zeros((n,self.ny,self.nx,self.llm))
+    def field_z(self,n=1): return zeros((n,self.ny,self.nx,self.llm))
+    def field_w(self,n=1): return zeros((n,self.ny,self.nx,self.llm+1))
     def field_u(self,n=1): 
         if n==1:
@@ -186 +186 @@
         else:
             return np.zeros((n,self.ny,2*self.nx,self.llm))
-    def field_ps(self,n=1): return squeeze((n,self.ny,self.nx))
+    def field_ps(self,n=1): return zeros((n,self.ny,self.nx))
     def ucomp(self,u): return u[:,range(0,2*self.nx,2),:]
     def set_ucomp(self,uv,u): uv[:,range(0,2*self.nx,2),:]=u
@@ -279 +279 @@
 
 class Abstract_Mesh(Base_class):
-    def field_theta(self,n=1): return squeeze((n,self.nqdyn,self.primal_num,self.llm))
-    def field_mass(self,n=1):  return squeeze((n,self.primal_num,self.llm))
-    def field_z(self,n=1):     return squeeze((n,self.dual_num,self.llm))
-    def field_w(self,n=1):     return squeeze((n,self.primal_num,self.llm+1))
-    def field_u(self,n=1):     return squeeze((n,self.edge_num,self.llm))
-    def field_ps(self,n=1):    return squeeze((n,self.primal_num,))
+    def field_theta(self,n=1): return zeros((n,self.nqdyn,self.primal_num,self.llm))
+    def field_mass(self,n=1):  return zeros((n,self.primal_num,self.llm))
+    def field_z(self,n=1):     return zeros((n,self.dual_num,self.llm))
+    def field_w(self,n=1):     return zeros((n,self.primal_num,self.llm+1))
+    def field_u(self,n=1):     return zeros((n,self.edge_num,self.llm))
+    def field_ps(self,n=1):    return zeros((n,self.primal_num,))
     def ucov2D(self, ulon, ulat): 
         return self.de*(ulon*np.cos(self.angle_e)+ulat*np.sin(self.angle_e))