Changeset 25150 for issm/trunk-jpl/src/m/classes/materials.m

Timestamp:

06/24/20 22:26:13 (5 years ago)

Author:

Eric.Larour

Message:

CHG: materials hydro class was missing fresh water density for hydrological applications.
Also added hydrological fingerprints capabilities for sealevelchange core.

File:

• issm/trunk-jpl/src/m/classes/materials.m (modified) (6 diffs)

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

@@ -58 +58 @@
                                         self.addprop('rho_ice');
                                         self.addprop('rho_water');
+                                        self.addprop('rho_freshwater');
                                         self.addprop('earth_density');
                                 otherwise
@@ -138 +139 @@
                                         % average density of the Earth (kg/m^3)
                                         self.earth_density=5512;
+
+                                        %fresh water density (kg/m^3)
+                                        self.rho_freshwater=1000.;
 
                                 otherwise
@@ -184 +188 @@
                                         fielddisplay(self,'rho_water','ocean water density [kg/m^3]');
                                         fielddisplay(self,'earth_density','mantle density [kg/m^3]');
+                                        fielddisplay(self,'rho_freshwater','fresh water density [kg/m^3]');
 
                                 otherwise
@@ -233 +238 @@
                                         md = checkfield(md,'fieldname','materials.rho_water','>',0);
                                         md = checkfield(md,'fieldname','materials.earth_density','>',0,'numel',1);
+                                        md = checkfield(md,'fieldname','materials.rho_freshwater','>',0);
 
                                 otherwise
@@ -280 +286 @@
                                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_water','format','Double');
                                         WriteData(fid,prefix,'object',self,'class','materials','fieldname','earth_density','format','Double');
+                                        WriteData(fid,prefix,'object',self,'class','materials','fieldname','rho_freshwater','format','Double');
 
                                 otherwise
@@ -334 +341 @@
                                         writejsdouble(fid,[modelname '.materials.rho_water'],self.rho_water);
                                         writejsdouble(fid,[modelname '.materials.earth_density'],self.earth_density);
+                                        writejsdouble(fid,[modelname '.materials.rho_freshwater'],self.rho_freshwater);
 
                                 otherwise