Changeset 21267

Timestamp:

10/13/16 00:36:30 (8 years ago)

Author:

bdef

Message:

BUG: modifs to NC in/out removing print in parseresults

Location:

issm/trunk-jpl/src/m

Files:

• contrib/defleurian/netCDF/export_netCDF.py (modified) (1 diff)
• io/loadvars.py (modified) (2 diffs)
• solve/parseresultsfromdisk.py (modified) (1 diff)

issm/trunk-jpl/src/m/contrib/defleurian/netCDF/export_netCDF.py

@@ -132 +132 @@
         #treating scalar string or bool as atribute
         if val_type==str or val_type==unicode or val_type==bool:
-                Group.__setattr__(str(field).capitalize(), str(var))
+                Group.__setattr__(str(field).swapcase(), str(var))
         #treating list as string table
         elif val_type==list:

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

@@ -130 +130 @@
                                                                         Tree[t].__dict__[str(var)]=varval[0]
                                                         else:
-                                                                try:
+                                                                if varval[0]==u'':
+                                                                        Tree.__dict__[str(var)]=[]
+                                                                elif varval[0]=='True':
+                                                                        Tree.__dict__[str(var)]=True
+                                                                elif varval[0]=='False':
+                                                                        Tree.__dict__[str(var)]=False
+                                                                else:
                                                                         Tree.__dict__[str(var)]=varval[0]
-                                                                        if varval.getValue()=='True':
-                                                                                Tree.__dict__[str(var)]=True
-                                                                        elif varval.getValue()=='False':
-                                                                                Tree.__dict__[str(var)]=False
-                                                                except IndexError:
-                                                                        Tree.__dict__[str(var)]=[]
+
                                                 elif vardim==1:
                                                         if varval.dtype==str:
@@ -193 +194 @@
                                                         t=indexlist[i]
                                                         if listtype=='dict':
-                                                                Tree[t][str(attr).lower()]=str(listclass.getncattr(attr))
-                                                        else:
-                                                                Tree[t].__dict__[str(attr).lower()]=str(listclass.getncattr(attr))
+                                                                Tree[t][str(attr).swapcase()]=str(listclass.getncattr(attr))
+                                                        else:
+                                                                Tree[t].__dict__[str(attr).swapcase()]=str(listclass.getncattr(attr))
                                                 else:
-                                                        Tree.__dict__[str(attr).lower()]=str(listclass.getncattr(attr))
+                                                        Tree.__dict__[str(attr).swapcase()]=str(listclass.getncattr(attr))
                                                         if listclass.getncattr(attr)=='True':
-                                                                Tree.__dict__[str(attr).lower()]=True
+                                                                Tree.__dict__[str(attr).swapcase()]=True
                                                         elif listclass.getncattr(attr)=='False':
-                                                                Tree.__dict__[str(attr).lower()]=False
+                                                                Tree.__dict__[str(attr).swapcase()]=False
                 NCFile.close()
         if   len(args) >= 2 and isinstance(args[1],(str,unicode)):    # (value)

issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py

@@ -28 +28 @@
         check_nomoresteps=0
         step=loadres['step']
-        print ('step is now {}'.format(step))
 
         while loadres: