Changeset 354 for nappy/trunk/naFile1020.py

Timestamp:

26/11/04 10:50:57 (16 years ago)

Author:

selatham

Message:

write method for 1020. removed stray testfile.

File:

• nappy/trunk/naFile1020.py (modified) (3 diffs)

nappy/trunk/naFile1020.py

@@ -11 +11 @@
 """
 
-# 08/05/04 updated by selatham for bug fixes and new write methods
+# 08/05/04 updated by selatham for bug fixes
+# 18/11/04 updated by selatham for new write method & bug fixes
 
 # Imports from python standard library
@@ -44 +45 @@
         """
         Reads second line/section (if used) of current block of data.
-        """        
+        """
         # Now get the dependent variables
         (v, rtlines)=readItemsFromUnknownLines(datalines, self.NV*self.NVPM, float)              
         count=0
+        print ("data read =  %s") %v
         for n in range(self.NV):
-            self.V[n].append([])
+            #self.V[n].append([])
             for i in range(self.NVPM):   # Number of steps where independent variable is implied
-                self.V[n][ivar_count].append(v[count])
-            count=count+1
-        return rtlines
+                #self.V[n][ivar_count].append(v[count])                                         #18/11/04 selatham removed
+                self.V[n].append(v[count])                                                              #18/11/04 selatham added
+                count=count+1                                                                           #18/11/04 selatham
+            print ("Variable no %s = %s") %(n,self.V[n])
+        return rtlines
 
     def _normalizeIndVars(self):
@@ -67 +71 @@
         self._normalizedX="yes"
 
-    def writeData(self):                                                                                        #08/11/04 selatham
-         """                                                                                                    #08/11/04 selatham
-         Writes the data section of the file.                                                           #08/11/04 selatham
-         This method can be called directly by the user.                                        #08/11/04 selatham
-         """                                                                                                    #08/11/04 selatham
-         for m in range(len(self.X)):                                                                   #08/11/04 selatham
-             # Write Independent variable mark and auxiliary variables                          #08/11/04 selatham
-             var_string="%s    " % self.X[m]                                                    #08/11/04 selatham
-             for a in range(self.NAUXV):                                                                #08/11/04 selatham
-                 var_string=var_string+("%s    " % self.A[a][m])                                #08/11/04 selatham
-             self.file.write("%s\n" % var_string.rstrip())                                      #08/11/04 selatham
-             # Write dependant variablesf.                                                              #08/11/04 selatham
-             var_string=""                                                                              #08/11/04 selatham
-             for n in range(self.NV):                                                                   #08/11/04 selatham
-                  var_string=var_string+("%s    " %self.V[n][m])                                #08/11/04 selatham
-             self.file.write("%s    \n" %var_string)                                                    #08/11/04 selatham
+    def writeHeader(self):                                                                              #18/11/04 selatham
+         """                                                                                                    #18/11/04 selatham
+         Writes FFI-specifc header section.                                                     #18/11/04 selatham
+         """                                                                                                    #18/11/04 selatham
+         self._writeCommonHeader()                                                              #18/11/04 selatham
+         self.file.write(("%s "*self.NIV+"\n") % tuple(self.DX))                                #18/11/04 selatham
+         self.file.write(("%s\n") %self.NVPM)                                                   #18/11/04 selatham
+         self.file.write("%s\n"*self.NIV % tuple(self.XNAME))                                   #18/11/04 selatham
+         self._writeVariablesHeaderSection()                                                    #18/11/04 selatham
+         self._writeAuxVariablesHeaderSection()                                                 #18/11/04 selatham
+         self._writeComments()                                                                  #18/11/04 selatham
 
+    def writeData(self):                                                                                        #18/11/04 selatham
+         """                                                                                                    #18/11/04 selatham
+         Writes the data section of the file.                                                           #18/11/04 selatham
+         This method can be called directly by the user.                                        #18/11/04 selatham
+         """                                                                                                    #18/11/04 selatham
+         for m in range(len(self.X)):                                                                   #18/11/04 selatham
+             # Write Independent variable mark and auxiliary variables                          #18/11/04 selatham
+             var_string="%s    " % self.X[m]                                                    #18/11/04 selatham
+             for a in range(self.NAUXV):                                                                #18/11/04 selatham
+                 var_string=var_string+("%s    " % self.A[a][m])                                #18/11/04 selatham
+             self.file.write("%s\n" % var_string.rstrip())                                      #18/11/04 selatham
+             # Write dependant variables.                                                               #18/11/04 selatham
+             var_string=""                                                                                      #18/11/04 selatham
+             count=0                                                                                    #18/11/04 selatham
+             for n in range(self.NV):                                                                   #18/11/04 selatham
+                  var_string=""                                                                         #18/11/04 selatham
+                  for p in range(self.NVPM):                                                            #18/11/04 selatham
+                        var_ind=(m*self.NVPM)+p                                                         #18/11/04 selatham
+                        var_string=var_string+("%s    " %self.V[n][var_ind])            #18/11/04 selatham
+                        count=count+1                                                                   #18/11/04 selatham
+                  self.file.write("%s    \n" %var_string)                                               #18/11/04 selatham
+