Changeset 15132

Timestamp:

05/28/13 19:33:26 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not scale entire matrix if forcing, scale up to the last row

Location:

issm/trunk-jpl/src/m

Files:

• classes/balancethickness.m (modified) (1 diff)
• classes/balancethickness.py (modified) (1 diff)
• classes/basalforcings.m (modified) (1 diff)
• classes/basalforcings.py (modified) (1 diff)
• classes/diagnostic.m (modified) (1 diff)
• classes/diagnostic.py (modified) (1 diff)
• classes/geometry.m (modified) (1 diff)
• classes/geometry.py (modified) (2 diffs)
• classes/hydrologydc.m (modified) (2 diffs)
• classes/hydrologyshreve.m (modified) (1 diff)
• classes/hydrologyshreve.py (modified) (1 diff)
• classes/prognostic.m (modified) (1 diff)
• classes/prognostic.py (modified) (1 diff)
• classes/surfaceforcings.m (modified) (2 diffs)
• classes/surfaceforcings.py (modified) (2 diffs)
• classes/thermal.m (modified) (1 diff)
• classes/thermal.py (modified) (1 diff)
• solve/WriteData.m (modified) (2 diffs)
• solve/WriteData.py (modified) (2 diffs)

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

@@ -29 +29 @@
                         if solution~=BalancethicknessSolutionEnum(), return; end
 
-                        md = checkfield(md,'balancethickness.spcthickness','forcing',1);
+                        md = checkfield(md,'balancethickness.spcthickness');
                         md = checkfield(md,'balancethickness.thickening_rate','size',[md.mesh.numberofvertices 1],'NaN',1);
                         md = checkfield(md,'balancethickness.stabilization','size',[1 1],'values',[0 1 2 3]);

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

@@ -42 +42 @@
                         return md
 
-                md = checkfield(md,'balancethickness.spcthickness','forcing',1)
+                md = checkfield(md,'balancethickness.spcthickness')
                 md = checkfield(md,'balancethickness.thickening_rate','size',[md.mesh.numberofvertices],'NaN',1)
                 md = checkfield(md,'balancethickness.stabilization','size',[1],'values',[0,1,2,3])

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

@@ -47 +47 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,'object',obj,'fieldname','melting_rate','format','DoubleMat','mattype',1,'scale',1./yts);
+                        WriteData(fid,'object',obj,'fieldname','melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1);
                         WriteData(fid,'object',obj,'fieldname','melting_rate_correction','format','DoubleMat','mattype',1,'scale',1./yts);
-                        WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcing',1);
                 end % }}}
         end

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

@@ -50 +50 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,'object',self,'fieldname','melting_rate','format','DoubleMat','mattype',1,'scale',1./yts)
+                WriteData(fid,'object',self,'fieldname','melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1)
                 WriteData(fid,'object',self,'fieldname','melting_rate_correction','format','DoubleMat','mattype',1,'scale',1./yts)
-                WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcing',1)
         # }}}

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

@@ -151 +151 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','spcvx','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','spcvy','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','spcvz','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','spcvx','format','DoubleMat','mattype',1,'forcing',1);
+                        WriteData(fid,'object',obj,'fieldname','spcvy','format','DoubleMat','mattype',1,'forcing',1);
+                        WriteData(fid,'object',obj,'fieldname','spcvz','format','DoubleMat','mattype',1,'forcing',1);
                         WriteData(fid,'object',obj,'fieldname','restol','format','Double');
                         WriteData(fid,'object',obj,'fieldname','reltol','format','Double');

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

@@ -161 +161 @@
         # }}}
         def marshall(self,md,fid):    # {{{
-                WriteData(fid,'object',self,'fieldname','spcvx','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'fieldname','spcvy','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'fieldname','spcvz','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','spcvx','format','DoubleMat','mattype',1,'forcing',1)
+                WriteData(fid,'object',self,'fieldname','spcvy','format','DoubleMat','mattype',1,'forcing',1)
+                WriteData(fid,'object',self,'fieldname','spcvz','format','DoubleMat','mattype',1,'forcing',1)
                 WriteData(fid,'object',self,'fieldname','restol','format','Double')
                 WriteData(fid,'object',self,'fieldname','reltol','format','Double')

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

@@ -52 +52 @@
                 function marshall(obj,md,fid) % {{{
                         WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum());
-                        WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum());
+                        WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcing',1);
                         WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum());
                         WriteData(fid,'data',obj.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum());

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

@@ -40 +40 @@
                 md = checkfield(md,'geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices])
                 md = checkfield(md,'geometry.bed'      ,'NaN',1,'size',[md.mesh.numberofvertices])
-                md = checkfield(md,'geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0)
+                md = checkfield(md,'geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'forcing',1)
                 if any((self.thickness-self.surface+self.bed)>10**-9):
                         md.checkmessage("equality thickness=surface-bed violated")
@@ -50 +50 @@
         def marshall(self,md,fid):    # {{{
                 WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum())
-                WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum())
+                WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcing',1)
                 WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BedEnum())
                 WriteData(fid,'data',self.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum())

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

@@ -147 +147 @@
             end
 
-                        WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1,'forcing',1);
                         WriteData(fid,'object',obj,'fieldname','sediment_compressibility','format','Double');                   
                         WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double');                  
