Changeset 8073


Ignore:
Timestamp:
04/29/11 09:11:07 (14 years ago)
Author:
Mathieu Morlighem
Message:

homogenized Enums: Picard and Old

Location:
issm/trunk/src/c
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r7848 r8073  
    231231        PflagEnum,
    232232        PressureEnum,
     233        PressurePicardEnum,
    233234        VelocityEnum,
    234         PressureOldEnum,
    235235        QmuPressureEnum,
    236236        ResetPenaltiesEnum,
    … …  
    247247        SurfaceSlopeYEnum,
    248248        TemperatureEnum,
    249         TemporaryTemperatureEnum,
     249        TemperaturePicardEnum,
    250250        TemperatureOldEnum,
    251251        ThicknessEnum,
    … …  
    259259        VxEnum,
    260260        VxObsEnum,
    261         VxOldEnum,
     261        VxPicardEnum,
    262262        QmuVxEnum,
    263263        VyAverageEnum,
    264264        VyEnum,
    265265        VyObsEnum,
    266         VyOldEnum,
     266        VyPicardEnum,
    267267        QmuVyEnum,
    268268        VzAverageEnum,
    269269        VzEnum,
    270270        VzObsEnum,
    271         VzOldEnum,
     271        VzPicardEnum,
    272272        VzMacAyealEnum,
    273273        VzPattynEnum,
    … …  
    301301        OutputFrequencyEnum,
    302302        WaterColumnEnum,
    303         OldWaterColumnEnum,
    304         PicardWaterColumnEnum,
     303        WaterColumnOldEnum,
     304        WaterColumnPicardEnum,
    305305        /*}}}*/
    306306        /*Io{{{1*/

  • issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

    r7848 r8073  
    202202                case PflagEnum : return "Pflag";
    203203                case PressureEnum : return "Pressure";
     204                case PressurePicardEnum : return "PressurePicard";
    204205                case VelocityEnum : return "Velocity";
    205                 case PressureOldEnum : return "PressureOld";
    206206                case QmuPressureEnum : return "QmuPressure";
    207207                case ResetPenaltiesEnum : return "ResetPenalties";
    … …  
    218218                case SurfaceSlopeYEnum : return "SurfaceSlopeY";
    219219                case TemperatureEnum : return "Temperature";
    220                 case TemporaryTemperatureEnum : return "TemporaryTemperature";
     220                case TemperaturePicardEnum : return "TemperaturePicard";
    221221                case TemperatureOldEnum : return "TemperatureOld";
    222222                case ThicknessEnum : return "Thickness";
    … …  
    230230                case VxEnum : return "Vx";
    231231                case VxObsEnum : return "VxObs";
    232                 case VxOldEnum : return "VxOld";
     232                case VxPicardEnum : return "VxPicard";
    233233                case QmuVxEnum : return "QmuVx";
    234234                case VyAverageEnum : return "VyAverage";
    235235                case VyEnum : return "Vy";
    236236                case VyObsEnum : return "VyObs";
    237                 case VyOldEnum : return "VyOld";
     237                case VyPicardEnum : return "VyPicard";
    238238                case QmuVyEnum : return "QmuVy";
    239239                case VzAverageEnum : return "VzAverage";
    240240                case VzEnum : return "Vz";
    241241                case VzObsEnum : return "VzObs";
    242                 case VzOldEnum : return "VzOld";
     242                case VzPicardEnum : return "VzPicard";
    243243                case VzMacAyealEnum : return "VzMacAyeal";
    244244                case VzPattynEnum : return "VzPattyn";
    … …  
    268268                case OutputFrequencyEnum : return "OutputFrequency";
    269269                case WaterColumnEnum : return "WaterColumn";
    270                 case OldWaterColumnEnum : return "OldWaterColumn";
    271                 case PicardWaterColumnEnum : return "PicardWaterColumn";
     270                case WaterColumnOldEnum : return "WaterColumnOld";
     271                case WaterColumnPicardEnum : return "WaterColumnPicard";
    272272                case IoGatherEnum : return "IoGather";
    273273                case MinVelEnum : return "MinVel";

  • issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

    r7848 r8073  
    200200        else if (strcmp(name,"Pflag")==0) return PflagEnum;
    201201        else if (strcmp(name,"Pressure")==0) return PressureEnum;
     202        else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
    202203        else if (strcmp(name,"Velocity")==0) return VelocityEnum;
    203         else if (strcmp(name,"PressureOld")==0) return PressureOldEnum;
    204204        else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
    205205        else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
    … …  
    216216        else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
    217217        else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
    218         else if (strcmp(name,"TemporaryTemperature")==0) return TemporaryTemperatureEnum;
     218        else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
    219219        else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;
    220220        else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
    … …  
    228228        else if (strcmp(name,"Vx")==0) return VxEnum;
    229229        else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    230         else if (strcmp(name,"VxOld")==0) return VxOldEnum;
     230        else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
    231231        else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
    232232        else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;
    233233        else if (strcmp(name,"Vy")==0) return VyEnum;
    234234        else if (strcmp(name,"VyObs")==0) return VyObsEnum;
    235         else if (strcmp(name,"VyOld")==0) return VyOldEnum;
     235        else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
    236236        else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
    237237        else if (strcmp(name,"VzAverage")==0) return VzAverageEnum;
    238238        else if (strcmp(name,"Vz")==0) return VzEnum;
    239239        else if (strcmp(name,"VzObs")==0) return VzObsEnum;
    240         else if (strcmp(name,"VzOld")==0) return VzOldEnum;
     240        else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
    241241        else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
    242242        else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
    … …  
    266266        else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum;
    267267        else if (strcmp(name,"WaterColumn")==0) return WaterColumnEnum;
    268         else if (strcmp(name,"OldWaterColumn")==0) return OldWaterColumnEnum;
    269         else if (strcmp(name,"PicardWaterColumn")==0) return PicardWaterColumnEnum;
     268        else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum;
     269        else if (strcmp(name,"WaterColumnPicard")==0) return WaterColumnPicardEnum;
    270270        else if (strcmp(name,"IoGather")==0) return IoGatherEnum;
    271271        else if (strcmp(name,"MinVel")==0) return MinVelEnum;

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r8033 r8073  
    691691        Input* vx_input=inputs->GetInput(VxEnum);       _assert_(vx_input);
    692692        Input* vy_input=inputs->GetInput(VyEnum);       _assert_(vy_input);
    693         Input* vxold_input=inputs->GetInput(VxOldEnum); _assert_(vxold_input);
    694         Input* vyold_input=inputs->GetInput(VyOldEnum); _assert_(vyold_input);
     693        Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input);
     694        Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input);
    695695
    696696        /* Start  looping on the number of gaussian points: */
    … …  
    11621162        Input* vx_input=inputs->GetInput(VxEnum);       _assert_(vx_input);
    11631163        Input* vy_input=inputs->GetInput(VyEnum);       _assert_(vy_input);
    1164         Input* vxold_input=inputs->GetInput(VxOldEnum); _assert_(vxold_input);
    1165         Input* vyold_input=inputs->GetInput(VyOldEnum); _assert_(vyold_input);
     1164        Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input);
     1165        Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input);
    11661166        Input* vz_input=inputs->GetInput(VzEnum);       _assert_(vz_input);
    11671167
    … …  
    13051305        Input* vx_input=inputs->GetInput(VxEnum);       _assert_(vx_input);
    13061306        Input* vy_input=inputs->GetInput(VyEnum);       _assert_(vy_input);
    1307         Input* vxold_input=inputs->GetInput(VxOldEnum); _assert_(vxold_input);
    1308         Input* vyold_input=inputs->GetInput(VyOldEnum); _assert_(vyold_input);
     1307        Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input);
     1308        Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input);
    13091309
    13101310        /* Start  looping on the number of gaussian points: */
    … …  
    40244024                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx[penta_vertex_ids[i]-1]/iomodel->yts;
    40254025                this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
    4026                 this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs));
     4026                this->inputs->AddInput(new PentaVertexInput(VxPicardEnum,nodeinputs));
    40274027                if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs));
    40284028        }
    … …  
    40304030                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy[penta_vertex_ids[i]-1]/iomodel->yts;
    40314031                this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
    4032                 this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs));
     4032                this->inputs->AddInput(new PentaVertexInput(VyPicardEnum,nodeinputs));
    40334033                if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs));
    40344034        }
    … …  
    40364036                for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz[penta_vertex_ids[i]-1]/iomodel->yts;
    40374037                this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
    4038                 this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs));
     4038                this->inputs->AddInput(new PentaVertexInput(VzPicardEnum,nodeinputs));
    40394039                if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs));
    40404040        }
    … …  
    42894289                /*Now, we have to move the previous Vx and Vy inputs  to old
    42904290                 * status, otherwise, we'll wipe them off: */
    4291                 penta->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4292                 penta->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4293                 penta->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4291                penta->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4292                penta->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4293                penta->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    42944294
    42954295                /*Add vx and vy as inputs to the tria element: */
    … …  
    43884388        /*Now, we have to move the previous Vx and Vy inputs  to old
    43894389         * status, otherwise, we'll wipe them off: */
    4390         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4391         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4392         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4390        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4391        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4392        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    43934393
    43944394        /*Add vx and vy as inputs to the tria element: */
    … …  
    44834483        /*Now, we have to move the previous Vx and Vy inputs  to old
    44844484         * status, otherwise, we'll wipe them off: */
    4485         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4486         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4487         this->inputs->ChangeEnum(VzEnum,VzOldEnum);
    4488         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4485        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4486        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4487        this->inputs->ChangeEnum(VzEnum,VzPicardEnum);
     4488        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    44894489
    44904490        /*Add vx and vy as inputs to the tria element: */
    … …  
    45634563        /*Now, we have to move the previous Vx and Vy inputs  to old
    45644564         * status, otherwise, we'll wipe them off: */
    4565         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4566         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4567         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4565        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4566        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4567        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    45684568
    45694569        /*Add vx and vy as inputs to the tria element: */
    … …  
    46514651        /*Now, we have to move the previous Vx and Vy inputs  to old
    46524652         * status, otherwise, we'll wipe them off: */
    4653         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4654         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4655         this->inputs->ChangeEnum(VzEnum,VzOldEnum);
    4656         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4653        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4654        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4655        this->inputs->ChangeEnum(VzEnum,VzPicardEnum);
     4656        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    46574657
    46584658        /*Add vx and vy as inputs to the tria element: */
    … …  
    47314731        /*Now, we have to move the previous Vx and Vy inputs  to old
    47324732         * status, otherwise, we'll wipe them off: */
    4733         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4734         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4735         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4733        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4734        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4735        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    47364736
    47374737        /*Add vx and vy as inputs to the tria element: */
    … …  
    48484848        /*Now, we have to move the previous Vz inputs to old
    48494849         * status, otherwise, we'll wipe them off and add the new inputs: */
    4850         this->inputs->ChangeEnum(VzEnum,VzOldEnum);
     4850        this->inputs->ChangeEnum(VzEnum,VzPicardEnum);
    48514851
    48524852        if(approximation!=PattynStokesApproximationEnum && approximation!=MacAyealStokesApproximationEnum){
    4853                 this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4853                this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    48544854                this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure));
    48554855        }
    … …  
    49104910        /*Now, we have to move the previous inputs  to old
    49114911         * status, otherwise, we'll wipe them off: */
    4912         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4913         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4914         this->inputs->ChangeEnum(VzEnum,VzOldEnum);
    4915         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4912        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4913        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4914        this->inputs->ChangeEnum(VzEnum,VzPicardEnum);
     4915        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    49164916
    49174917        /*Add vx and vy as inputs to the tria element: */
    … …  
    51495149        }
    51505150        else{
    5151                 this->inputs->AddInput(new PentaVertexInput(TemporaryTemperatureEnum,values));
     5151                this->inputs->AddInput(new PentaVertexInput(TemperaturePicardEnum,values));
    51525152        }
    51535153
    … …  
    61806180                                else                 for(i=0;i<6;i++)nodeinputs[i]=0;
    61816181                                this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
    6182                                 this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs));
     6182                                this->inputs->AddInput(new PentaVertexInput(VxPicardEnum,nodeinputs));
    61836183                                if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs));
    61846184                        }
    … …  
    61876187                                else                 for(i=0;i<6;i++)nodeinputs[i]=0;
    61886188                                this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
    6189                                 this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs));
     6189                                this->inputs->AddInput(new PentaVertexInput(VyPicardEnum,nodeinputs));
    61906190                                if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs));
    61916191                        }
    … …  
    61946194                                else                 for(i=0;i<6;i++)nodeinputs[i]=0;
    61956195                                this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
    6196                                 this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs));
     6196                                this->inputs->AddInput(new PentaVertexInput(VzPicardEnum,nodeinputs));
    61976197                                if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs));
    61986198                        }
    … …  
    62056205                                if(iomodel->isstokes){
    62066206                                        this->inputs->AddInput(new PentaVertexInput(PressureEnum,nodeinputs));
    6207                                         this->inputs->AddInput(new PentaVertexInput(PressureOldEnum,nodeinputs));
     6207                                        this->inputs->AddInput(new PentaVertexInput(PressurePicardEnum,nodeinputs));
    62086208                                }
    62096209                        }

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r7906 r8073  
    797797        Input* vx_input=inputs->GetInput(VxEnum);               _assert_(vx_input);
    798798        Input* vy_input=inputs->GetInput(VyEnum);               _assert_(vy_input);
    799         Input* vxold_input=inputs->GetInput(VxOldEnum);         _assert_(vxold_input);
    800         Input* vyold_input=inputs->GetInput(VyOldEnum);         _assert_(vyold_input);
     799        Input* vxold_input=inputs->GetInput(VxPicardEnum);      _assert_(vxold_input);
     800        Input* vyold_input=inputs->GetInput(VyPicardEnum);      _assert_(vyold_input);
    801801        this->parameters->FindParam(&viscosity_overshoot,ViscosityOvershootEnum);
    802802
    … …  
    24022402        this->parameters->FindParam(&dt,DtEnum);
    24032403        Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
    2404         Input* old_watercolumn_input=inputs->GetInput(OldWaterColumnEnum);           _assert_(old_watercolumn_input);
     2404        Input* old_watercolumn_input=inputs->GetInput(WaterColumnOldEnum);_assert_(old_watercolumn_input);
    24052405
    24062406        /*Initialize melting_correction_g to 0, do not forget!:*/
    … …  
    24172417                old_watercolumn_input->GetParameterValue(&old_watercolumn_g,gauss);
    24182418       
    2419 
    2420                
    24212419                if(dt)for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(old_watercolumn_g+dt*melting_g)*L[i];
    24222420                else  for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*melting_g*L[i];
    2423 
    24242421        }
    24252422               
    … …  
    31953192void Tria::GetHydrologyK(double* K,double* xyz_list,GaussTria* gauss){
    31963193
    3197 
    31983194        /*material parameters: */
    3199         double rho_ice;
    3200         double rho_water;
    3201         double g;
     3195        double rho_ice, rho_water, g;
    32023196        double dsdx, dsdy;
    32033197        double dbdx, dbdy;
    32043198        double surface_slope;
    3205         double kn;
    3206         double w;
    3207 
    3208         Input* surfaceslopex_input=NULL;
    3209         Input* surfaceslopey_input=NULL;
    3210         Input* bedslopex_input=NULL;
    3211         Input* bedslopey_input=NULL;
    3212         Input* watercolumn_input=NULL;
    3213 
     3199        double kn, w;
    32143200       
    3215         /*recover parameters and inputs: */
     3201        /*Retrieve all inputs and parameters*/
    32163202        rho_ice=matpar->GetRhoIce();
    32173203        rho_water=matpar->GetRhoWater();
    32183204        g=matpar->GetG();
    32193205        kn=matpar->GetKn();
    3220 
    3221         surfaceslopex_input=inputs->GetInput(SurfaceSlopeXEnum); _assert_(surfaceslopex_input);
    3222         surfaceslopey_input=inputs->GetInput(SurfaceSlopeYEnum); _assert_(surfaceslopey_input);
    3223         bedslopex_input=inputs->GetInput(BedSlopeXEnum); _assert_(bedslopex_input);
    3224         bedslopey_input=inputs->GetInput(BedSlopeYEnum); _assert_(bedslopey_input);
    3225         watercolumn_input=inputs->GetInput(WaterColumnEnum); _assert_(watercolumn_input);
     3206        Input* surfaceslopex_input=inputs->GetInput(SurfaceSlopeXEnum); _assert_(surfaceslopex_input);
     3207        Input* surfaceslopey_input=inputs->GetInput(SurfaceSlopeYEnum); _assert_(surfaceslopey_input);
     3208        Input* bedslopex_input=inputs->GetInput(BedSlopeXEnum);         _assert_(bedslopex_input);
     3209        Input* bedslopey_input=inputs->GetInput(BedSlopeYEnum);         _assert_(bedslopey_input);
     3210        Input* watercolumn_input=inputs->GetInput(WaterColumnEnum);     _assert_(watercolumn_input);
    32263211
    32273212        /*recover slopes: */
    … …  
    38973882                for(i=0;i<3;i++)nodeinputs[i]=iomodel->watercolumn[tria_vertex_ids[i]-1];
    38983883                this->inputs->AddInput(new TriaVertexInput(WaterColumnEnum,nodeinputs));
    3899                 this->inputs->AddInput(new TriaVertexInput(OldWaterColumnEnum,nodeinputs));
     3884                this->inputs->AddInput(new TriaVertexInput(WaterColumnOldEnum,nodeinputs));
    39003885        }
    39013886
    … …  
    39243909                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx[tria_vertex_ids[i]-1]/iomodel->yts;
    39253910                this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
    3926                 this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs));
     3911                this->inputs->AddInput(new TriaVertexInput(VxPicardEnum,nodeinputs));
    39273912                if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs));
    39283913        }
    … …  
    39303915                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy[tria_vertex_ids[i]-1]/iomodel->yts;
    39313916                this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));
    3932                 this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs));
     3917                this->inputs->AddInput(new TriaVertexInput(VyPicardEnum,nodeinputs));
    39333918                if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs));
    39343919        }
    … …  
    39363921                for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz[tria_vertex_ids[i]-1]/iomodel->yts;
    39373922                this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs));
    3938                 this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs));
     3923                this->inputs->AddInput(new TriaVertexInput(VzPicardEnum,nodeinputs));
    39393924                if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs));
    39403925        }
    … …  
    41574142        /*Now, we have to move the previous Vx and Vy inputs  to old
    41584143         * status, otherwise, we'll wipe them off: */
    4159         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4160         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4161         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4144        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4145        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4146        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    41624147
    41634148        /*Add vx and vy as inputs to the tria element: */
    … …  
    42324217        /*Now, we have to move the previous Vx and Vy inputs  to old
    42334218         * status, otherwise, we'll wipe them off: */
    4234         this->inputs->ChangeEnum(VxEnum,VxOldEnum);
    4235         this->inputs->ChangeEnum(VyEnum,VyOldEnum);
    4236         this->inputs->ChangeEnum(PressureEnum,PressureOldEnum);
     4219        this->inputs->ChangeEnum(VxEnum,VxPicardEnum);
     4220        this->inputs->ChangeEnum(VyEnum,VyPicardEnum);
     4221        this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum);
    42374222
    42384223        /*Add vx and vy as inputs to the tria element: */
    … …  
    43634348        /*Now, we have to move the previous WaterColumn input  to Picard
    43644349         * status, otherwise, we'll wipe them off: */
    4365         this->inputs->ChangeEnum(WaterColumnEnum,PicardWaterColumnEnum);
     4350        this->inputs->ChangeEnum(WaterColumnEnum,WaterColumnPicardEnum);
    43664351
    43674352        /*Add input to the element: */
    … …  
    58385823                                else                 for(i=0;i<3;i++)nodeinputs[i]=0;
    58395824                                this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
    5840                                 this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs));
     5825                                this->inputs->AddInput(new TriaVertexInput(VxPicardEnum,nodeinputs));
    58415826                                if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs));
    58425827                        }
    … …  
    58455830                                else                 for(i=0;i<3;i++)nodeinputs[i]=0;
    58465831                                this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));
    5847                                 this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs));
     5832                                this->inputs->AddInput(new TriaVertexInput(VyPicardEnum,nodeinputs));
    58485833                                if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs));
    58495834                        }
    … …  
    58525837                                else                 for(i=0;i<3;i++)nodeinputs[i]=0;
    58535838                                this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs));
    5854                                 this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs));
     5839                                this->inputs->AddInput(new TriaVertexInput(VzPicardEnum,nodeinputs));
    58555840                                if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs));
    58565841                        }

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r6413 r8073  
    484484        //First recover pressure and temperature values, using the element: */
    485485        penta->GetParameterValue(&pressure,node,PressureEnum);
    486         penta->GetParameterValue(&temperature,node,TemporaryTemperatureEnum);
     486        penta->GetParameterValue(&temperature,node,TemperaturePicardEnum);
    487487
    488488        //Recover our data:

  • issm/trunk/src/c/solutions/hydrology_core_step.cpp

    r7643 r8073  
    2222
    2323        /*transfer water column thickness to old water column thickness: */
    24         InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterColumnEnum,OldWaterColumnEnum);
     24        InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterColumnEnum,WaterColumnOldEnum);
    2525
    2626}

  • issm/trunk/src/c/solutions/steadystate_core.cpp

    r6412 r8073  
    4444               
    4545                _printf_(VerboseSolution(),"%s\n","   saving velocity, temperature and pressure to check for convergence at next step");
    46                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxOldEnum);
    47                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyOldEnum);
    48                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum,VzOldEnum);
    49                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureOldEnum);
     46                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxPicardEnum);
     47                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyPicardEnum);
     48                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum,VzPicardEnum);
     49                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressurePicardEnum);
    5050                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureOldEnum);
    5151               

  • issm/trunk/src/c/solutions/steadystateconvergence.cpp

    r4778 r8073  
    2525
    2626        /*intermediary: */
    27         int velocityenums[8]={VxEnum,VxOldEnum,VyEnum,VyOldEnum,VzEnum,VzOldEnum,PressureEnum,PressureOldEnum}; //pairs of enums (new and old) on which to carry out the converence tests
     27        int velocityenums[8]={VxEnum,VxPicardEnum,VyEnum,VyPicardEnum,VzEnum,VzPicardEnum,PressureEnum,PressurePicardEnum}; //pairs of enums (new and old) on which to carry out the converence tests
    2828        int temperatureenums[2]={TemperatureEnum,TemperatureOldEnum};
    2929        int convergencecriterion[1]={RelativeEnum}; //criterions for convergence, RelativeEnum or AbsoluteEnum
Note: See TracChangeset for help on using the changeset viewer.