Changeset 21130

Timestamp:

08/12/16 05:47:51 (9 years ago)

Author:

bdef

Message:

Minor changes in Basile's contrib

Location:

issm/trunk-jpl/src/m/contrib/defleurian

Files:

• netCDF/export_netCDF.py (modified) (9 diffs)
• paraview/exportVTK.py (modified) (3 diffs)

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

@@ -34 +34 @@
         Dimension3=NCData.createDimension('Dimension3',numpy.shape(md.mesh.elements)[1])
         Dimension4=NCData.createDimension('Dimension4',StepNum)
-        Dimension5=NCData.createDimension('Dimension5',40)
-        Dimension6=NCData.createDimension('Dimension6',2) 
+        Dimension5=NCData.createDimension('Dimension5',2)
 
         DimDict = {len(Dimension1):'Dimension1',
@@ -41 +40 @@
                                                  len(Dimension3):'Dimension3',
                                                  len(Dimension4):'Dimension4',
-                                                 len(Dimension5):'Dimension5',
-                                                 len(Dimension6):'Dimension6'}
+                                                 len(Dimension5):'Dimension6'}
 
         #get all model classes and create respective groups
@@ -116 +114 @@
         elif val_type==list:
                 dimensions,DimDict=GetDim(NCData,var,val_shape,DimDict,val_dim,istime)
-                ncvar = Group.createVariable(str(field),'S1',dimensions,zlib=True)
-                charvar=stringtochar(numpy.array(var))
-                print charvar
-                print charvar.shape
+                ncvar = Group.createVariable(str(field),'str',dimensions,zlib=True)
                 for elt in range(0,val_dim):
                         try:
-                                ncvar[elt] = charvar[elt]
+                                ncvar[elt] = var[elt]
                         except IndexError:
                                 ncvar[0]= " "
@@ -128 +123 @@
         elif val_type=='bool':
                 dimensions,DimDict=GetDim(NCData,var,val_shape,DimDict,val_dim,istime)
-                ncvar = Group.createVariable(str(field),'S1',dimensions,zlib=True)
+                ncvar = Group.createVariable(str(field),'str',dimensions,zlib=True)
                 for elt in range(0,val_shape[0]):
                         ncvar[elt] = str(var[elt])
@@ -134 +129 @@
         elif val_type==collections.OrderedDict:
                 dimensions,DimDict=GetDim(NCData,var,val_shape,DimDict,val_dim,istime)
-                ncvar = Group.createVariable(str(field),'S1',dimensions,zlib=True)
+                ncvar = Group.createVariable(str(field),'str',dimensions,zlib=True)
                 for elt in range(0,val_dim):
                         ncvar[elt,0]=dict.keys(var)[elt]
@@ -154 +149 @@
                                         print 'Treating results.'+str(supfield)+'.'+str(field)+' for time '+str(time)
                                         vartab=numpy.column_stack((vartab,timevar))
-                        print numpy.shape(vartab)
+                                #print numpy.shape(vartab)
                         try:
                                 ncvar[:,:]=vartab[:,:]
@@ -174 +169 @@
 def GetDim(NCData,var,shape,DimDict,i,istime):
         output=[]
-        #grab type
-        try:
-                val_type=str(var.dtype)
-        except AttributeError:
-                val_type=type(var)
         #grab dimension
         for dim in range(0,i): #loop on the dimensions
@@ -190 +180 @@
                                         DimDict[len(NewDim)]='Dimension'+str(index)
                                         output=output+[str(DimDict[shape[dim]])]
-                                        print 'Defining dimension ' +'Dimension'+str(index)
+                                        #print 'Defining dimension ' +'Dimension'+str(index)
                 elif type(shape[0])==str:#dealling with a dictionnary
                         try:
@@ -198 +188 @@
                                 NewDim=NCData.createDimension('Dimension'+str(index),numpy.shape(shape)[0])
                                 DimDict[len(NewDim)]='Dimension'+str(index)
-                                output=[str(DimDict[numpy.shape(dict.keys(var))[0]])]+['Dimension6']
-                                print 'Defining dimension ' +'Dimension'+str(index)
+                                output=[str(DimDict[numpy.shape(dict.keys(var))[0]])]+['Dimension5']
+                                #print 'Defining dimension ' +'Dimension'+str(index)
                         break
         if istime:
                 output=output+['Dimension4']
-        #dealing with char and not string as we should so we need to had a string length
-        if val_type=='bool' or val_type==collections.OrderedDict or val_type==list:
-                charvar=stringtochar(numpy.array(var))
-                stringlength=charvar.shape[charvar.ndim-1]
-                try:
-                        output=output+[str(DimDict[stringlength])] #test if the dimension allready exist
-                except KeyError: #if not create it
-                        if (shape[dim])>1:
-                                index=len(DimDict)+1
-                                NewDim=NCData.createDimension('Dimension'+str(index),(stringlength))
-                                DimDict[len(NewDim)]='Dimension'+str(index)
-                                output=output+[str(DimDict[stringlength])]
-                                print 'Defining dimension ' +'Dimension'+str(index)
         return tuple(output), DimDict

issm/trunk-jpl/src/m/contrib/defleurian/paraview/exportVTK.py ¶

@@ -72 +72 @@
                         if (numpy.size(res_struct.__dict__[solution])>num_of_timesteps):
                                 num_of_timesteps=numpy.size(res_struct.__dict__[solution])
-                                num_of_timesteps=int(num_of_timesteps)+1
+                                num_of_timesteps=int(num_of_timesteps)
         else:
                 num_of_timesteps=1
@@ -119 +119 @@
                                 #getting the  fields in the solution
                                 if(numpy.size(res_struct.__dict__[sol])>1):
-                                        fieldnames=dict.keys(res_struct.__dict__[sol].__getitem__(timestep-1).__dict__)
+                                        fieldnames=dict.keys(res_struct.__dict__[sol].__getitem__(timestep).__dict__)
                                 else:
                                         fieldnames=dict.keys(res_struct.__dict__[sol].__dict__)
@@ -125 +125 @@
                                 for field in fieldnames:
                                         if(numpy.size(res_struct.__dict__[sol])>1):
-                                                fieldstruct=res_struct.__dict__[sol].__getitem__(timestep-1).__dict__[field]
+                                                fieldstruct=res_struct.__dict__[sol].__getitem__(timestep).__dict__[field]
                                         else:
                                                 fieldstruct=res_struct.__dict__[sol].__dict__[field]