Changeset 15203

Timestamp:

06/06/13 16:23:19 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not check GIA stuff if not in analyses

Location:

issm/trunk-jpl/src/m/classes

Files:

• matdamageice.m (modified) (1 diff)
• matice.m (modified) (1 diff)

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

@@ -103 +103 @@
                         md = checkfield(md,'materials.rheology_Z','>',0,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius'});
-                        md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',1);
-                        md = checkfield(md,'materials.lithosphere_density','>',0,'numel',1);
-                        md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',1);
-                        md = checkfield(md,'materials.mantle_density','>',0,'numel',1);
+
+                        if ismember(GiaAnalysisEnum(),analyses),
+                                md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',1);
+                                md = checkfield(md,'materials.lithosphere_density','>',0,'numel',1);
+                                md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',1);
+                                md = checkfield(md,'materials.mantle_density','>',0,'numel',1);
+                        end
 
                 end % }}}

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

@@ -101 +101 @@
                         md = checkfield(md,'materials.rheology_n','>',0,'size',[md.mesh.numberofelements 1]);
                         md = checkfield(md,'materials.rheology_law','values',{'None' 'Paterson' 'Arrhenius'});
-                        md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',1);
-                        md = checkfield(md,'materials.lithosphere_density','>',0,'numel',1);
-                        md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',1);
-                        md = checkfield(md,'materials.mantle_density','>',0,'numel',1);
+
+                        if ismember(GiaAnalysisEnum(),analyses),
+                                md = checkfield(md,'materials.lithosphere_shear_modulus','>',0,'numel',1);
+                                md = checkfield(md,'materials.lithosphere_density','>',0,'numel',1);
+                                md = checkfield(md,'materials.mantle_shear_modulus','>',0,'numel',1);
+                                md = checkfield(md,'materials.mantle_density','>',0,'numel',1);
+                        end
 
                 end % }}}