Changeset 14724 for issm/trunk-jpl/src/m/classes/model/model.m

Timestamp:

04/23/13 14:52:18 (12 years ago)

Author:

Eric.Larour

Message:

CHG: introduced all the enums necessary for element inputs to the GiaDeflectionCore.
Introduced new fields in materials to include some of the material properties of the mantle
and lithosphere.
Introduced new class gia in model to control the lithosphere thickness.

File:

• issm/trunk-jpl/src/m/classes/model/model.m (modified) (5 diffs)

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

@@ -36 +36 @@
                 steadystate      = 0;
                 transient        = 0;
+                gia              = 0;
 
                 autodiff         = 0;
@@ -208 +209 @@
                         md.geometry.surface=project2d(md,md.geometry.surface,1);
                         md.geometry.thickness=project2d(md,md.geometry.thickness,1);
+                        md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1);
                         md.geometry.bed=project2d(md,md.geometry.bed,1);
                         md.geometry.bathymetry=project2d(md,md.geometry.bathymetry,1);
@@ -753 +755 @@
                         md.geometry.surface=project3d(md,'vector',md.geometry.surface,'type','node');
                         md.geometry.thickness=project3d(md,'vector',md.geometry.thickness,'type','node');
+                        md.gia.lithosphere_thickness=project3d(md,'vector',md.gia.lithosphere_thickness,'type','node');
                         md.geometry.hydrostatic_ratio=project3d(md,'vector',md.geometry.hydrostatic_ratio,'type','node');
                         md.geometry.bed=project3d(md,'vector',md.geometry.bed,'type','node');
@@ -1096 +1099 @@
                         md.steadystate      = steadystate();
                         md.transient        = transient();
+                        md.gia              = gia();
                         md.autodiff         = autodiff();
                         md.flaim            = flaim();
@@ -1132 +1136 @@
                         disp(sprintf('%19s: %-22s -- %s','steadystate'     ,['[1x1 ' class(obj.steadystate) ']'],'parameters for steadystate solution'));
                         disp(sprintf('%19s: %-22s -- %s','transient'       ,['[1x1 ' class(obj.transient) ']'],'parameters for transient solution'));
+                        disp(sprintf('%19s: %-22s -- %s','gia'       ,['[1x1 ' class(obj.gia) ']'],'parameters for gia solution'));
                         disp(sprintf('%19s: %-22s -- %s','autodiff'        ,['[1x1 ' class(obj.autodiff) ']'],'automatic differentiation parameters'));
                         disp(sprintf('%19s: %-22s -- %s','flaim'           ,['[1x1 ' class(obj.flaim) ']'],'flaim parameters'));