Changeset 1192 for trunk

Timestamp:

Feb 28, 2014, 2:59:54 PM (11 years ago)

Author:

aslmd

Message:

PLANETOPLOT. added getfd method to obtain fields+coordinates.

Location:

trunk/UTIL/PYTHON/planetoplot_v2

Files:

• examples/ppclass_additional/froude_jump.py (added)
• ppclass.py (modified) (5 diffs)

trunk/UTIL/PYTHON/planetoplot_v2/ppclass.py

@@ -214 +214 @@
         self.f = None
         self.l = None
+        self.x = None
+        self.y = None
+        self.z = None
+        self.t = None
         ## what could be defined by the user
         self.file = file
@@ -678 +682 @@
         self.f = [ [] for iii in range(self.nrequest) ]
         self.l = [ [] for iii in range(self.nrequest) ]
+        self.x = [ [] for iii in range(self.nrequest) ]
+        self.y = [ [] for iii in range(self.nrequest) ]
+        self.z = [ [] for iii in range(self.nrequest) ]
+        self.t = [ [] for iii in range(self.nrequest) ]
         count = 0
         ## first get fields
@@ -694 +702 @@
               # save fields in self.f for the user
               self.f[count] = obj.field
+              self.x[count] = obj.field_x
+              self.y[count] = obj.field_y
+              self.z[count] = obj.field_z
+              self.t[count] = obj.field_t
               # save a legend in self.l for the user
               self.l[count] = "_"
@@ -706 +718 @@
               count = count + 1
         ## make it simple: self.f is simply the data array if self.nrequest=1
-        if self.nrequest == 1: self.f = self.f[0]
+        if self.nrequest == 1: 
+            self.f = self.f[0]
+            self.x = self.x[0]
+            self.y = self.y[0]
+            self.z = self.z[0]
+            self.t = self.t[0]
         # change status
         self.status = "retrieved"
@@ -730 +747 @@
 
     ############################################################
+    # getfd: a shortcut method for the define + retrieve chain #
+    #       ... in which the output is self.f,x,y,z,t          #
+    #       ... and the ppclass is kept quiet                  #
+    ############################################################
+    def getfd(self):
+        self.quiet = True
+        self.get()
+        return self.f,self.x,self.y,self.z,self.t
+
+    ############################################################
     # getfl: a shortcut method for the define + retrieve chain #
     #       ... in which the output is self.f, self.l          #
-    #       ... and the ppclass is kept quiet                 #
+    #       ... and the ppclass is kept quiet                  #
     ############################################################
     def getfl(self):