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

Timestamp:

02/08/19 18:53:34 (5 years ago)

Author:

jisesh

Message:

devel/Python : polar projection + Williamson test case 2 on LAM

File:

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

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

@@ -431 +431 @@
         """Before calling apply_map, lat and lon are coordinates in the reference domain.
         After calling apply_map, lat and lon are coordinates in the physical domain."""
-        factor_e = mapping.map_factor(self.lon_e, self.lat_e)
-        factor2_i = mapping.map_factor(self.lon_i, self.lat_i)**2
-        factor2_v = mapping.map_factor(self.lon_v, self.lat_v)**2
+        lat_i, lat_e, lat_v = self.lat_i, self.lat_e, self.lat_v
+        lon_i, lon_e, lon_v = self.lon_i, self.lon_e, self.lon_v
+        factor_e = mapping.map_factor(lon_e, lat_e)
+        factor2_i = mapping.map_factor(lon_i, lat_i)**2
+        factor2_v = mapping.map_factor(lon_v, lat_v)**2
         self.le, self.de, self.Av, self.Ai = self.le*factor_e, self.de*factor_e, self.Av*factor2_v, self.Ai*factor2_i
-        self.lon_i, self.lat_i = mapping.map(self.lon_i, self.lat_i)
-        self.lon_v, self.lat_v = mapping.map(self.lon_v, self.lat_v)
-        self.lon_e, self.lat_e = mapping.map(self.lon_e, self.lat_e)
+        self.angle_e += mapping.map_angle(lon_e, lat_e)
+        self.lon_i, self.lat_i = mapping.map(lon_i, lat_i)
+        self.lon_v, self.lat_v = mapping.map(lon_v, lat_v)
+        self.lon_e, self.lat_e = mapping.map(lon_e, lat_e)
+        self.ref_lon_i, self.ref_lat_i = lon_i, lat_i
+        self.ref_lon_e, self.ref_lat_e = lon_e, lat_e
+        self.ref_lon_v, self.ref_lat_v = lon_v, lat_v
 
 class Unstructured_Mesh(Abstract_Mesh):