source: issm/oecreview/Archive/24684-25833/ISSM-25381-25382.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 3.9 KB
RevLine 
[25834]1Index: ../trunk-jpl/src/m/classes/SMBpddSicopolis.m
2===================================================================
3--- ../trunk-jpl/src/m/classes/SMBpddSicopolis.m (revision 25381)
4+++ ../trunk-jpl/src/m/classes/SMBpddSicopolis.m (revision 25382)
5@@ -82,8 +82,8 @@
6 md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
7 md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
8 md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',1);
9- md = checkfield(md,'fieldname','smb.monthlytemperatures','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
10- md = checkfield(md,'fieldname','smb.precipitation','timeseries',1,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
11+ md = checkfield(md,'fieldname','smb.monthlytemperatures','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
12+ md = checkfield(md,'fieldname','smb.precipitation','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 12]);
13
14 end
15 md = checkfield(md,'fieldname','smb.steps_per_step','>=',1,'numel',[1]);
16Index: ../trunk-jpl/src/m/classes/SMBd18opdd.m
17===================================================================
18--- ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 25381)
19+++ ../trunk-jpl/src/m/classes/SMBd18opdd.m (revision 25382)
20@@ -91,8 +91,8 @@
21 md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',1);
22
23 if(self.isd18opd==1)
24- md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1,'timeseries',1);
25- md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1,'timeseries',1);
26+ md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1);
27+ md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1);
28 md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,NaN],'singletimeseries',1);
29 md = checkfield(md,'fieldname','smb.dpermil','>=',0,'numel',1);
30 md = checkfield(md,'fieldname','smb.f','>=',0,'numel',1);
31Index: ../trunk-jpl/src/m/classes/SMBd18opdd.py
32===================================================================
33--- ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 25381)
34+++ ../trunk-jpl/src/m/classes/SMBd18opdd.py (revision 25382)
35@@ -42,7 +42,6 @@
36 self.setdefaultparameters()
37 self.requested_outputs = []
38 #}}}
39-
40 def __repr__(self): # {{{
41 string = " surface forcings parameters:"
42
43@@ -81,7 +80,6 @@
44
45 return string
46 #}}}
47-
48 def extrude(self, md): # {{{
49 if self.isd18opd:
50 self.temperatures_presentday = project3d(md, 'vector', self.temperatures_presentday, 'type', 'node')
51@@ -97,11 +95,9 @@
52 self.s0t = project3d(md, 'vector', self.s0t, 'type', 'node')
53 return self
54 #}}}
55-
56 def defaultoutputs(self, md): # {{{
57 return []
58 #}}}
59-
60 def initialize(self, md): # {{{
61 if np.all(np.isnan(self.s0p)):
62 self.s0p = np.zeros((md.mesh.numberofvertices))
63@@ -112,7 +108,6 @@
64 print(" no SMBd18opdd.s0t specified: values set as zero")
65 return self
66 # }}}
67-
68 def setdefaultparameters(self): # {{{
69 #pdd method not used in default mode
70 self.ismungsm = 0
71@@ -127,7 +122,6 @@
72 self.issetpddfac = 0
73 return self
74 #}}}
75-
76 def checkconsistency(self, md, solution, analyses): # {{{
77 if 'MasstransportAnalysis' in analyses:
78 md = checkfield(md, 'fieldname', 'smb.desfac', '<=', 1, 'numel', [1])
79@@ -167,7 +161,6 @@
80 md = checkfield(md, 'fieldname', 'masstransport.requested_outputs', 'stringrow', 1)
81 return md
82 # }}}
83-
84 def marshall(self, prefix, md, fid): # {{{
85 yts = md.constants.yts
86
Note: See TracBrowser for help on using the repository browser.