source: issm/oecreview/Archive/21337-21723/ISSM-21417-21418.diff@ 21726

Last change on this file since 21726 was 21726, checked in by Mathieu Morlighem, 8 years ago

CHG added Archive/21337-21723

File size: 1.8 KB
RevLine 
[21726]1Index: ../trunk-jpl/src/m/classes/model.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/model.m (revision 21417)
4+++ ../trunk-jpl/src/m/classes/model.m (revision 21418)
5@@ -247,6 +247,7 @@
6 if ~isnan(md.damage.spcdamage), md.damage.spcdamage=project2d(md,md.damage.spcdamage,md.mesh.numberoflayers); end
7 if numel(md.levelset.spclevelset)>1, md.levelset.spclevelset=project2d(md,md.levelset.spclevelset,md.mesh.numberoflayers); end
8 md.thermal.spctemperature=project2d(md,md.thermal.spctemperature,md.mesh.numberoflayers);
9+ md.damage.spcdamage=project2d(md,md.damage.spcdamage,md.mesh.numberoflayers);
10
11 % Hydrologydc variables
12 if isa(md.hydrology,'hydrologydc');
13Index: ../trunk-jpl/src/m/classes/linearbasalforcings.m
14===================================================================
15--- ../trunk-jpl/src/m/classes/linearbasalforcings.m (revision 21417)
16+++ ../trunk-jpl/src/m/classes/linearbasalforcings.m (revision 21418)
17@@ -6,9 +6,9 @@
18 classdef linearbasalforcings
19 properties (SetAccess=public)
20 groundedice_melting_rate = NaN;
21- deepwater_melting_rate = NaN;
22- deepwater_elevation = NaN;
23- upperwater_elevation = NaN;
24+ deepwater_melting_rate = 0.;
25+ deepwater_elevation = 0.;
26+ upperwater_elevation = 0.;
27 geothermalflux = NaN;
28 end
29 methods
30@@ -22,6 +22,10 @@
31 error('constructor not supported');
32 end
33 end % }}}
34+ function self = extrude(self,md) % {{{
35+ self.groundedice_melting_rate=project3d(md,'vector',self.groundedice_melting_rate,'type','node','layer',1);
36+ self.geothermalflux=project3d(md,'vector',self.geothermalflux,'type','node','layer',1); %bedrock only gets geothermal flux
37+ end % }}}
38 function self = initialize(self,md) % {{{
39
40 if isnan(self.groundedice_melting_rate),
Note: See TracBrowser for help on using the repository browser.