Changeset 14828

Timestamp:

05/01/13 09:55:51 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix GIA stuff

Location:

issm/trunk-jpl/src/m/classes

Files:

• gia.m (modified) (2 diffs)
• gia.py (modified) (2 diffs)
• model/model.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/gia.m

@@ -37 +37 @@
                                         %recover the furthest time "in time": 
                                         if(thickness(end,end)~=md.timestepping.start_time),
-                                                md = checkmessage(md,'if isprognostic is on, transient thickness forcing',...
-                                                        ' for the gia model should not be provided in the future.',...
-                                                        ' Synchronize your start_time to correspond to the most recent transient',...
-                                                        ' thickness forcing timestep');
+                                                md = checkmessage(md,['if isprognostic is on, transient thickness forcing'...
+                                                        ' for the gia model should not be provided in the future.'...
+                                                        ' Synchronize your start_time to correspond to the most recent transient'...
+                                                        ' thickness forcing timestep']);
                                         end
                                 end
@@ -55 +55 @@
                 end % }}}
                 function marshall(obj,fid) % {{{
-                        WriteData(fid,'data',obj.lithosphere_thickness,'format','DoubleMat','mattype',1,'enum',GiaLithosphereThicknessEnum());
+                        WriteData(fid,'object',obj,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','output_rates','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','cross_section_shape','format','Integer');

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

@@ -43 +43 @@
                         return md 
                 
-                md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0)
+                md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
                 md = checkfield(md,'gia.output_rates','numel',[1],'values',[1,2])
                 md = checkfield(md,'gia.cross_section_shape','numel',[1],'values',[1,2])
@@ -53 +53 @@
         # }}}
         def marshall(self,fid):    # {{{
-                WriteData(fid,'data',self.lithosphere_thickness,'format','DoubleMat','mattype',1,'enum',GiaLithosphereThicknessEnum());
+                WriteData(fid,'object',self,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1);
                 WriteData(fid,'object',self,'fieldname','output_rates','format','Integer');
                 WriteData(fid,'object',self,'fieldname','cross_section_shape','format','Integer');

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

@@ -118 +118 @@
                         'steadystate',\
                         'transient',\
+                                  'gia',\
                         'autodiff',\
                         'flaim',\