Changeset 25137

Timestamp:

06/24/20 12:08:28 (5 years ago)

Author:

jdquinn

Message:

CHG: Marshaling fix for giaivins; cleanup

Location:

issm/trunk-jpl/src/m

Files:

• classes/giaivins.py (modified) (1 diff)
• solve/marshall.py (modified) (1 diff)

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

@@ -58 +58 @@
 
     def marshall(self, prefix, md, fid): #{{{
+        WriteData(fid, prefix, 'name', 'md.gia.model', 'data', 1, 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'mantle_viscosity', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'lithosphere_thickness', 'format', 'DoubleMat', 'mattype', 1, 'scale', 10.**3.)

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

@@ -26 +26 @@
             continue
 
-    #Check that current field is an object
+        #Check that current field is an object
         if not hasattr(getattr(md, field), 'marshall'):
             raise TypeError("field '{}' is not an object.".format(field))
 
-    #Marshall current object
-    #print "marshalling %s ..." % field
+        #Marshall current object
+        #print "marshalling %s ..." % field #Uncomment for debugging
         exec("md.{}.marshall('md.{}', md, fid)".format(field, field))