Skip to content

Fix universal size checks #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lawrenceabird wants to merge 1 commit into from
Closed

Fix universal size checks #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/m/classes/basalforcingsbeckmanngoosse.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function createxml(self,fid) % {{{

if ismember('MasstransportAnalysis',analyses) & ~(solution=='TransientSolution' & md.transient.ismasstransport==0),
md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.isthermalforcing','values',[0 1]);
if(self.isthermalforcing==0)
md = checkfield(md,'fieldname','basalforcings.ocean_temp','NaN',1,'Inf',1,'timeseries',1);
Expand All @@ -92,7 +92,7 @@ function createxml(self,fid) % {{{
end
if ismember('BalancethicknessAnalysis',analyses),
md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.isthermalforcing','values',[0 1]);
if(self.isthermalforcing==0)
md = checkfield(md,'fieldname','basalforcings.ocean_temp','NaN',1,'Inf',1,'timeseries',1);
Expand All @@ -104,7 +104,7 @@ function createxml(self,fid) % {{{
if ismember('ThermalAnalysis',analyses) & ~(solution=='TransientSolution' & md.transient.isthermal==0),
md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'size','universal','NaN',1,'Inf',1);
end
end % }}}
function disp(self) % {{{
Expand Down
2 changes: 1 addition & 1 deletion src/m/classes/hydrologyshakti.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','hydrology.spchead','Inf',1,'timeseries',1);
md = checkfield(md,'fieldname','hydrology.relaxation','>=',0);
md = checkfield(md,'fieldname','hydrology.storage','>=',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','hydrology.storage','>=',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1);
end % }}}
function disp(self) % {{{
Expand Down
4 changes: 2 additions & 2 deletions src/m/classes/matice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ function matice(){
checkfield(md,'fieldname','materials.rho_water','>',0);
checkfield(md,'fieldname','materials.rho_freshwater','>',0);
checkfield(md,'fieldname','materials.mu_water','>',0);
checkfield(md,'fieldname','materials.rheology_B','>',0,'universal',1,'NaN',1,'Inf',1);
checkfield(md,'fieldname','materials.rheology_n','>',0,'universal',1,'NaN',1,'Inf',1);
checkfield(md,'fieldname','materials.rheology_B','>',0,'size','universal','NaN',1,'Inf',1);
checkfield(md,'fieldname','materials.rheology_n','>',0,'size','universal','NaN',1,'Inf',1);
checkfield(md,'fieldname','materials.rheology_law','values',['None','BuddJacka','Cuffey','CuffeyTemperate','Paterson','Arrhenius','LliboutryDuval','NyeH2O','NyeCO2']);
checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0,1,2])
}
Expand Down
4 changes: 2 additions & 2 deletions src/m/classes/matice.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
md = checkfield(md,'fieldname','materials.rho_water','>',0);
md = checkfield(md,'fieldname','materials.rho_freshwater','>',0);
md = checkfield(md,'fieldname','materials.mu_water','>',0);
md = checkfield(md,'fieldname','materials.rheology_B','>',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','materials.rheology_n','>',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','materials.rheology_B','>',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','materials.rheology_law','values',{'None' 'BuddJacka' 'Cuffey' 'CuffeyTemperate' 'Paterson' 'Arrhenius' 'LliboutryDuval' 'NyeCO2' 'NyeH2O'});
md = checkfield(md,'fieldname','materials.effectiveconductivity_averaging','numel',[1],'values',[0 1 2]);
end
Expand Down
4 changes: 2 additions & 2 deletions src/m/classes/matice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ def checkconsistency(self, md, solution, analyses): # {{{
md = checkfield(md, 'fieldname', 'materials.rho_water', '>', 0)
md = checkfield(md, 'fieldname', 'materials.rho_freshwater', '>', 0)
md = checkfield(md, 'fieldname', 'materials.mu_water', '>', 0)
md = checkfield(md, 'fieldname', 'materials.rheology_B', '>', 0, 'universal', 1, 'NaN', 1, 'Inf', 1)
md = checkfield(md, 'fieldname', 'materials.rheology_n', '>', 0, 'universal',1, 'NaN', 1, 'Inf', 1)
md = checkfield(md, 'fieldname', 'materials.rheology_B', '>', 0, 'size', 'universal', 'NaN', 1, 'Inf', 1)
md = checkfield(md, 'fieldname', 'materials.rheology_n', '>', 0, 'size', 'universal', 'NaN', 1, 'Inf', 1)
md = checkfield(md, 'fieldname', 'materials.rheology_law', 'values', ['None', 'BuddJacka', 'Cuffey', 'CuffeyTemperate', 'Paterson', 'Arrhenius', 'LliboutryDuval', 'NyeCO2', 'NyeH2O'])
md = checkfield(md, 'fieldname', 'materials.effectiveconductivity_averaging', 'numel', [1], 'values', [0, 1, 2])

Expand Down
6 changes: 3 additions & 3 deletions src/m/classes/mismipbasalforcings.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@

if ismember('MasstransportAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.ismasstransport==0),
md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',1);
md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',1);
end
if ismember('BalancethicknessAnalysis',analyses),
md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',1);
md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',1);
end
if ismember('ThermalAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.isthermal==0),
md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'universal',1,'NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'size','universal','NaN',1,'Inf',1);
md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',1);
md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',1);
md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0);
Expand Down
Loading