Changeset 14753

Timestamp:

04/25/13 09:05:43 (12 years ago)

Author:

bdef

Message:

BUG: fixed a test in gia classe

Location:

issm/trunk-jpl/src/m/classes

Files:

• gia.m (modified) (1 diff)
• hydrologydc.m (modified) (2 diffs)

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

@@ -22 +22 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
                  
-                        if ~ismember(HydrologyAnalysisEnum(),analyses), return; end
+                        if ~ismember(GiaAnalysisEnum(),analyses), return; end
                         md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
 

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

@@ -57 +57 @@
                         md = checkfield(md,'hydrology.sediment_transmitivity','>',0,'numel',1);
                         md = checkfield(md,'hydrology.water_compressibility','>',0,'numel',1);
-                        
-                        md = checkfield(md,'hydrology.spcepl_head','forcing',1);
-                        md = checkfield(md,'hydrology.epl_compressibility','>',0,'numel',1);
-                        md = checkfield(md,'hydrology.epl_porosity','>',0,'numel',1);
-                        md = checkfield(md,'hydrology.epl_thickness','>',0,'numel',1);
-                        md = checkfield(md,'hydrology.epl_transmitivity','>',0,'numel',1);
-                        md = checkfield(md,'hydrology.isefficientlayer','numel',[1],'values',[0 1]);
-                        
+
+                        if obj.isefficientlayer==1,
+                                
+                                md = checkfield(md,'hydrology.spcepl_head','forcing',1);
+                                md = checkfield(md,'hydrology.epl_compressibility','>',0,'numel',1);
+                                md = checkfield(md,'hydrology.epl_porosity','>',0,'numel',1);
+                                md = checkfield(md,'hydrology.epl_thickness','>',0,'numel',1);
+                                md = checkfield(md,'hydrology.epl_transmitivity','>',0,'numel',1);
+                                md = checkfield(md,'hydrology.isefficientlayer','numel',[1],'values',[0 1]);
+            end
                 end % }}}
                 function disp(obj) % {{{
@@ -77 +79 @@
                         fielddisplay(obj,'water_compressibility','water compressibility [Pa^-1]');
 
-                        if isefficientlayer==1,
+                        if obj.isefficientlayer==1,
                                 disp(sprintf('   - for the epl layer'));