Changeset 13139

Timestamp:

08/22/12 16:02:51 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: sync python with matlab code

Location:

issm/trunk-jpl/src/m/classes

Files:

• matice.py (moved) (moved from issm/trunk-jpl/src/m/classes/materials.py ) (2 diffs)
• model/model.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/matice.py

@@ -6 +6 @@
 from WriteData import *
 
-class materials(object):
+class matice(object):
         """
         MATERIALS class definition
 
            Usage:
-              materials=materials();
+              matice=matice();
         """
 
@@ -97 +97 @@
 
         def checkconsistency(self,md,solution,analyses):    # {{{
-                md = checkfield(md,'materials.rho_ice','>',0)
-                md = checkfield(md,'materials.rho_water','>',0)
-                md = checkfield(md,'materials.rho_freshwater','>',0)
-                md = checkfield(md,'materials.mu_water','>',0)
-                md = checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices])
-                md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements])
-                md = checkfield(md,'materials.rheology_law','values',['None','Paterson','Arrhenius'])
+                md = checkfield(md,'matice.rho_ice','>',0)
+                md = checkfield(md,'matice.rho_water','>',0)
+                md = checkfield(md,'matice.rho_freshwater','>',0)
+                md = checkfield(md,'matice.mu_water','>',0)
+                md = checkfield(md,'matice.rheology_B','>',0,'size',[md.mesh.numberofvertices])
+                md = checkfield(md,'matice.rheology_n','>',0,'size',[md.mesh.numberofelements])
+                md = checkfield(md,'matice.rheology_law','values',['None','Paterson','Arrhenius'])
                 return md
         # }}}
 
         def marshall(self,fid):    # {{{
-                WriteData(fid,'object',self,'fieldname','rho_ice','format','Double')
-                WriteData(fid,'object',self,'fieldname','rho_water','format','Double')
-                WriteData(fid,'object',self,'fieldname','rho_freshwater','format','Double')
-                WriteData(fid,'object',self,'fieldname','mu_water','format','Double')
-                WriteData(fid,'object',self,'fieldname','heatcapacity','format','Double')
-                WriteData(fid,'object',self,'fieldname','latentheat','format','Double')
-                WriteData(fid,'object',self,'fieldname','thermalconductivity','format','Double')
-                WriteData(fid,'object',self,'fieldname','meltingpoint','format','Double')
-                WriteData(fid,'object',self,'fieldname','beta','format','Double')
-                WriteData(fid,'object',self,'fieldname','mixed_layer_capacity','format','Double')
-                WriteData(fid,'object',self,'fieldname','thermal_exchange_velocity','format','Double')
-                WriteData(fid,'object',self,'fieldname','rheology_B','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'fieldname','rheology_n','format','DoubleMat','mattype',2)
+                WriteData(fid,'enum',MaterialsEnum(),'data',MaticeEnum(),'format','Integer');
+                WriteData(fid,'object',self,'class','materials','fieldname','rho_ice','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','rho_water','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','rho_freshwater','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','mu_water','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','heatcapacity','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','latentheat','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','thermalconductivity','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','meltingpoint','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','beta','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','thermal_exchange_velocity','format','Double')
+                WriteData(fid,'object',self,'class','materials','fieldname','rheology_B','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2)
                 WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer')
         # }}}

issm/trunk-jpl/src/m/classes/model/model.py

@@ -6 +6 @@
 from surfaceforcings import surfaceforcings
 from basalforcings import basalforcings
-from materials import materials
+from matice import matice
 from friction import friction
 from flowequation import flowequation
@@ -49 +49 @@
                 self.surfaceforcings  = surfaceforcings()
                 self.basalforcings    = basalforcings()
-                self.materials        = materials()
+                self.materials        = matice()
                 self.friction         = friction()
                 self.flowequation     = flowequation()