source: issm/oecreview/Archive/19101-20495/ISSM-19827-19828.diff

Last change on this file was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 8.2 KB
RevLine 
[20498]1Index: ../trunk-jpl/src/m/classes/thermal.js
2===================================================================
3--- ../trunk-jpl/src/m/classes/thermal.js (revision 19827)
4+++ ../trunk-jpl/src/m/classes/thermal.js (revision 19828)
5@@ -54,7 +54,7 @@
6 this.checkconsistency = function(md,solution,analyses){ // {{{
7
8 //Early return
9- if(!ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1) & !ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1) | (solution == TransientSolutionEnum() & md.transient.isthermal==0)) return;
10+ if(!ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1) & !ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1) | (solution == TransientSolutionEnum() & md.trans.isthermal==0)) return;
11
12 checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 ,1, 2]);
13 checkfield(md,'fieldname','thermal.spctemperature','timeseries',1);
14Index: ../trunk-jpl/src/m/classes/gia.js
15===================================================================
16--- ../trunk-jpl/src/m/classes/gia.js (revision 19827)
17+++ ../trunk-jpl/src/m/classes/gia.js (revision 19828)
18@@ -32,7 +32,7 @@
19
20 //be sure that if we are running a masstransport ice flow model coupled with gia, that thickness forcings
21 //are not provided into the future.
22- if (solution==TransientSolutionEnum() & md.transient.ismasstransport & md.transient.isgia){
23+ if (solution==TransientSolutionEnum() & md.trans.ismasstransport & md.trans.isgia){
24 //figure out if thickness is a transient forcing:
25 if (md.geometry.thickness.length == (md.mesh.numberofvertices+1)){
26 //recover the furthest time "in time":
27Index: ../trunk-jpl/src/m/classes/calving.js
28===================================================================
29--- ../trunk-jpl/src/m/classes/calving.js (revision 19827)
30+++ ../trunk-jpl/src/m/classes/calving.js (revision 19828)
31@@ -25,7 +25,7 @@
32 }// }}}
33 this.checkconsistency = function(md,solution,analyses) { // {{{
34 //Early return
35- if (solution!=TransientSolutionEnum() | md.transient.iscalving==0) return;
36+ if (solution!=TransientSolutionEnum() | md.trans.iscalving==0) return;
37
38 checkfield(md,'fieldname','calving.spclevelset','timeseries',1);
39 checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]);
40Index: ../trunk-jpl/src/m/classes/masstransport.js
41===================================================================
42--- ../trunk-jpl/src/m/classes/masstransport.js (revision 19827)
43+++ ../trunk-jpl/src/m/classes/masstransport.js (revision 19828)
44@@ -43,7 +43,7 @@
45 this.checkconsistency = function (md,solution,analyses){ // {{{
46
47 //Early return
48- if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1) | (solution==TransientSolutionEnum() & md.transient.ismasstransport==0)) return;
49+ if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1) | (solution==TransientSolutionEnum() & md.trans.ismasstransport==0)) return;
50
51 checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1);
52 checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 ,1]);
53Index: ../trunk-jpl/src/m/classes/geometry.js
54===================================================================
55--- ../trunk-jpl/src/m/classes/geometry.js (revision 19827)
56+++ ../trunk-jpl/src/m/classes/geometry.js (revision 19828)
57@@ -20,7 +20,7 @@
58 } //}}}
59 this.checkconsistency = function(md,solution,analyses) { //{{{
60
61- if ((solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum())){
62+ if ((solution==TransientSolutionEnum() & md.trans.isgia) | (solution==GiaSolutionEnum())){
63 checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'>=',0);
64 }
65 else{
66@@ -33,7 +33,7 @@
67 break;
68 }
69 }
70- if (solution==TransientSolutionEnum() & md.transient.isgroundingline){
71+ if (solution==TransientSolutionEnum() & md.trans.isgroundingline){
72 checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices, 1]);
73 }
74 }
75Index: ../trunk-jpl/src/m/classes/basalforcings.js
76===================================================================
77--- ../trunk-jpl/src/m/classes/basalforcings.js (revision 19827)
78+++ ../trunk-jpl/src/m/classes/basalforcings.js (revision 19828)
79@@ -35,7 +35,7 @@
80 this.checkconsistency = function(md,solution,analyses) { //{{{
81
82 if(ArrayAnyEqual(ArrayIsMember(MasstransportAnalysisEnum(),analyses),1)){
83- if (!(solution==TransientSolutionEnum() & md.transient.ismasstransport==0)){
84+ if (!(solution==TransientSolutionEnum() & md.trans.ismasstransport==0)){
85 checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
86 checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1);
87 }
88@@ -46,7 +46,7 @@
89 checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices, 1]);
90 }
91 if(ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1)){
92- if (!(solution==TransientSolutionEnum() & md.transient.isthermal==0)){
93+ if (!(solution==TransientSolutionEnum() & md.trans.isthermal==0)){
94 checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
95 checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1);
96 checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0);
97Index: ../trunk-jpl/src/m/classes/flowequation.js
98===================================================================
99--- ../trunk-jpl/src/m/classes/flowequation.js (revision 19827)
100+++ ../trunk-jpl/src/m/classes/flowequation.js (revision 19828)
101@@ -41,7 +41,7 @@
102
103 //Early return
104 if ( ((!ArrayAnyEqual(ArrayIsMember(StressbalanceAnalysisEnum(),analyses),1)) & (!ArrayAnyEqual(ArrayIsMember(StressbalanceSIAAnalysisEnum(),analyses),1))) |
105- (solution==TransientSolutionEnum() & md.transient.isstressbalance==0)
106+ (solution==TransientSolutionEnum() & md.trans.isstressbalance==0)
107 ) return ;
108
109 checkfield(md,'fieldname','flowequation.isSIA','numel',[1],'values',[0, 1]);
110Index: ../trunk-jpl/src/m/classes/trans.js
111===================================================================
112--- ../trunk-jpl/src/m/classes/trans.js (revision 19827)
113+++ ../trunk-jpl/src/m/classes/trans.js (revision 19828)
114@@ -49,17 +49,17 @@
115 //Early return
116 if (solution!=TransientSolutionEnum()) return;
117
118- checkfield(md,'fieldname','transient.issmb','numel',[1],'values',[0 ,1]);
119- checkfield(md,'fieldname','transient.ismasstransport','numel',[1],'values',[0 ,1]);
120- checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0 ,1]);
121- checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 ,1]);
122- checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0, 1]);
123- checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0, 1]);
124- checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0, 1]);
125- checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0, 1]);
126- checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0, 1]);
127- checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 ,1]);
128- checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
129+ checkfield(md,'fieldname','trans.issmb','numel',[1],'values',[0 ,1]);
130+ checkfield(md,'fieldname','trans.ismasstransport','numel',[1],'values',[0 ,1]);
131+ checkfield(md,'fieldname','trans.isstressbalance','numel',[1],'values',[0 ,1]);
132+ checkfield(md,'fieldname','trans.isthermal','numel',[1],'values',[0 ,1]);
133+ checkfield(md,'fieldname','trans.isgroundingline','numel',[1],'values',[0, 1]);
134+ checkfield(md,'fieldname','trans.isgia','numel',[1],'values',[0, 1]);
135+ checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]);
136+ checkfield(md,'fieldname','trans.islevelset','numel',[1],'values',[0, 1]);
137+ checkfield(md,'fieldname','trans.iscalving','numel',[1],'values',[0, 1]);
138+ checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0 ,1]);
139+ checkfield(md,'fieldname','trans.requested_outputs','stringrow',1);
140 } // }}}
141 this.marshall=function(md,fid) { //{{{
142 WriteData(fid,'object',this,'fieldname','issmb','format','Boolean');
Note: See TracBrowser for help on using the repository browser.