Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8072) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8073) @@ -231,6 +231,6 @@ PflagEnum, PressureEnum, + PressurePicardEnum, VelocityEnum, - PressureOldEnum, QmuPressureEnum, ResetPenaltiesEnum, @@ -247,5 +247,5 @@ SurfaceSlopeYEnum, TemperatureEnum, - TemporaryTemperatureEnum, + TemperaturePicardEnum, TemperatureOldEnum, ThicknessEnum, @@ -259,15 +259,15 @@ VxEnum, VxObsEnum, - VxOldEnum, + VxPicardEnum, QmuVxEnum, VyAverageEnum, VyEnum, VyObsEnum, - VyOldEnum, + VyPicardEnum, QmuVyEnum, VzAverageEnum, VzEnum, VzObsEnum, - VzOldEnum, + VzPicardEnum, VzMacAyealEnum, VzPattynEnum, @@ -301,6 +301,6 @@ OutputFrequencyEnum, WaterColumnEnum, - OldWaterColumnEnum, - PicardWaterColumnEnum, + WaterColumnOldEnum, + WaterColumnPicardEnum, /*}}}*/ /*Io{{{1*/ Index: /issm/trunk/src/c/EnumDefinitions/EnumToString.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumToString.cpp (revision 8072) +++ /issm/trunk/src/c/EnumDefinitions/EnumToString.cpp (revision 8073) @@ -202,6 +202,6 @@ case PflagEnum : return "Pflag"; case PressureEnum : return "Pressure"; + case PressurePicardEnum : return "PressurePicard"; case VelocityEnum : return "Velocity"; - case PressureOldEnum : return "PressureOld"; case QmuPressureEnum : return "QmuPressure"; case ResetPenaltiesEnum : return "ResetPenalties"; @@ -218,5 +218,5 @@ case SurfaceSlopeYEnum : return "SurfaceSlopeY"; case TemperatureEnum : return "Temperature"; - case TemporaryTemperatureEnum : return "TemporaryTemperature"; + case TemperaturePicardEnum : return "TemperaturePicard"; case TemperatureOldEnum : return "TemperatureOld"; case ThicknessEnum : return "Thickness"; @@ -230,15 +230,15 @@ case VxEnum : return "Vx"; case VxObsEnum : return "VxObs"; - case VxOldEnum : return "VxOld"; + case VxPicardEnum : return "VxPicard"; case QmuVxEnum : return "QmuVx"; case VyAverageEnum : return "VyAverage"; case VyEnum : return "Vy"; case VyObsEnum : return "VyObs"; - case VyOldEnum : return "VyOld"; + case VyPicardEnum : return "VyPicard"; case QmuVyEnum : return "QmuVy"; case VzAverageEnum : return "VzAverage"; case VzEnum : return "Vz"; case VzObsEnum : return "VzObs"; - case VzOldEnum : return "VzOld"; + case VzPicardEnum : return "VzPicard"; case VzMacAyealEnum : return "VzMacAyeal"; case VzPattynEnum : return "VzPattyn"; @@ -268,6 +268,6 @@ case OutputFrequencyEnum : return "OutputFrequency"; case WaterColumnEnum : return "WaterColumn"; - case OldWaterColumnEnum : return "OldWaterColumn"; - case PicardWaterColumnEnum : return "PicardWaterColumn"; + case WaterColumnOldEnum : return "WaterColumnOld"; + case WaterColumnPicardEnum : return "WaterColumnPicard"; case IoGatherEnum : return "IoGather"; case MinVelEnum : return "MinVel"; Index: /issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp (revision 8072) +++ /issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp (revision 8073) @@ -200,6 +200,6 @@ else if (strcmp(name,"Pflag")==0) return PflagEnum; else if (strcmp(name,"Pressure")==0) return PressureEnum; + else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; else if (strcmp(name,"Velocity")==0) return VelocityEnum; - else if (strcmp(name,"PressureOld")==0) return PressureOldEnum; else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum; @@ -216,5 +216,5 @@ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; else if (strcmp(name,"Temperature")==0) return TemperatureEnum; - else if (strcmp(name,"TemporaryTemperature")==0) return TemporaryTemperatureEnum; + else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum; else if (strcmp(name,"Thickness")==0) return ThicknessEnum; @@ -228,15 +228,15 @@ else if (strcmp(name,"Vx")==0) return VxEnum; else if (strcmp(name,"VxObs")==0) return VxObsEnum; - else if (strcmp(name,"VxOld")==0) return VxOldEnum; + else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; else if (strcmp(name,"QmuVx")==0) return QmuVxEnum; else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; else if (strcmp(name,"Vy")==0) return VyEnum; else if (strcmp(name,"VyObs")==0) return VyObsEnum; - else if (strcmp(name,"VyOld")==0) return VyOldEnum; + else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; else if (strcmp(name,"QmuVy")==0) return QmuVyEnum; else if (strcmp(name,"VzAverage")==0) return VzAverageEnum; else if (strcmp(name,"Vz")==0) return VzEnum; else if (strcmp(name,"VzObs")==0) return VzObsEnum; - else if (strcmp(name,"VzOld")==0) return VzOldEnum; + else if (strcmp(name,"VzPicard")==0) return VzPicardEnum; else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum; else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum; @@ -266,6 +266,6 @@ else if (strcmp(name,"OutputFrequency")==0) return OutputFrequencyEnum; else if (strcmp(name,"WaterColumn")==0) return WaterColumnEnum; - else if (strcmp(name,"OldWaterColumn")==0) return OldWaterColumnEnum; - else if (strcmp(name,"PicardWaterColumn")==0) return PicardWaterColumnEnum; + else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; + else if (strcmp(name,"WaterColumnPicard")==0) return WaterColumnPicardEnum; else if (strcmp(name,"IoGather")==0) return IoGatherEnum; else if (strcmp(name,"MinVel")==0) return MinVelEnum; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 8072) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 8073) @@ -691,6 +691,6 @@ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxOldEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyOldEnum); _assert_(vyold_input); + Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); /* Start looping on the number of gaussian points: */ @@ -1162,6 +1162,6 @@ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxOldEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyOldEnum); _assert_(vyold_input); + Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); @@ -1305,6 +1305,6 @@ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxOldEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyOldEnum); _assert_(vyold_input); + Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); /* Start looping on the number of gaussian points: */ @@ -4024,5 +4024,5 @@ for(i=0;i<6;i++)nodeinputs[i]=iomodel->vx[penta_vertex_ids[i]-1]/iomodel->yts; this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs)); - this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VxPicardEnum,nodeinputs)); if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs)); } @@ -4030,5 +4030,5 @@ for(i=0;i<6;i++)nodeinputs[i]=iomodel->vy[penta_vertex_ids[i]-1]/iomodel->yts; this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs)); - this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VyPicardEnum,nodeinputs)); if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs)); } @@ -4036,5 +4036,5 @@ for(i=0;i<6;i++)nodeinputs[i]=iomodel->vz[penta_vertex_ids[i]-1]/iomodel->yts; this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs)); - this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VzPicardEnum,nodeinputs)); if(iomodel->qmu_analysis)this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs)); } @@ -4289,7 +4289,7 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - penta->inputs->ChangeEnum(VxEnum,VxOldEnum); - penta->inputs->ChangeEnum(VyEnum,VyOldEnum); - penta->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + penta->inputs->ChangeEnum(VxEnum,VxPicardEnum); + penta->inputs->ChangeEnum(VyEnum,VyPicardEnum); + penta->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4388,7 +4388,7 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4483,8 +4483,8 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(VzEnum,VzOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(VzEnum,VzPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4563,7 +4563,7 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4651,8 +4651,8 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(VzEnum,VzOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(VzEnum,VzPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4731,7 +4731,7 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4848,8 +4848,8 @@ /*Now, we have to move the previous Vz inputs to old * status, otherwise, we'll wipe them off and add the new inputs: */ - this->inputs->ChangeEnum(VzEnum,VzOldEnum); + this->inputs->ChangeEnum(VzEnum,VzPicardEnum); if(approximation!=PattynStokesApproximationEnum && approximation!=MacAyealStokesApproximationEnum){ - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); this->inputs->AddInput(new PentaVertexInput(PressureEnum,pressure)); } @@ -4910,8 +4910,8 @@ /*Now, we have to move the previous inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(VzEnum,VzOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(VzEnum,VzPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -5149,5 +5149,5 @@ } else{ - this->inputs->AddInput(new PentaVertexInput(TemporaryTemperatureEnum,values)); + this->inputs->AddInput(new PentaVertexInput(TemperaturePicardEnum,values)); } @@ -6180,5 +6180,5 @@ else for(i=0;i<6;i++)nodeinputs[i]=0; this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs)); - this->inputs->AddInput(new PentaVertexInput(VxOldEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VxPicardEnum,nodeinputs)); if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs)); } @@ -6187,5 +6187,5 @@ else for(i=0;i<6;i++)nodeinputs[i]=0; this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs)); - this->inputs->AddInput(new PentaVertexInput(VyOldEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VyPicardEnum,nodeinputs)); if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs)); } @@ -6194,5 +6194,5 @@ else for(i=0;i<6;i++)nodeinputs[i]=0; this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs)); - this->inputs->AddInput(new PentaVertexInput(VzOldEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(VzPicardEnum,nodeinputs)); if(iomodel->qmu_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs)); } @@ -6205,5 +6205,5 @@ if(iomodel->isstokes){ this->inputs->AddInput(new PentaVertexInput(PressureEnum,nodeinputs)); - this->inputs->AddInput(new PentaVertexInput(PressureOldEnum,nodeinputs)); + this->inputs->AddInput(new PentaVertexInput(PressurePicardEnum,nodeinputs)); } } Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 8072) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 8073) @@ -797,6 +797,6 @@ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); - Input* vxold_input=inputs->GetInput(VxOldEnum); _assert_(vxold_input); - Input* vyold_input=inputs->GetInput(VyOldEnum); _assert_(vyold_input); + Input* vxold_input=inputs->GetInput(VxPicardEnum); _assert_(vxold_input); + Input* vyold_input=inputs->GetInput(VyPicardEnum); _assert_(vyold_input); this->parameters->FindParam(&viscosity_overshoot,ViscosityOvershootEnum); @@ -2402,5 +2402,5 @@ this->parameters->FindParam(&dt,DtEnum); Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); - Input* old_watercolumn_input=inputs->GetInput(OldWaterColumnEnum); _assert_(old_watercolumn_input); + Input* old_watercolumn_input=inputs->GetInput(WaterColumnOldEnum);_assert_(old_watercolumn_input); /*Initialize melting_correction_g to 0, do not forget!:*/ @@ -2417,9 +2417,6 @@ old_watercolumn_input->GetParameterValue(&old_watercolumn_g,gauss); - - if(dt)for(i=0;ivalues[i]+=Jdettria*gauss->weight*(old_watercolumn_g+dt*melting_g)*L[i]; else for(i=0;ivalues[i]+=Jdettria*gauss->weight*melting_g*L[i]; - } @@ -3195,33 +3192,21 @@ void Tria::GetHydrologyK(double* K,double* xyz_list,GaussTria* gauss){ - /*material parameters: */ - double rho_ice; - double rho_water; - double g; + double rho_ice, rho_water, g; double dsdx, dsdy; double dbdx, dbdy; double surface_slope; - double kn; - double w; - - Input* surfaceslopex_input=NULL; - Input* surfaceslopey_input=NULL; - Input* bedslopex_input=NULL; - Input* bedslopey_input=NULL; - Input* watercolumn_input=NULL; - + double kn, w; - /*recover parameters and inputs: */ + /*Retrieve all inputs and parameters*/ rho_ice=matpar->GetRhoIce(); rho_water=matpar->GetRhoWater(); g=matpar->GetG(); kn=matpar->GetKn(); - - surfaceslopex_input=inputs->GetInput(SurfaceSlopeXEnum); _assert_(surfaceslopex_input); - surfaceslopey_input=inputs->GetInput(SurfaceSlopeYEnum); _assert_(surfaceslopey_input); - bedslopex_input=inputs->GetInput(BedSlopeXEnum); _assert_(bedslopex_input); - bedslopey_input=inputs->GetInput(BedSlopeYEnum); _assert_(bedslopey_input); - watercolumn_input=inputs->GetInput(WaterColumnEnum); _assert_(watercolumn_input); + Input* surfaceslopex_input=inputs->GetInput(SurfaceSlopeXEnum); _assert_(surfaceslopex_input); + Input* surfaceslopey_input=inputs->GetInput(SurfaceSlopeYEnum); _assert_(surfaceslopey_input); + Input* bedslopex_input=inputs->GetInput(BedSlopeXEnum); _assert_(bedslopex_input); + Input* bedslopey_input=inputs->GetInput(BedSlopeYEnum); _assert_(bedslopey_input); + Input* watercolumn_input=inputs->GetInput(WaterColumnEnum); _assert_(watercolumn_input); /*recover slopes: */ @@ -3897,5 +3882,5 @@ for(i=0;i<3;i++)nodeinputs[i]=iomodel->watercolumn[tria_vertex_ids[i]-1]; this->inputs->AddInput(new TriaVertexInput(WaterColumnEnum,nodeinputs)); - this->inputs->AddInput(new TriaVertexInput(OldWaterColumnEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(WaterColumnOldEnum,nodeinputs)); } @@ -3924,5 +3909,5 @@ for(i=0;i<3;i++)nodeinputs[i]=iomodel->vx[tria_vertex_ids[i]-1]/iomodel->yts; this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs)); - this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(VxPicardEnum,nodeinputs)); if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs)); } @@ -3930,5 +3915,5 @@ for(i=0;i<3;i++)nodeinputs[i]=iomodel->vy[tria_vertex_ids[i]-1]/iomodel->yts; this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs)); - this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(VyPicardEnum,nodeinputs)); if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs)); } @@ -3936,5 +3921,5 @@ for(i=0;i<3;i++)nodeinputs[i]=iomodel->vz[tria_vertex_ids[i]-1]/iomodel->yts; this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs)); - this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(VzPicardEnum,nodeinputs)); if(iomodel->qmu_analysis)this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs)); } @@ -4157,7 +4142,7 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4232,7 +4217,7 @@ /*Now, we have to move the previous Vx and Vy inputs to old * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(VxEnum,VxOldEnum); - this->inputs->ChangeEnum(VyEnum,VyOldEnum); - this->inputs->ChangeEnum(PressureEnum,PressureOldEnum); + this->inputs->ChangeEnum(VxEnum,VxPicardEnum); + this->inputs->ChangeEnum(VyEnum,VyPicardEnum); + this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); /*Add vx and vy as inputs to the tria element: */ @@ -4363,5 +4348,5 @@ /*Now, we have to move the previous WaterColumn input to Picard * status, otherwise, we'll wipe them off: */ - this->inputs->ChangeEnum(WaterColumnEnum,PicardWaterColumnEnum); + this->inputs->ChangeEnum(WaterColumnEnum,WaterColumnPicardEnum); /*Add input to the element: */ @@ -5838,5 +5823,5 @@ else for(i=0;i<3;i++)nodeinputs[i]=0; this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs)); - this->inputs->AddInput(new TriaVertexInput(VxOldEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(VxPicardEnum,nodeinputs)); if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs)); } @@ -5845,5 +5830,5 @@ else for(i=0;i<3;i++)nodeinputs[i]=0; this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs)); - this->inputs->AddInput(new TriaVertexInput(VyOldEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(VyPicardEnum,nodeinputs)); if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs)); } @@ -5852,5 +5837,5 @@ else for(i=0;i<3;i++)nodeinputs[i]=0; this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs)); - this->inputs->AddInput(new TriaVertexInput(VzOldEnum,nodeinputs)); + this->inputs->AddInput(new TriaVertexInput(VzPicardEnum,nodeinputs)); if(iomodel->qmu_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs)); } Index: /issm/trunk/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 8072) +++ /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 8073) @@ -484,5 +484,5 @@ //First recover pressure and temperature values, using the element: */ penta->GetParameterValue(&pressure,node,PressureEnum); - penta->GetParameterValue(&temperature,node,TemporaryTemperatureEnum); + penta->GetParameterValue(&temperature,node,TemperaturePicardEnum); //Recover our data: Index: /issm/trunk/src/c/solutions/hydrology_core_step.cpp =================================================================== --- /issm/trunk/src/c/solutions/hydrology_core_step.cpp (revision 8072) +++ /issm/trunk/src/c/solutions/hydrology_core_step.cpp (revision 8073) @@ -22,5 +22,5 @@ /*transfer water column thickness to old water column thickness: */ - InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterColumnEnum,OldWaterColumnEnum); + InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterColumnEnum,WaterColumnOldEnum); } Index: /issm/trunk/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/steadystate_core.cpp (revision 8072) +++ /issm/trunk/src/c/solutions/steadystate_core.cpp (revision 8073) @@ -44,8 +44,8 @@ _printf_(VerboseSolution(),"%s\n"," saving velocity, temperature and pressure to check for convergence at next step"); - InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxOldEnum); - InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyOldEnum); - InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum,VzOldEnum); - InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureOldEnum); + InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxPicardEnum); + InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyPicardEnum); + InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum,VzPicardEnum); + InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressurePicardEnum); InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureOldEnum); Index: /issm/trunk/src/c/solutions/steadystateconvergence.cpp =================================================================== --- /issm/trunk/src/c/solutions/steadystateconvergence.cpp (revision 8072) +++ /issm/trunk/src/c/solutions/steadystateconvergence.cpp (revision 8073) @@ -25,5 +25,5 @@ /*intermediary: */ - 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 + 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 int temperatureenums[2]={TemperatureEnum,TemperatureOldEnum}; int convergencecriterion[1]={RelativeEnum}; //criterions for convergence, RelativeEnum or AbsoluteEnum