source: issm/oecreview/Archive/16554-17801/ISSM-16589-16590.diff@ 17802

Last change on this file since 17802 was 17802, checked in by Mathieu Morlighem, 11 years ago

Added archives
File size: 17.2 KB

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

    Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
     
    177177        MaterialsMuWaterEnum,
    178178        MaterialsThermalExchangeVelocityEnum,
    179179        MaterialsThermalconductivityEnum,
     180  MaterialsTemperateiceconductivityEnum,
    180181        MaterialsLithosphereShearModulusEnum,
    181182        MaterialsLithosphereDensityEnum,
    182183        MaterialsMantleShearModulusEnum,

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

     
    185185                case MaterialsMuWaterEnum : return "MaterialsMuWater";
    186186                case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity";
    187187                case MaterialsThermalconductivityEnum : return "MaterialsThermalconductivity";
     188                case MaterialsTemperateiceconductivityEnum : return "MaterialsTemperateiceconductivity";
    188189                case MaterialsLithosphereShearModulusEnum : return "MaterialsLithosphereShearModulus";
    189190                case MaterialsLithosphereDensityEnum : return "MaterialsLithosphereDensity";
    190191                case MaterialsMantleShearModulusEnum : return "MaterialsMantleShearModulus";

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

     
    188188              else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum;
    189189              else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
    190190              else if (strcmp(name,"MaterialsThermalconductivity")==0) return MaterialsThermalconductivityEnum;
     191              else if (strcmp(name,"MaterialsTemperateiceconductivity")==0) return MaterialsTemperateiceconductivityEnum;
    191192              else if (strcmp(name,"MaterialsLithosphereShearModulus")==0) return MaterialsLithosphereShearModulusEnum;
    192193              else if (strcmp(name,"MaterialsLithosphereDensity")==0) return MaterialsLithosphereDensityEnum;
    193194              else if (strcmp(name,"MaterialsMantleShearModulus")==0) return MaterialsMantleShearModulusEnum;
    … …  
    258259              else if (strcmp(name,"SurfaceforcingsPrecipitation")==0) return SurfaceforcingsPrecipitationEnum;
    259260              else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
    260261              else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum;
    261               else if (strcmp(name,"SurfaceforcingsDesfac")==0) return SurfaceforcingsDesfacEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum;
     265              if (strcmp(name,"SurfaceforcingsDesfac")==0) return SurfaceforcingsDesfacEnum;
     266              else if (strcmp(name,"SurfaceforcingsS0p")==0) return SurfaceforcingsS0pEnum;
    266267              else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
    267268              else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;
    268269              else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
    … …  
    381382              else if (strcmp(name,"Input")==0) return InputEnum;
    382383              else if (strcmp(name,"IntInput")==0) return IntInputEnum;
    383384              else if (strcmp(name,"InputToExtrude")==0) return InputToExtrudeEnum;
    384               else if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"IntParam")==0) return IntParamEnum;
     388              if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum;
     389              else if (strcmp(name,"IntParam")==0) return IntParamEnum;
    389390              else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;
    390391              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
    391392              else if (strcmp(name,"Matice")==0) return MaticeEnum;
    … …  
    504505              else if (strcmp(name,"StressTensor")==0) return StressTensorEnum;
    505506              else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum;
    506507              else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum;
    507               else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
     511              if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum;
     512              else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
    512513              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    513514              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
    514515              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;

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

     
    3333        iomodel->Constant(&this->mu_water,MaterialsMuWaterEnum);
    3434        iomodel->Constant(&this->heatcapacity,MaterialsHeatcapacityEnum);
    3535        iomodel->Constant(&this->thermalconductivity,MaterialsThermalconductivityEnum);
     36        iomodel->Constant(&this->temperateiceconductivity,MaterialsTemperateiceconductivityEnum);
    3637        iomodel->Constant(&this->latentheat,MaterialsLatentheatEnum);
    3738        iomodel->Constant(&this->beta,MaterialsBetaEnum);
    3839        iomodel->Constant(&this->meltingpoint,MaterialsMeltingpointEnum);
    … …  
    99100        _printf_("   mu_water: " << mu_water << "\n");
    100101        _printf_("   heatcapacity: " << heatcapacity << "\n");
    101102        _printf_("   thermalconductivity: " << thermalconductivity << "\n");
     103        _printf_("   temperateiceconductivity: " << temperateiceconductivity << "\n");
    102104        _printf_("   latentheat: " << latentheat << "\n");
    103105        _printf_("   beta: " << beta << "\n");
    104106        _printf_("   meltingpoint: " << meltingpoint << "\n");
    … …  
    168170                case MaterialsHeatcapacityEnum:
    169171                        this->heatcapacity=constant;
    170172                        break;
    171                 case MaterialsThermalconductivityEnum:
     173                case MaterialsThermalconductivityEnum:
    172174                        this->thermalconductivity=constant;
    173175                        break;
     176                case MaterialsTemperateiceconductivityEnum:
     177                        this->temperateiceconductivity=constant;
     178                        break;
    174179                case  MaterialsLatentheatEnum:
    175180                        this->latentheat=constant;
    176181                        break;
    … …  
    307312        return thermalconductivity;
    308313}
    309314/*}}}*/
     315/*FUNCTION Matpar::GetTemperateIceConductivity {{{*/
     316IssmDouble Matpar::GetTemperateIceConductivity(){
     317        return temperateiceconductivity;
     318}
     319/*}}}*/
    310320/*FUNCTION Matpar::GetThermalExchangeVelocity {{{*/
    311321IssmDouble Matpar::GetThermalExchangeVelocity(){
    312322        return thermal_exchange_velocity;
    … …  
    382392                return thermalconductivity/heatcapacity*pow(10.,-5);
    383393        */
    384394
    385         IssmDouble eps=0.05*heatcapacity;
     395        IssmDouble eps=0.1*heatcapacity;
    386396        IssmDouble hpmp=PureIceEnthalpy(pressure);
    387397        IssmDouble kappa_c=thermalconductivity/heatcapacity;
    388         IssmDouble kappa_t=thermalconductivity/heatcapacity*pow(10.,-1);
    389         return 1./(1.+exp(-(enthalpy-(hpmp))/eps))*(kappa_t-kappa_c) + kappa_c;
     398        IssmDouble kappa_t=temperateiceconductivity/heatcapacity;
     399       
     400        if(enthalpy<=hpmp-eps)
     401                return kappa_c;
     402        else if(enthalpy>=hpmp+eps)
     403                return kappa_t;
     404        else {
     405                IssmDouble xi=enthalpy-hpmp;
     406                IssmDouble pi=3.141592653589793238462643;
     407                return kappa_c + (kappa_t-kappa_c)*((xi+eps)/(2*eps) + sin(pi*xi/eps)/(2*pi));
     408        }
     409
     410        //return 1./(1.+exp(-(enthalpy-(hpmp))/eps))*(kappa_t-kappa_c) + kappa_c;
    390411}
    391412/*}}}*/
    392413/*FUNCTION Matpar::GetEnthalpyDiffusionParameterVolume{{{*/

  • ../trunk-jpl/src/c/classes/Materials/Matpar.h

     
    2121                IssmDouble  mu_water;
    2222                IssmDouble  heatcapacity;
    2323                IssmDouble  thermalconductivity;
     24                IssmDouble  temperateiceconductivity;
    2425                IssmDouble  latentheat;
    2526                IssmDouble  beta;
    2627                IssmDouble  meltingpoint;
    … …  
    108109                IssmDouble GetThermalExchangeVelocity();
    109110                IssmDouble GetHeatCapacity();
    110111                IssmDouble GetThermalConductivity();
     112                IssmDouble GetTemperateIceConductivity();
    111113                IssmDouble GetLatentHeat();
    112114                IssmDouble GetBeta();
    113115                IssmDouble GetMeltingPoint();

  • ../trunk-jpl/src/c/classes/Elements/Penta.cpp

     
    38143814        if (stabilization==2) diameter=MinEdgeLength(xyz_list);
    38153815
    38163816        /* Start  looping on the number of gaussian points: */
    3817         gauss=new GaussPenta(2,2);
     3817        gauss=new GaussPenta(3,3);
    38183818        for(int ig=gauss->begin();ig<gauss->end();ig++){
    38193819
    38203820                gauss->GaussPoint(ig);
    … …  
    38273827                enthalpy_input->GetInputValue(&enthalpy, gauss);
    38283828                pressure_input->GetInputValue(&pressure, gauss);
    38293829                kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure); _assert_(kappa>0.);
     3830
    38303831                D_scalar_conduct=gauss->weight*Jdet*kappa/rho_ice;
    38313832                if(reCast<bool,IssmDouble>(dt)) D_scalar_conduct=D_scalar_conduct*dt;
    38323833
    … …  
    38943895                }
    38953896                else if(stabilization==2){
    38963897                        GetNodalFunctionsP1Derivatives(&dbasis[0][0],&xyz_list[0][0], gauss);
    3897                         tau_parameter=GetStabilizationParameter(u-um,v-vm,w-wm,diameter,kappa);
     3898                        tau_parameter=GetStabilizationParameter(u-um,v-vm,w-wm,diameter,kappa/rho_ice);
    38983899
    38993900                        for(i=0;i<numdof;i++){
    39003901                                for(j=0;j<numdof;j++){

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

     
    1212                heatcapacity               = 0.;
    1313                latentheat                 = 0.;
    1414                thermalconductivity        = 0.;
     15                temperateiceconductivity         = 0.;
    1516                meltingpoint               = 0.;
    1617                beta                       = 0.;
    1718                mixed_layer_capacity       = 0.;
    … …  
    6869
    6970                        %ice thermal conductivity (W/m/K)
    7071                        obj.thermalconductivity=2.4;
     72                       
     73                        %wet ice thermal conductivity (W/m/K)
     74                        obj.temperateiceconductivity=.24;
    7175
    7276                        %the melting point of ice at 1 atmosphere of pressure in K
    7377                        obj.meltingpoint=273.15;
    … …  
    117121                        fielddisplay(obj,'rho_freshwater','fresh water density [kg/m^3]');
    118122                        fielddisplay(obj,'mu_water','water viscosity [N s/m^2]');
    119123                        fielddisplay(obj,'heatcapacity','heat capacity [J/kg/K]');
    120                         fielddisplay(obj,'thermalconductivity','ice thermal conductivity [W/m/K]');
     124                        fielddisplay(obj,'thermalconductivity',['ice thermal conductivity [W/m/K]']);
     125                        fielddisplay(obj,'temperateiceconductivity','temperate ice thermal conductivity [W/m/K]');
    121126                        fielddisplay(obj,'meltingpoint','melting point of ice at 1atm in K');
    122127                        fielddisplay(obj,'latentheat','latent heat of fusion [J/m^3]');
    123128                        fielddisplay(obj,'beta','rate of change of melting point with pressure [K/Pa]');
    … …  
    140145                        WriteData(fid,'object',obj,'class','materials','fieldname','heatcapacity','format','Double');
    141146                        WriteData(fid,'object',obj,'class','materials','fieldname','latentheat','format','Double');
    142147                        WriteData(fid,'object',obj,'class','materials','fieldname','thermalconductivity','format','Double');
     148                        WriteData(fid,'object',obj,'class','materials','fieldname','temperateiceconductivity','format','Double');
    143149                        WriteData(fid,'object',obj,'class','materials','fieldname','meltingpoint','format','Double');
    144150                        WriteData(fid,'object',obj,'class','materials','fieldname','beta','format','Double');
    145151                        WriteData(fid,'object',obj,'class','materials','fieldname','mixed_layer_capacity','format','Double');

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

     
    2020                self.heatcapacity              = 0.
    2121                self.latentheat                = 0.
    2222                self.thermalconductivity       = 0.
     23                self.temperateiceconductivity  = 0.
    2324                self.meltingpoint              = 0.
    2425                self.beta                      = 0.
    2526                self.mixed_layer_capacity      = 0.
    … …  
    4546                string="%s\n%s"%(string,fielddisplay(self,"mu_water","water viscosity [N s/m^2]"))
    4647                string="%s\n%s"%(string,fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]"))
    4748                string="%s\n%s"%(string,fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]"))
     49                string="%s\n%s"%(string,fielddisplay(self,"temperateiceconductivity","temperate ice thermal conductivity [W/m/K]"))
    4850                string="%s\n%s"%(string,fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K"))
    4951                string="%s\n%s"%(string,fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]"))
    5052                string="%s\n%s"%(string,fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]"))
    … …  
    8284                #ice thermal conductivity (W/m/K)
    8385                self.thermalconductivity=2.4
    8486
     87                #temperate ice thermal conductivity (W/m/K)
     88                self.temperateiceconductivity=0.24
     89
    8590                #the melting point of ice at 1 atmosphere of pressure in K
    8691                self.meltingpoint=273.15
    8792
    … …  
    129134                WriteData(fid,'object',self,'class','materials','fieldname','heatcapacity','format','Double')
    130135                WriteData(fid,'object',self,'class','materials','fieldname','latentheat','format','Double')
    131136                WriteData(fid,'object',self,'class','materials','fieldname','thermalconductivity','format','Double')
     137                WriteData(fid,'object',self,'class','materials','fieldname','temperateiceconductivity','format','Double')
    132138                WriteData(fid,'object',self,'class','materials','fieldname','meltingpoint','format','Double')
    133139                WriteData(fid,'object',self,'class','materials','fieldname','beta','format','Double')
    134140                WriteData(fid,'object',self,'class','materials','fieldname','mixed_layer_capacity','format','Double')

  • ../trunk-jpl/src/m/enum/MaterialsTemperateiceconductivityEnum.m

     
     1function macro=MaterialsTemperateiceconductivityEnum()
     2%MATERIALSTEMPERATEICECONDUCTIVITYENUM - Enum of MaterialsTemperateiceconductivity
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=MaterialsTemperateiceconductivityEnum()
     10
     11macro=StringToEnum('MaterialsTemperateiceconductivity');

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

     
    177177def MaterialsMuWaterEnum(): return StringToEnum("MaterialsMuWater")[0]
    178178def MaterialsThermalExchangeVelocityEnum(): return StringToEnum("MaterialsThermalExchangeVelocity")[0]
    179179def MaterialsThermalconductivityEnum(): return StringToEnum("MaterialsThermalconductivity")[0]
     180def MaterialsTemperateiceconductivityEnum(): return StringToEnum("MaterialsTemperateiceconductivity")[0]
    180181def MaterialsLithosphereShearModulusEnum(): return StringToEnum("MaterialsLithosphereShearModulus")[0]
    181182def MaterialsLithosphereDensityEnum(): return StringToEnum("MaterialsLithosphereDensity")[0]
    182183def MaterialsMantleShearModulusEnum(): return StringToEnum("MaterialsMantleShearModulus")[0]
Note: See TracBrowser for help on using the repository browser.