Changeset 21418

Timestamp:

11/23/16 09:20:29 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding extraction/collapse of some variables

Location:

issm/trunk-jpl/src/m/classes

Files:

• linearbasalforcings.m (modified) (2 diffs)
• model.m (modified) (1 diff)

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

@@ -7 +7 @@
         properties (SetAccess=public) 
                 groundedice_melting_rate  = NaN;
-                deepwater_melting_rate    = NaN;
-                deepwater_elevation       = NaN;
-                upperwater_elevation      = NaN;
+                deepwater_melting_rate    = 0.;
+                deepwater_elevation       = 0.;
+                upperwater_elevation      = 0.;
                 geothermalflux            = NaN;
         end
@@ -22 +22 @@
                                         error('constructor not supported');
                         end
+                end % }}}
+                function self = extrude(self,md) % {{{
+                        self.groundedice_melting_rate=project3d(md,'vector',self.groundedice_melting_rate,'type','node','layer',1); 
+                        self.geothermalflux=project3d(md,'vector',self.geothermalflux,'type','node','layer',1); %bedrock only gets geothermal flux
                 end % }}}
                 function self = initialize(self,md) % {{{

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

@@ -248 +248 @@
                         if numel(md.levelset.spclevelset)>1, md.levelset.spclevelset=project2d(md,md.levelset.spclevelset,md.mesh.numberoflayers); end
                         md.thermal.spctemperature=project2d(md,md.thermal.spctemperature,md.mesh.numberoflayers);
+                        md.damage.spcdamage=project2d(md,md.damage.spcdamage,md.mesh.numberoflayers);
 
                         % Hydrologydc variables