@@ -154 +154 @@
 
                         if obj.isefficientlayer==1,     
-                                WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1);
+                                WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1,'forcing',1);
                                 WriteData(fid,'object',obj,'fieldname','epl_compressibility','format','Double');                        
                                 WriteData(fid,'object',obj,'fieldname','epl_porosity','format','Double');                       

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

@@ -61 +61 @@
                 function marshall(obj,md,fid) % {{{
                         WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
-                        WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcing',1);
                         WriteData(fid,'object',obj,'fieldname','n','format','Double');
                         WriteData(fid,'object',obj,'fieldname','CR','format','Double');

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

@@ -64 +64 @@
         def marshall(self,md,fid):    # {{{
                 WriteData(fid,'enum',HydrologyModelEnum(),'data',HydrologyshreveEnum(),'format','Integer');
-                WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1,'forcing',1)
                 WriteData(fid,'object',self,'fieldname','n','format','Double')
                 WriteData(fid,'object',self,'fieldname','CR','format','Double')

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

@@ -65 +65 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcing',1);
                         WriteData(fid,'object',obj,'fieldname','min_thickness','format','Double');
                         WriteData(fid,'data',StringToEnum(obj.hydrostatic_adjustment),'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum());

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

@@ -68 +68 @@
         # }}}
         def marshall(self,md,fid):    # {{{
-                WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcing',1)
                 WriteData(fid,'object',self,'fieldname','min_thickness','format','Double')
                 WriteData(fid,'data',StringToEnum(self.hydrostatic_adjustment)[0],'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum())

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

@@ -104 +104 @@
                         yts=365.0*24.0*3600.0;
 
-                        WriteData(fid,'object',obj,'fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts);
-                        WriteData(fid,'object',obj,'fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts);
+                        WriteData(fid,'object',obj,'fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1);
+                        WriteData(fid,'object',obj,'fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1);
                         WriteData(fid,'object',obj,'fieldname','ispdd','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isdelta18o','format','Boolean');
@@ -118 +118 @@
                                         WriteData(fid,'object',obj,'fieldname','delta18o','format','DoubleMat','mattype',1);
                                 else
-                                        WriteData(fid,'object',obj,'fieldname','monthlytemperatures','format','DoubleMat','mattype',1);
-                                        WriteData(fid,'object',obj,'fieldname','precipitation','format','DoubleMat','mattype',1);
+                                        WriteData(fid,'object',obj,'fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'forcing',1);
+                                        WriteData(fid,'object',obj,'fieldname','precipitation','format','DoubleMat','mattype',1,'forcing',1);
                                 end
                         end
                         WriteData(fid,'object',obj,'fieldname','issmbgradients','format','Boolean');
                         if obj.issmbgradients,
-                                WriteData(fid,'object',obj,'fieldname','href','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',obj,'fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts);
-                                WriteData(fid,'object',obj,'fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts);
-                                WriteData(fid,'object',obj,'fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts);
+                                WriteData(fid,'object',obj,'fieldname','href','format','DoubleMat','mattype',1,'forcing',1);
+                                WriteData(fid,'object',obj,'fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1);
+                                WriteData(fid,'object',obj,'fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1);
+                                WriteData(fid,'object',obj,'fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1);
                         end
 

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

@@ -104 +104 @@
                 yts=365.0*24.0*3600.0
 
-                WriteData(fid,'object',self,'fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts)
-                WriteData(fid,'object',self,'fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts)
+                WriteData(fid,'object',self,'fieldname','precipitation','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1)
+                WriteData(fid,'object',self,'fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1)
                 WriteData(fid,'object',self,'fieldname','ispdd','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','isdelta18o','format','Boolean')
@@ -119 +119 @@
                                 WriteData(fid,'object',self,'fieldname','delta18o','format','DoubleMat','mattype',1)
                         else:
-                                WriteData(fid,'object',self,'fieldname','monthlytemperatures','format','DoubleMat','mattype',1)
-                                WriteData(fid,'object',self,'fieldname','precipitation','format','DoubleMat','mattype',1)
+                                WriteData(fid,'object',self,'fieldname','monthlytemperatures','format','DoubleMat','mattype',1,'forcing',1)
+                                WriteData(fid,'object',self,'fieldname','precipitation','format','DoubleMat','mattype',1,'forcing',1)
 
                 WriteData(fid,'object',self,'fieldname','issmbgradients','format','Boolean')
 
                 if self.issmbgradients:
-                        WriteData(fid,'object',self,'fieldname','href','format','DoubleMat','mattype',1)
-                        WriteData(fid,'object',self,'fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts)
-                        WriteData(fid,'object',self,'fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts)
-                        WriteData(fid,'object',self,'fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts)
+                        WriteData(fid,'object',self,'fieldname','href','format','DoubleMat','mattype',1,'forcing',1)
+                        WriteData(fid,'object',self,'fieldname','smbref','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1)
+                        WriteData(fid,'object',self,'fieldname','b_pos','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1)
+                        WriteData(fid,'object',self,'fieldname','b_neg','format','DoubleMat','mattype',1,'scale',1./yts,'forcing',1)
         # }}}

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

@@ -66 +66 @@
                 end % }}}
                 function marshall(obj,md,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1,'forcing',1);
                         WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');

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

@@ -72 +72 @@
         # }}}
         def marshall(self,md,fid):    # {{{
-                WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1,'forcing',1)
                 WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
                 WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')

issm/trunk-jpl/src/m/solve/WriteData.m

@@ -24 +24 @@
 format  = getfieldvalue(options,'format');
 mattype = getfieldvalue(options,'mattype',0);    %only required for matrices
+forcing = getfieldvalue(options,'forcing',1);
 
 %Process sparse matrices
@@ -33 +34 @@
 if exist(options,'scale'),
         scale = getfieldvalue(options,'scale');
-        data  = scale.*data;
+        if forcing,
+                data(1:end-1,:) = scale.*data;
+        else
+                data  = scale.*data;
+        end
 end
 

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

@@ -35 +35 @@
         format  = options.getfieldvalue('format')
         mattype = options.getfieldvalue('mattype',0)    #only required for matrices
+        forcing = options.getfieldvalue('forcing',0)
 
         #Process sparse matrices
@@ -40 +41 @@
 #               data=full(data);
 #       end
+
         #Scale data if necesarry
         if options.exist('scale'):
                 scale = options.getfieldvalue('scale')
-                data  = scale*data
+                if forcing:
+                        data[0:-1] = scale*data[0:-1]
+                else:
+                        data  = scale*data
 
         #Step 1: write the enum to identify this record uniquely