Changeset 17946


Ignore:
Timestamp:
05/06/14 08:30:09 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: renaming RhoWaterEnum RhoSeawaterEnum:

Location:
issm/trunk-jpl/src
Files:
1 added
1 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

    r17944 r17946  
    245245        element->FindParam(&dt,TimesteppingTimeStepEnum);
    246246        element->FindParam(&stabilization,ThermalStabilizationEnum);
    247         IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     247        IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    248248        IssmDouble  rho_ice             = element->GetMaterialParameter(MaterialsRhoIceEnum);
    249249        IssmDouble  gravity             = element->GetMaterialParameter(ConstantsGEnum);
    … …  
    373373        element->FindParam(&dt,TimesteppingTimeStepEnum);
    374374        IssmDouble  gravity             = element->GetMaterialParameter(ConstantsGEnum);
    375         IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     375        IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    376376        IssmDouble  rho_ice             = element->GetMaterialParameter(MaterialsRhoIceEnum);
    377377        IssmDouble  heatcapacity        = element->GetMaterialParameter(MaterialsHeatcapacityEnum);
    … …  
    648648        Input*      pressure_input=element->GetInput(PressureEnum); _assert_(pressure_input);
    649649        IssmDouble  gravity             = element->GetMaterialParameter(ConstantsGEnum);
    650         IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     650        IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    651651        IssmDouble  rho_ice             = element->GetMaterialParameter(MaterialsRhoIceEnum);
    652652        IssmDouble  heatcapacity        = element->GetMaterialParameter(MaterialsHeatcapacityEnum);
    … …  
    11031103       
    11041104        rho_ice=element->GetMaterialParameter(MaterialsRhoIceEnum);
    1105         rho_water=element->GetMaterialParameter(MaterialsRhoWaterEnum);
     1105        rho_water=element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    11061106
    11071107        element->GetVerticesCoordinates(&xyz_list);

  • issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp

    r17886 r17946  
    331331        /*Retrieve all inputs and parameters*/
    332332        IssmDouble  rho_ice   = element->GetMaterialParameter(MaterialsRhoIceEnum);
    333         IssmDouble  rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     333        IssmDouble  rho_water = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    334334        IssmDouble  g         = element->GetMaterialParameter(ConstantsGEnum);
    335335        IssmDouble  mu_water  = element->GetMaterialParameter(MaterialsMuWaterEnum);

  • issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

    r17924 r17946  
    711711        basalelement->FindParam(&hydroadjustment,MasstransportHydrostaticAdjustmentEnum);
    712712        rho_ice   = basalelement->GetMaterialParameter(MaterialsRhoIceEnum);
    713         rho_water = basalelement->GetMaterialParameter(MaterialsRhoWaterEnum);
     713        rho_water = basalelement->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    714714
    715715        for(i=0;i<numnodes;i++) {

  • issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

    r17943 r17946  
    14771477        Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input);
    14781478        Input* base_input       = element->GetInput(BaseEnum);       _assert_(base_input);
    1479         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     1479        IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    14801480        IssmDouble rho_ice     = element->GetMaterialParameter(MaterialsRhoIceEnum);
    14811481        IssmDouble gravity     = element->GetMaterialParameter(ConstantsGEnum);
    … …  
    19291929        Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input);
    19301930        Input* base_input       = element->GetInput(BaseEnum);       _assert_(base_input);
    1931         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     1931        IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    19321932        IssmDouble rho_ice     = element->GetMaterialParameter(MaterialsRhoIceEnum);
    19331933        IssmDouble gravity     = element->GetMaterialParameter(ConstantsGEnum);
    … …  
    24472447        /*Retrieve all inputs and parameters*/
    24482448        Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input);
    2449         IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     2449        IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    24502450        IssmDouble rho_ice   = element->GetMaterialParameter(MaterialsRhoIceEnum);
    24512451        IssmDouble gravity   = element->GetMaterialParameter(ConstantsGEnum);
    … …  
    30123012        element->FindParam(&dt,TimesteppingTimeStepEnum);
    30133013        if(dt==0)   dt=1.e+5;
    3014         IssmDouble  rho_water     = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     3014        IssmDouble  rho_water     = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    30153015        IssmDouble  gravity       = element->GetMaterialParameter(ConstantsGEnum);
    30163016        Input*      surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input);
    … …  
    35693569        element->GetVerticesCoordinatesBase(&xyz_list_base);
    35703570        Input*      base_input=element->GetInput(BaseEnum); _assert_(base_input);
    3571         IssmDouble  rho_water=element->GetMaterialParameter(MaterialsRhoWaterEnum);
     3571        IssmDouble  rho_water=element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    35723572        IssmDouble  gravity  =element->GetMaterialParameter(ConstantsGEnum);
    35733573
    … …  
    36433643        element->NormalSection(&normal[0],xyz_list_front);
    36443644        Input* surface_input  = element->GetInput(SurfaceEnum); _assert_(surface_input);
    3645         IssmDouble  rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     3645        IssmDouble  rho_water = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    36463646        IssmDouble  gravity   = element->GetMaterialParameter(ConstantsGEnum);
    36473647

  • issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

    r17943 r17946  
    178178        element->FindParam(&dt,TimesteppingTimeStepEnum);
    179179        element->FindParam(&stabilization,ThermalStabilizationEnum);
    180         IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     180        IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    181181        IssmDouble  rho_ice             = element->GetMaterialParameter(MaterialsRhoIceEnum);
    182182        IssmDouble  gravity             = element->GetMaterialParameter(ConstantsGEnum);
    … …  
    307307        element->FindParam(&dt,TimesteppingTimeStepEnum);
    308308        IssmDouble  gravity             = element->GetMaterialParameter(ConstantsGEnum);
    309         IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     309        IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    310310        IssmDouble  rho_ice             = element->GetMaterialParameter(MaterialsRhoIceEnum);
    311311        IssmDouble  heatcapacity        = element->GetMaterialParameter(MaterialsHeatcapacityEnum);
    … …  
    520520        Input*      pressure_input=element->GetInput(PressureEnum); _assert_(pressure_input);
    521521        IssmDouble  gravity             = element->GetMaterialParameter(ConstantsGEnum);
    522         IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     522        IssmDouble  rho_water           = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    523523        IssmDouble  rho_ice             = element->GetMaterialParameter(MaterialsRhoIceEnum);
    524524        IssmDouble  heatcapacity        = element->GetMaterialParameter(MaterialsHeatcapacityEnum);

  • issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

    r17943 r17946  
    6262        element->GetInputValue(&bed, gauss,BaseEnum);
    6363        element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
    64         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     64        IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    6565        IssmDouble rho_ice     = element->GetMaterialParameter(MaterialsRhoIceEnum);
    6666        IssmDouble gravity     = element->GetMaterialParameter(ConstantsGEnum);
    … …  
    124124        element->GetInputValue(&bed, gauss,BaseEnum);
    125125        element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
    126         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoWaterEnum);
     126        IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
    127127        IssmDouble rho_ice     = element->GetMaterialParameter(MaterialsRhoIceEnum);
    128128        IssmDouble gravity     = element->GetMaterialParameter(ConstantsGEnum);

  • issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

    r17926 r17946  
    2828        this->mid = matpar_mid;
    2929        iomodel->Constant(&this->rho_ice,MaterialsRhoIceEnum);
    30         iomodel->Constant(&this->rho_water,MaterialsRhoWaterEnum);
     30        iomodel->Constant(&this->rho_water,MaterialsRhoSeawaterEnum);
    3131        iomodel->Constant(&this->rho_freshwater,MaterialsRhoFreshwaterEnum);
    3232        iomodel->Constant(&this->mu_water,MaterialsMuWaterEnum);
    … …  
    164164                        this->rho_ice=constant;
    165165                        break;
    166                 case MaterialsRhoWaterEnum:
     166                case MaterialsRhoSeawaterEnum:
    167167                        this->rho_water=constant;
    168168                        break;
    … …  
    239239        switch(enum_in){
    240240                case MaterialsRhoIceEnum:                    return this->rho_ice;
    241                 case MaterialsRhoWaterEnum:                  return this->rho_water;
     241                case MaterialsRhoSeawaterEnum:                  return this->rho_water;
    242242                case MaterialsRhoFreshwaterEnum:             return this->rho_freshwater;
    243243                case MaterialsMuWaterEnum:                   return this->mu_water;

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r17941 r17946  
    192192        DamageEvolutionRequestedOutputsEnum,
    193193        MaterialsRhoIceEnum,
    194         MaterialsRhoWaterEnum,
     194        MaterialsRhoSeawaterEnum,
    195195        MaterialsRhoFreshwaterEnum,
    196196        MaterialsMuWaterEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r17941 r17946  
    200200                case DamageEvolutionRequestedOutputsEnum : return "DamageEvolutionRequestedOutputs";
    201201                case MaterialsRhoIceEnum : return "MaterialsRhoIce";
    202                 case MaterialsRhoWaterEnum : return "MaterialsRhoWater";
     202                case MaterialsRhoSeawaterEnum : return "MaterialsRhoSeawater";
    203203                case MaterialsRhoFreshwaterEnum : return "MaterialsRhoFreshwater";
    204204                case MaterialsMuWaterEnum : return "MaterialsMuWater";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r17941 r17946  
    203203              else if (strcmp(name,"DamageEvolutionRequestedOutputs")==0) return DamageEvolutionRequestedOutputsEnum;
    204204              else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum;
    205               else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum;
     205              else if (strcmp(name,"MaterialsRhoSeawater")==0) return MaterialsRhoSeawaterEnum;
    206206              else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum;
    207207              else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;

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

    r17908 r17946  
    174174                        WriteData(fid,'enum',MaterialsEnum(),'data',MatdamageiceEnum(),'format','Integer');
    175175                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_ice','format','Double');
    176                         WriteData(fid,'object',obj,'class','materials','fieldname','rho_water','format','Double');
     176                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_water','enum',MaterialsRhoSeawaterEnum(),'format','Double');
    177177                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_freshwater','format','Double');
    178178                        WriteData(fid,'object',obj,'class','materials','fieldname','mu_water','format','Double');

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

    r17765 r17946  
    129129                WriteData(fid,'enum',MaterialsEnum(),'data',MatdamageiceEnum(),'format','Integer');
    130130                WriteData(fid,'object',self,'class','materials','fieldname','rho_ice','format','Double')
    131                 WriteData(fid,'object',self,'class','materials','fieldname','rho_water','format','Double')
     131                WriteData(fid,'object',self,'class','materials','fieldname','rho_water','enum',MaterialsRhoSeawaterEnum(),'format','Double')
    132132                WriteData(fid,'object',self,'class','materials','fieldname','rho_freshwater','format','Double')
    133133                WriteData(fid,'object',self,'class','materials','fieldname','mu_water','format','Double')

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

    r17931 r17946  
    3030        end
    3131        methods
    32         function createxml(obj,fid) % {{{
    33             fprintf(fid, '\n\n');
    34             fprintf(fid, '<!-- materials -->\n');
    35                          fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rho_ice" type="',class(obj.rho_ice),'" default="',convert2str(obj.rho_ice),'">','     <section name="materials" />','     <help> ice density [kg/m^3] </help>','</parameter>');
    36              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rho_water" type="',class(obj.rho_water),'" default="',convert2str(obj.rho_water),'">','     <section name="materials" />','     <help> ocean water density [kg/m^3] </help>','</parameter>');
    37              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rho_freshwater" type="',class(obj.rho_freshwater),'" default="',convert2str(obj.rho_freshwater),'">','     <section name="materials" />','     <help> fresh water density [kg/m^3] </help>','</parameter>');
    38              
    39  
    40              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mu_water" type="',class(obj.mu_water),'" default="',convert2str(obj.mu_water),'">','     <section name="materials" />','     <help> water viscosity [N s/m^2] </help>','</parameter>');
    41              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="heatcapacity" type="',class(obj.heatcapacity),'" default="',convert2str(obj.heatcapacity),'">','     <section name="materials" />','     <help> heat capacity [J/kg/K] </help>','</parameter>');
    42              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="latentheat" type="',class(obj.latentheat),'" default="',convert2str(obj.latentheat),'">','     <section name="materials" />','     <help> latent heat of fusion [J/kg] </help>','</parameter>');
    43              
    44              
    45              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="thermalconductivity" type="',class(obj.thermalconductivity),'" default="',convert2str(obj.thermalconductivity),'">','     <section name="materials" />','     <help> ice thermal conductivity [W/m/K] </help>','</parameter>');
    46              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="temperateiceconductivity" type="',class(obj.temperateiceconductivity),'" default="',convert2str(obj.temperateiceconductivity),'">','     <section name="materials" />','     <help> temperate ice thermal conductivity [W/m/K] </help>','</parameter>');
    47              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="meltingpoint" type="',class(obj.meltingpoint),'" default="',convert2str(obj.meltingpoint),'">','     <section name="materials" />','     <help> melting point of ice at 1atm in K </help>','</parameter>');
    48              
    49              
    50              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="beta" type="',class(obj.beta),'" default="',convert2str(obj.beta),'">','     <section name="materials" />','     <help> rate of change of melting point with pressure [K/Pa] </help>','</parameter>');
    51              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mixed_layer_capacity" type="',class(obj.mixed_layer_capacity),'" default="',convert2str(obj.mixed_layer_capacity),'">','     <section name="materials" />','     <help> mixed layer capacity [W/kg/K] </help>','</parameter>');
    52              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="thermal_exchange_velocity" type="',class(obj.thermal_exchange_velocity),'" default="',convert2str(obj.thermal_exchange_velocity),'">','     <section name="materials" />','     <help> thermal exchange velocity [m/s] </help>','</parameter>');
    53              
    54              
    55              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rheology_B" type="',class(obj.rheology_B),'" default="',convert2str(obj.rheology_B),'">','     <section name="materials" />','     <help> flow law parameter [Pa/s^(1/n)] </help>','</parameter>');
    56              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rheology_n" type="',class(obj.rheology_n),'" default="',convert2str(obj.rheology_n),'">','     <section name="materials" />','     <help> Glens flow law exponent </help>','</parameter>');
    57              
    58              % rheology_law drop-down
    59              fprintf(fid,'%s\n%s\n%s\n%s\n','<parameter key ="rheology_law" type="alternative" optional="false">','     <section name="materials" />','     <help> law for the temperature dependance of the rheology: "None", "Paterson",  "Arrhenius" or "LliboutryDuval" </help>');
    60              fprintf(fid,'%s\n','       <option value="None" type="string" default="true"> </option>');
    61              fprintf(fid,'%s\n','       <option value="Paterson" type="string" default="false"> </option>');
    62              fprintf(fid,'%s\n','       <option value="Arrhenius" type="string" default="false"> </option>');
    63              fprintf(fid,'%s\n%s\n','       <option value="LliboutryDuval" type="string" default="false"> </option>','</parameter>');
    64              
    65              
    66              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="lithosphere_shear_modulus" type="',class(obj.lithosphere_shear_modulus),'" default="',convert2str(obj.lithosphere_shear_modulus),'">','     <section name="materials" />','     <help> Lithosphere shear modulus [Pa] </help>','</parameter>');
    67              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="lithosphere_density" type="',class(obj.lithosphere_density),'" default="',convert2str(obj.lithosphere_density),'">','     <section name="materials" />','     <help> Lithosphere density [g/cm^-3] </help>','</parameter>');
    68              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mantle_shear_modulus" type="',class(obj.mantle_shear_modulus),'" default="',convert2str(obj.mantle_shear_modulus),'">','     <section name="materials" />','     <help> Mantle shear modulus [Pa] </help>','</parameter>');
    69              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mantle_density" type="',class(obj.mantle_density),'" default="',convert2str(obj.mantle_density),'">','     <section name="materials" />','     <help> Mantle density [g/cm^-3] </help>','</parameter>');
    70        
    71          
    72         end % }}}
     32                function createxml(obj,fid) % {{{
     33                        fprintf(fid, '\n\n');
     34                        fprintf(fid, '<!-- materials -->\n');
     35                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rho_ice" type="',class(obj.rho_ice),'" default="',convert2str(obj.rho_ice),'">','     <section name="materials" />','     <help> ice density [kg/m^3] </help>','</parameter>');
     36                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rho_water" type="',class(obj.rho_water),'" default="',convert2str(obj.rho_water),'">','     <section name="materials" />','     <help> ocean water density [kg/m^3] </help>','</parameter>');
     37                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rho_freshwater" type="',class(obj.rho_freshwater),'" default="',convert2str(obj.rho_freshwater),'">','     <section name="materials" />','     <help> fresh water density [kg/m^3] </help>','</parameter>');
     38
     39
     40                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mu_water" type="',class(obj.mu_water),'" default="',convert2str(obj.mu_water),'">','     <section name="materials" />','     <help> water viscosity [N s/m^2] </help>','</parameter>');
     41                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="heatcapacity" type="',class(obj.heatcapacity),'" default="',convert2str(obj.heatcapacity),'">','     <section name="materials" />','     <help> heat capacity [J/kg/K] </help>','</parameter>');
     42                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="latentheat" type="',class(obj.latentheat),'" default="',convert2str(obj.latentheat),'">','     <section name="materials" />','     <help> latent heat of fusion [J/kg] </help>','</parameter>');
     43
     44
     45                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="thermalconductivity" type="',class(obj.thermalconductivity),'" default="',convert2str(obj.thermalconductivity),'">','     <section name="materials" />','     <help> ice thermal conductivity [W/m/K] </help>','</parameter>');
     46                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="temperateiceconductivity" type="',class(obj.temperateiceconductivity),'" default="',convert2str(obj.temperateiceconductivity),'">','     <section name="materials" />','     <help> temperate ice thermal conductivity [W/m/K] </help>','</parameter>');
     47                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="meltingpoint" type="',class(obj.meltingpoint),'" default="',convert2str(obj.meltingpoint),'">','     <section name="materials" />','     <help> melting point of ice at 1atm in K </help>','</parameter>');
     48
     49
     50                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="beta" type="',class(obj.beta),'" default="',convert2str(obj.beta),'">','     <section name="materials" />','     <help> rate of change of melting point with pressure [K/Pa] </help>','</parameter>');
     51                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mixed_layer_capacity" type="',class(obj.mixed_layer_capacity),'" default="',convert2str(obj.mixed_layer_capacity),'">','     <section name="materials" />','     <help> mixed layer capacity [W/kg/K] </help>','</parameter>');
     52                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="thermal_exchange_velocity" type="',class(obj.thermal_exchange_velocity),'" default="',convert2str(obj.thermal_exchange_velocity),'">','     <section name="materials" />','     <help> thermal exchange velocity [m/s] </help>','</parameter>');
     53
     54
     55                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rheology_B" type="',class(obj.rheology_B),'" default="',convert2str(obj.rheology_B),'">','     <section name="materials" />','     <help> flow law parameter [Pa/s^(1/n)] </help>','</parameter>');
     56                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="rheology_n" type="',class(obj.rheology_n),'" default="',convert2str(obj.rheology_n),'">','     <section name="materials" />','     <help> Glens flow law exponent </help>','</parameter>');
     57
     58                        % rheology_law drop-down
     59                        fprintf(fid,'%s\n%s\n%s\n%s\n','<parameter key ="rheology_law" type="alternative" optional="false">','     <section name="materials" />','     <help> law for the temperature dependance of the rheology: "None", "Paterson",  "Arrhenius" or "LliboutryDuval" </help>');
     60                        fprintf(fid,'%s\n','       <option value="None" type="string" default="true"> </option>');
     61                        fprintf(fid,'%s\n','       <option value="Paterson" type="string" default="false"> </option>');
     62                        fprintf(fid,'%s\n','       <option value="Arrhenius" type="string" default="false"> </option>');
     63                        fprintf(fid,'%s\n%s\n','       <option value="LliboutryDuval" type="string" default="false"> </option>','</parameter>');
     64
     65
     66                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="lithosphere_shear_modulus" type="',class(obj.lithosphere_shear_modulus),'" default="',convert2str(obj.lithosphere_shear_modulus),'">','     <section name="materials" />','     <help> Lithosphere shear modulus [Pa] </help>','</parameter>');
     67                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="lithosphere_density" type="',class(obj.lithosphere_density),'" default="',convert2str(obj.lithosphere_density),'">','     <section name="materials" />','     <help> Lithosphere density [g/cm^-3] </help>','</parameter>');
     68                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mantle_shear_modulus" type="',class(obj.mantle_shear_modulus),'" default="',convert2str(obj.mantle_shear_modulus),'">','     <section name="materials" />','     <help> Mantle shear modulus [Pa] </help>','</parameter>');
     69                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','<parameter key ="mantle_density" type="',class(obj.mantle_density),'" default="',convert2str(obj.mantle_density),'">','     <section name="materials" />','     <help> Mantle density [g/cm^-3] </help>','</parameter>');
     70
     71
     72                end % }}}
    7373                function obj = matice(varargin) % {{{
    7474                        switch nargin
    … …  
    181181                        WriteData(fid,'enum',MaterialsEnum(),'data',MaticeEnum(),'format','Integer');
    182182                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_ice','format','Double');
    183                         WriteData(fid,'object',obj,'class','materials','fieldname','rho_water','format','Double');
     183                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_water','enum',MaterialsRhoSeawaterEnum(),'format','Double');
    184184                        WriteData(fid,'object',obj,'class','materials','fieldname','rho_freshwater','format','Double');
    185185                        WriteData(fid,'object',obj,'class','materials','fieldname','mu_water','format','Double');

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

    r17497 r17946  
    129129                WriteData(fid,'enum',MaterialsEnum(),'data',MaticeEnum(),'format','Integer');
    130130                WriteData(fid,'object',self,'class','materials','fieldname','rho_ice','format','Double')
    131                 WriteData(fid,'object',self,'class','materials','fieldname','rho_water','format','Double')
     131                WriteData(fid,'object',self,'class','materials','fieldname','rho_water','enum',MaterialsRhoSeawaterEnum(),'format','Double')
    132132                WriteData(fid,'object',self,'class','materials','fieldname','rho_freshwater','format','Double')
    133133                WriteData(fid,'object',self,'class','materials','fieldname','mu_water','format','Double')

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r17941 r17946  
    192192def DamageEvolutionRequestedOutputsEnum(): return StringToEnum("DamageEvolutionRequestedOutputs")[0]
    193193def MaterialsRhoIceEnum(): return StringToEnum("MaterialsRhoIce")[0]
    194 def MaterialsRhoWaterEnum(): return StringToEnum("MaterialsRhoWater")[0]
     194def MaterialsRhoSeawaterEnum(): return StringToEnum("MaterialsRhoSeawater")[0]
    195195def MaterialsRhoFreshwaterEnum(): return StringToEnum("MaterialsRhoFreshwater")[0]
    196196def MaterialsMuWaterEnum(): return StringToEnum("MaterialsMuWater")[0]

  • issm/trunk-jpl/src/m/qmu/setupdesign/IsScaled.m

    r13646 r17946  
    33
    44switch variablename,
    5 case {'MaterialsRhoIce','MaterialsRhoWater','MaterialsHeatCapacity','MaterialsThermalConductivity','Gravity','MaxVel'},
     5case {'MaterialsRhoIce','MaterialsRhoSeawater','MaterialsHeatCapacity','MaterialsThermalConductivity','Gravity','MaxVel'},
    66
    77        status=0;
Note: See TracChangeset for help on using the changeset viewer.