Changeset 3489


Ignore:
Timestamp:
21/02/08 13:38:20 (12 years ago)
Author:
astephen
Message:

Reverted to previous version of 2110 and 2310 where writes all work from A and NAUXV so same as read methods.

Location:
nappy/trunk/nappy/na_file
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nappy/trunk/nappy/na_file/na_file_2110.py

    r3482 r3489  
    118118            # Write unbounded independent variable mark and auxiliary variables 
    119119            var_string = self.format % self.X[m][0] 
    120             var_string = var_string + (self.format % self.NX[m]) 
     120            #############var_string = var_string + (self.format % self.NX[m]) 
    121121 
    122             # Loop through aux vars minus 1 because NX is used as first aux var 
    123             for a in range(self.NAUXV - 1):  
     122            ################ Loop through aux vars minus 1 because NX is used as first aux var 
     123            for a in range(self.NAUXV):  
    124124                var_string = var_string + (self.format % self.A[a][m]) 
    125125            self.file.write("%s\n" % var_string.rstrip(" ,")) 
  • nappy/trunk/nappy/na_file/na_file_2310.py

    r3482 r3489  
    9999            var_string = self.format % self.X[m][0] 
    100100 
    101             var_string = var_string + (self.format % self.NX[m]) + (self.format % self.X[m][0]) + \ 
    102                                       (self.format % self.DX[m]) 
     101            #############var_string = var_string + (self.format % self.NX[m]) + (self.format % self.X[m][0]) + \ 
     102            ################                          (self.format % self.DX[m]) 
    103103 
    104             # Loop through NAUXV minus 3 because NX, X[0], DX are first 3 aux vars 
    105             for a in range(self.NAUXV - 3): 
     104            ################ Loop through NAUXV minus 3 because NX, X[0], DX are first 3 aux vars 
     105            for a in range(self.NAUXV): 
    106106                var_string = var_string + (self.format % self.A[a][m]) 
    107107 
Note: See TracChangeset for help on using the changeset viewer.