Changeset 636

Timestamp:

12/12/17 22:45:46 (6 years ago)

Author:

dubos

Message:

devel/Python : fix computation of hybrid coefs for periodic-box domain

File:

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

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

@@ -14 +14 @@
 
 def compute_hybrid_coefs(mass):
-    nx,llm=mass.shape
-    mass_dak = np.zeros((nx,llm))
-    mass_dbk = np.zeros((nx,llm))
-    mass_bl = np.zeros((nx,llm+1))+1.
-    for i in range(nx):
-        m_i = mass[i,:]
-        dbk_i = m_i/sum(m_i)
-        mass_dbk[i,:] = dbk_i
-        mass_bl[i,1:]= 1.-dbk_i.cumsum()
+    if mass.ndim==2 :
+        nx,llm=mass.shape
+        mass_dak = np.zeros((nx,llm))
+        mass_dbk = np.zeros((nx,llm))
+        mass_bl = np.zeros((nx,llm+1))+1.
+        for i in range(nx):
+            m_i = mass[i,:]
+            dbk_i = m_i/sum(m_i)
+            mass_dbk[i,:] = dbk_i
+            mass_bl[i,1:]= 1.-dbk_i.cumsum()
+    if mass.ndim==3 :
+        nx,ny,llm=mass.shape
+        mass_dak = np.zeros((nx,ny,llm))
+        mass_dbk = np.zeros((nx,ny,llm))
+        mass_bl = np.zeros((nx,ny,llm+1))+1.
+        for i in range(nx):
+            for j in range(ny):
+                m_ij = mass[i,j,:]
+                dbk_ij = m_ij/sum(m_ij)
+                mass_dbk[i,j,:] = dbk_ij
+                mass_bl[i,j,1:]= 1.-dbk_ij.cumsum()
+
     return mass_bl, mass_dak, mass_dbk
-
 
 #----------------------- Cartesian mesh -----------------------