Changeset 15125


Ignore:
Timestamp:
05/28/13 09:39:57 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moved more conversions from Core to classes

Location:
issm/trunk-jpl/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp

    r15124 r15125  
    4949                case HydrologyWaterVyEnum:                   scale=yts;break;     //m/yr
    5050                case VxEnum:                                 scale=yts;break;     //m/yr
    51                 case InversionVxObsEnum:                     scale=yts;break;     //m/yr
    5251                case VyEnum:                                 scale=yts;break;     //m/yr
    53                 case InversionVyObsEnum:                     scale=yts;break;     //m/yr
    5452                case VzEnum:                                 scale=yts;break;     //m/yr
    55                 case InversionVzObsEnum:                     scale=yts;break;     //m/yr
    5653                case VelEnum:                                scale=yts;break;     //m/yr
    57                 case InversionVelObsEnum:                    scale=yts;break;     //m/yr
    58                 case BalancethicknessThickeningRateEnum:     scale=yts;break;     //m/yr
    5954                case BasalforcingsMeltingRateEnum:           scale=yts;break;     //m/yr
    6055                case BasalforcingsMeltingRateCorrectionEnum: scale=yts;break;     //m/yr
    … …  
    6762                case MassFluxEnum:                           scale=pow((IssmDouble)10,-12)*yts;break; // (GigaTon/year)
    6863                case TotalSmbEnum:                           scale=pow((IssmDouble)10,-12)*yts;break; // (GigaTon/year)
    69                 case GiaLithosphereThicknessEnum:            scale=pow((IssmDouble)10,-3);break; // (km)
    70                 case MaterialsLithosphereDensityEnum:        scale=pow((IssmDouble)10,-3);break; // (km)
    71                 case MaterialsMantleDensityEnum:             scale=pow((IssmDouble)10,-3);break; // (km)
    7264                default: scale=1.0; break;
    7365        }

  • issm/trunk-jpl/src/m/classes/balancethickness.m

    r14640 r15125  
    4242                end % }}}
    4343                function marshall(obj,fid) % {{{
     44
     45                        yts=365.0*24.0*3600.0;
     46
    4447                        WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1);
    45                         WriteData(fid,'object',obj,'fieldname','thickening_rate','format','DoubleMat','mattype',1);
     48                        WriteData(fid,'object',obj,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts);
    4649                        WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');
    4750                end % }}}

  • issm/trunk-jpl/src/m/classes/balancethickness.py

    r14640 r15125  
    4949        # }}}
    5050        def marshall(self,fid):    # {{{
     51
     52                yts=365.0*24.0*3600.0
     53
    5154                WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1)
    52                 WriteData(fid,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1)
     55                WriteData(fid,'object',self,'fieldname','thickening_rate','format','DoubleMat','mattype',1,'scale',1./yts)
    5356                WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
    5457        # }}}

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

    r14972 r15125  
    5252
    5353                        fielddisplay(obj,'mantle_viscosity','mantle viscosity[Pa s]');
    54                         fielddisplay(obj,'lithosphere_thickness','lithosphere thickness[km]');
     54                        fielddisplay(obj,'lithosphere_thickness','lithosphere thickness (km)');
    5555                        fielddisplay(obj,'output_rates','1: fetch w solution (m) (default). 2: fetch dw/dt (mm/yr). See irate in GiaDeflectionCore');
    5656                        fielddisplay(obj,'cross_section_shape','1: square-edged (default). 2: elliptical.  See iedge in GiaDeflectionCore');
    … …  
    5959                function marshall(obj,fid) % {{{
    6060                        WriteData(fid,'object',obj,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
    61                         WriteData(fid,'object',obj,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1);
     61                        WriteData(fid,'object',obj,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1,'scale',10^3); %from km to m
    6262                        WriteData(fid,'object',obj,'fieldname','output_rates','format','Integer');
    6363                        WriteData(fid,'object',obj,'fieldname','cross_section_shape','format','Integer');

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

    r14901 r15125  
    2626                string='   gia solution parameters:'
    2727               
    28                 string="%s\n%s"%(string,fielddisplay(self,'mantle_viscosity','mantle viscosity constraints (NaN means no constraint) [Pa s]'))
    29                 string="%s\n%s"%(string,fielddisplay(self,'lithosphere_thickness','lithosphere thickness constraints (NaN means no constraint) [m]'))
    30                 string="%s\n%s"%(string,fielddisplay(self,'output_rates','1: deflection (w) [m], 2: rate of deflection (dw/dt) [mm/yr]'))
     28                string="%s\n%s"%(string,fielddisplay(self,'mantle_viscosity','mantle viscosity constraints (NaN means no constraint) (Pa s)'))
     29                string="%s\n%s"%(string,fielddisplay(self,'lithosphere_thickness','lithosphere thickness constraints (NaN means no constraint) (m)'))
     30                string="%s\n%s"%(string,fielddisplay(self,'output_rates','1: deflection (w) (m), 2: rate of deflection (dw/dt) (mm/yr)'))
    3131                string="%s\n%s"%(string,fielddisplay(self,'cross_section_shape',"1: square-edged, 2: elliptical-edged surface"))
    3232                return string
    … …  
    5656        # }}}
    5757        def marshall(self,fid):    # {{{
     58
    5859                WriteData(fid,'object',self,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
    59                 WriteData(fid,'object',self,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1);
     60                WriteData(fid,'object',self,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1,'scale',10.**3.);
    6061                WriteData(fid,'object',self,'fieldname','output_rates','format','Integer');
    6162                WriteData(fid,'object',self,'fieldname','cross_section_shape','format','Integer');

  • issm/trunk-jpl/src/m/classes/inversion.m

    r14640 r15125  
    163163                function marshall(obj,fid) % {{{
    164164
     165                        yts=365.0*24.0*3600.0;
     166
    165167                        WriteData(fid,'object',obj,'fieldname','iscontrol','format','Boolean');
    166168                        WriteData(fid,'object',obj,'fieldname','tao','format','Boolean');
    … …  
    176178                        WriteData(fid,'object',obj,'fieldname','step_threshold','format','DoubleMat','mattype',3);
    177179                        WriteData(fid,'object',obj,'fieldname','gradient_only','format','Boolean');
    178                         WriteData(fid,'object',obj,'fieldname','vx_obs','format','DoubleMat','mattype',1);
    179                         WriteData(fid,'object',obj,'fieldname','vy_obs','format','DoubleMat','mattype',1);
    180                         WriteData(fid,'object',obj,'fieldname','vz_obs','format','DoubleMat','mattype',1);
     180                        WriteData(fid,'object',obj,'fieldname','vx_obs','format','DoubleMat','mattype',1,'scale',1./yts);
     181                        WriteData(fid,'object',obj,'fieldname','vy_obs','format','DoubleMat','mattype',1,'scale',1./yts);
     182                        WriteData(fid,'object',obj,'fieldname','vz_obs','format','DoubleMat','mattype',1,'scale',1./yts);
    181183                        WriteData(fid,'object',obj,'fieldname','thickness_obs','format','DoubleMat','mattype',1);
    182184

  • issm/trunk-jpl/src/m/classes/inversion.py

    r14640 r15125  
    145145        def marshall(self,fid):    # {{{
    146146
     147                yts=365.0*24.0*3600.0
     148
    147149                WriteData(fid,'object',self,'fieldname','iscontrol','format','Boolean')
    148150                WriteData(fid,'object',self,'fieldname','tao','format','Boolean')
    … …  
    159161                WriteData(fid,'object',self,'fieldname','step_threshold','format','DoubleMat','mattype',3)
    160162                WriteData(fid,'object',self,'fieldname','gradient_only','format','Boolean')
    161                 WriteData(fid,'object',self,'fieldname','vx_obs','format','DoubleMat','mattype',1)
    162                 WriteData(fid,'object',self,'fieldname','vy_obs','format','DoubleMat','mattype',1)
    163                 WriteData(fid,'object',self,'fieldname','vz_obs','format','DoubleMat','mattype',1)
     163                WriteData(fid,'object',self,'fieldname','vx_obs','format','DoubleMat','mattype',1,'scale',1./yts)
     164                WriteData(fid,'object',self,'fieldname','vy_obs','format','DoubleMat','mattype',1,'scale',1./yts)
     165                WriteData(fid,'object',self,'fieldname','vz_obs','format','DoubleMat','mattype',1,'scale',1./yts)
    164166                WriteData(fid,'object',self,'fieldname','thickness_obs','format','DoubleMat','mattype',1)
    165167

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

    r15106 r15125  
    152152
    153153                        WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
    154                         WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double');
     154                        WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double','scale',10^3);
    155155                        WriteData(fid,'object',obj,'class','materials','fieldname','mantle_shear_modulus','format','Double');
    156                         WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double');
     156                        WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double','scale',10^3);
    157157
    158158                end % }}}

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

    r14936 r15125  
    147147
    148148                WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
    149                 WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_density','format','Double');
     149                WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_density','format','Double','scale',10.**3.);
    150150                WriteData(fid,'object',self,'class','materials','fieldname','mantle_shear_modulus','format','Double');
    151                 WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double');
     151                WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double','scale',10.**3.);
    152152        # }}}

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

    r15106 r15125  
    147147
    148148                        WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
    149                         WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double');
     149                        WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double','scale',10^3);
    150150                        WriteData(fid,'object',obj,'class','materials','fieldname','mantle_shear_modulus','format','Double');
    151                         WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double');
     151                        WriteData(fid,'object',obj,'class','materials','fieldname','mantle_density','format','Double','scale',10^3);
    152152                end % }}}
    153153        end

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

    r14936 r15125  
    139139
    140140                WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_shear_modulus','format','Double');
    141                 WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_density','format','Double');
     141                WriteData(fid,'object',self,'class','materials','fieldname','lithosphere_density','format','Double','scale',10.**3.);
    142142                WriteData(fid,'object',self,'class','materials','fieldname','mantle_shear_modulus','format','Double');
    143                 WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double');
     143                WriteData(fid,'object',self,'class','materials','fieldname','mantle_density','format','Double','scale',10.**3.);
    144144        # }}}

  • issm/trunk-jpl/src/m/classes/timestepping.py

    r15124 r15125  
    6060        def marshall(self,fid):    # {{{
    6161
    62                 yts=365.0*24.0*3600.0;
     62                yts=365.0*24.0*3600.0
    6363
    6464                WriteData(fid,'object',self,'fieldname','start_time','format','Double','scale',yts)
Note: See TracChangeset for help on using the changeset viewer.