Changeset 21252

Timestamp:

10/10/16 07:35:14 (8 years ago)

Author:

bdef

Message:

BUG: fixed indexing for results may have broke something elsewhere

File:

• issm/trunk-jpl/src/m/io/loadvars.py (modified) (7 diffs)

issm/trunk-jpl/src/m/io/loadvars.py

@@ -89 +89 @@
                                 if classtype[mod][0]=='list':
                                         keylist=[key for key in curclass.groups]
+                                        steplist=[int(key) for key in curclass.groups]
+                                        indexlist=[index*(len(curclass.groups)-1)/max(steplist) for index in steplist]
                                         listtype=curclass.groups[keylist[0]].classtype
                                         if listtype=='dict':
@@ -118 +120 @@
                                                 if vardim==0:
                                                         if type(Tree)==list:
-                                                                t=int(keylist[i][-1])-1
+                                                                t=indexlist[i]
                                                                 if listtype=='dict':
                                                                         Tree[t][str(var)]=varval.getValue()
@@ -142 +144 @@
                                                         else:
                                                                 if type(Tree)==list:
-                                                                        t=int(keylist[i][-1])-1
+                                                                        t=indexlist[i]
                                                                         if listtype=='dict':
                                                                                 Tree[t][str(var)]=varval[:]
@@ -152 +154 @@
                                                                                 mdtype=type(Tree.__dict__[str(var)])
                                                                         except KeyError:
-                                                                                print 'not defined yet'
                                                                                 mdtype=float
                                                                         if mdtype==list:
@@ -164 +165 @@
                                                         else:
                                                                 if type(Tree)==list:
-                                                                        t=int(keylist[i][-1])-1
+                                                                        #t=int(keylist[i][-1])-1
+                                                                        t=indexlist[i]
                                                                         if listtype=='dict':
                                                                                 Tree[t][str(var)]=varval[:,:]
@@ -173 +175 @@
                                                 elif vardim==3:
                                                         if type(Tree)==list:
-                                                                t=int(keylist[i][-1])-1
+                                                                t=indexlist[i]
                                                                 if listtype=='dict':
                                                                         Tree[t][str(var)]=varval[:,:,:]
@@ -185 +187 @@
                                         if  attr!='classtype': #classtype is for treatment, don't get it back
                                                 if type(Tree)==list:
-                                                        t=int(keylist[i][-1])-1
+                                                        t=indexlist[i]
                                                         if listtype=='dict':
                                                                 Tree[t][str(attr)]=str(listclass.getncattr(attr))