Index: ../trunk-jpl/src/m/classes/thermal.js =================================================================== --- ../trunk-jpl/src/m/classes/thermal.js (revision 19827) +++ ../trunk-jpl/src/m/classes/thermal.js (revision 19828) @@ -54,7 +54,7 @@ this.checkconsistency = function(md,solution,analyses){ // {{{ //Early return - if(!ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1) & !ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1) | (solution == TransientSolutionEnum() & md.transient.isthermal==0)) return; + if(!ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1) & !ArrayAnyEqual(ArrayIsMember(EnthalpyAnalysisEnum(),analyses),1) | (solution == TransientSolutionEnum() & md.trans.isthermal==0)) return; checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 ,1, 2]); checkfield(md,'fieldname','thermal.spctemperature','timeseries',1); Index: ../trunk-jpl/src/m/classes/gia.js =================================================================== --- ../trunk-jpl/src/m/classes/gia.js (revision 19827) +++ ../trunk-jpl/src/m/classes/gia.js (revision 19828) @@ -32,7 +32,7 @@ //be sure that if we are running a masstransport ice flow model coupled with gia, that thickness forcings //are not provided into the future. - if (solution==TransientSolutionEnum() & md.transient.ismasstransport & md.transient.isgia){ + if (solution==TransientSolutionEnum() & md.trans.ismasstransport & md.trans.isgia){ //figure out if thickness is a transient forcing: if (md.geometry.thickness.length == (md.mesh.numberofvertices+1)){ //recover the furthest time "in time": Index: ../trunk-jpl/src/m/classes/calving.js =================================================================== --- ../trunk-jpl/src/m/classes/calving.js (revision 19827) +++ ../trunk-jpl/src/m/classes/calving.js (revision 19828) @@ -25,7 +25,7 @@ }// }}} this.checkconsistency = function(md,solution,analyses) { // {{{ //Early return - if (solution!=TransientSolutionEnum() | md.transient.iscalving==0) return; + if (solution!=TransientSolutionEnum() | md.trans.iscalving==0) return; checkfield(md,'fieldname','calving.spclevelset','timeseries',1); checkfield(md,'fieldname','calving.stabilization','values',[0,1,2]); Index: ../trunk-jpl/src/m/classes/masstransport.js =================================================================== --- ../trunk-jpl/src/m/classes/masstransport.js (revision 19827) +++ ../trunk-jpl/src/m/classes/masstransport.js (revision 19828) @@ -43,7 +43,7 @@ this.checkconsistency = function (md,solution,analyses){ // {{{ //Early return - if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1) | (solution==TransientSolutionEnum() & md.transient.ismasstransport==0)) return; + if(!ArrayAnyEqual(ArrayIsMember(HydrologyShreveAnalysisEnum(),analyses),1) | (solution==TransientSolutionEnum() & md.trans.ismasstransport==0)) return; checkfield(md,'fieldname','masstransport.spcthickness','timeseries',1); checkfield(md,'fieldname','masstransport.isfreesurface','values',[0 ,1]); Index: ../trunk-jpl/src/m/classes/geometry.js =================================================================== --- ../trunk-jpl/src/m/classes/geometry.js (revision 19827) +++ ../trunk-jpl/src/m/classes/geometry.js (revision 19828) @@ -20,7 +20,7 @@ } //}}} this.checkconsistency = function(md,solution,analyses) { //{{{ - if ((solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum())){ + if ((solution==TransientSolutionEnum() & md.trans.isgia) | (solution==GiaSolutionEnum())){ checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'>=',0); } else{ @@ -33,7 +33,7 @@ break; } } - if (solution==TransientSolutionEnum() & md.transient.isgroundingline){ + if (solution==TransientSolutionEnum() & md.trans.isgroundingline){ checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices, 1]); } } Index: ../trunk-jpl/src/m/classes/basalforcings.js =================================================================== --- ../trunk-jpl/src/m/classes/basalforcings.js (revision 19827) +++ ../trunk-jpl/src/m/classes/basalforcings.js (revision 19828) @@ -35,7 +35,7 @@ this.checkconsistency = function(md,solution,analyses) { //{{{ if(ArrayAnyEqual(ArrayIsMember(MasstransportAnalysisEnum(),analyses),1)){ - if (!(solution==TransientSolutionEnum() & md.transient.ismasstransport==0)){ + if (!(solution==TransientSolutionEnum() & md.trans.ismasstransport==0)){ checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1); checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1); } @@ -46,7 +46,7 @@ checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices, 1]); } if(ArrayAnyEqual(ArrayIsMember(ThermalAnalysisEnum(),analyses),1)){ - if (!(solution==TransientSolutionEnum() & md.transient.isthermal==0)){ + if (!(solution==TransientSolutionEnum() & md.trans.isthermal==0)){ checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1); checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1); checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0); Index: ../trunk-jpl/src/m/classes/flowequation.js =================================================================== --- ../trunk-jpl/src/m/classes/flowequation.js (revision 19827) +++ ../trunk-jpl/src/m/classes/flowequation.js (revision 19828) @@ -41,7 +41,7 @@ //Early return if ( ((!ArrayAnyEqual(ArrayIsMember(StressbalanceAnalysisEnum(),analyses),1)) & (!ArrayAnyEqual(ArrayIsMember(StressbalanceSIAAnalysisEnum(),analyses),1))) | - (solution==TransientSolutionEnum() & md.transient.isstressbalance==0) + (solution==TransientSolutionEnum() & md.trans.isstressbalance==0) ) return ; checkfield(md,'fieldname','flowequation.isSIA','numel',[1],'values',[0, 1]); Index: ../trunk-jpl/src/m/classes/trans.js =================================================================== --- ../trunk-jpl/src/m/classes/trans.js (revision 19827) +++ ../trunk-jpl/src/m/classes/trans.js (revision 19828) @@ -49,17 +49,17 @@ //Early return if (solution!=TransientSolutionEnum()) return; - checkfield(md,'fieldname','transient.issmb','numel',[1],'values',[0 ,1]); - checkfield(md,'fieldname','transient.ismasstransport','numel',[1],'values',[0 ,1]); - checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0 ,1]); - checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 ,1]); - checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 ,1]); - checkfield(md,'fieldname','transient.requested_outputs','stringrow',1); + checkfield(md,'fieldname','trans.issmb','numel',[1],'values',[0 ,1]); + checkfield(md,'fieldname','trans.ismasstransport','numel',[1],'values',[0 ,1]); + checkfield(md,'fieldname','trans.isstressbalance','numel',[1],'values',[0 ,1]); + checkfield(md,'fieldname','trans.isthermal','numel',[1],'values',[0 ,1]); + checkfield(md,'fieldname','trans.isgroundingline','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.isgia','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.islevelset','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.iscalving','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0 ,1]); + checkfield(md,'fieldname','trans.requested_outputs','stringrow',1); } // }}} this.marshall=function(md,fid) { //{{{ WriteData(fid,'object',this,'fieldname','issmb','format','Boolean');