Changeset 24741

Timestamp:

04/27/20 12:08:10 (5 years ago)

Author:

Eric.Larour

Message:

CHG: skip some checks in case we are running slr solution.

File:

• issm/trunk-jpl/src/m/classes/matice.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/matice.m

@@ -112 +112 @@
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
-                        md = checkfield(md,'fieldname','materials.rho_ice','>',0);
-                        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,'timeseries',1,'NaN',1,'Inf',1);
-                        md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements 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]);
+        
+                        if ~strcmpi(solution,'SealevelriseSolution'),
+                                md = checkfield(md,'fieldname','materials.rho_ice','>',0);
+                                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,'timeseries',1,'NaN',1,'Inf',1);
+                                md = checkfield(md,'fieldname','materials.rheology_n','>',0,'size',[md.mesh.numberofelements 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
 
                         if ismember('GiaAnalysis',analyses),