source: issm/oecreview/Archive/12678-13393/ISSM-13238-13239.diff@ 13394

Last change on this file since 13394 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 2.2 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/oldclasses/materials.m
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/oldclasses/materials.m (revision 0)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/oldclasses/materials.m (revision 13239)
5@@ -0,0 +1,20 @@
6+%OLD materials class definition
7+
8+classdef materials
9+ properties (SetAccess=public)
10+ rho_ice = 0.;
11+ rho_water = 0.;
12+ rho_freshwater = 0.;
13+ mu_water = 0.;
14+ heatcapacity = 0.;
15+ latentheat = 0.;
16+ thermalconductivity = 0.;
17+ meltingpoint = 0.;
18+ beta = 0.;
19+ mixed_layer_capacity = 0.;
20+ thermal_exchange_velocity = 0.;
21+ rheology_B = NaN;
22+ rheology_n = NaN;
23+ rheology_law = '';
24+ end
25+end
26Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/oldclasses/README
27===================================================================
28--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/oldclasses/README (revision 0)
29+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/oldclasses/README (revision 13239)
30@@ -0,0 +1,3 @@
31+We put here all old classes so that matlab can still load old models
32+When an object is renamed or deleted, matlab is not able to load it
33+anymore. We keep it here so that matlab can load the object
34Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m
35===================================================================
36--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 13238)
37+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 13239)
38@@ -71,6 +71,13 @@
39 disp('Recovering model object from a previous version');
40 md = structtomodel(model,md);
41 end
42+
43+ %2012 August 4th
44+ if isa(md.materials,'materials'),
45+ disp('Recovering old materials');
46+ md.materials=matice(md.materials);
47+ end
48+
49 end% }}}
50 end
51 methods
Note: See TracBrowser for help on using the repository browser.