Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 13787) @@ -17,7 +17,6 @@ #include "./classes.h" #include "../io/io.h" -#include "./Container/Parameters.h" +#include "../Container/Parameters.h" #include "../shared/shared.h" -#include "../io/io.h" #include "../include/include.h" Index: /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 13787) @@ -33,10 +33,10 @@ //Dakota headers -#include "DakotaResponse.H" -#include "ParamResponsePair.H" -#include "DakotaPlugin.h" -#include "system_defs.h" -#include "ProblemDescDB.H" -#include "ParallelLibrary.H" +#include +#include +#include +#include +#include +#include namespace SIM { Index: /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h =================================================================== --- /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h (revision 13786) +++ /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h (revision 13787) @@ -8,9 +8,7 @@ /*Headers:*/ -/*{{{*/ -#include "DirectApplicInterface.H" +#include #include "../../toolkits/toolkits.h" #include "../../classes/classes.h" -/*}}}*/ namespace SIM { Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13787) @@ -180,5 +180,5 @@ /*Intermediaries */ - int count,ig; + int count; IssmDouble basalfriction[NUMVERTICES]={0,0,0,0,0,0}; IssmDouble alpha2,vx,vy; @@ -204,5 +204,5 @@ gauss=new GaussPenta(0,1,2,2); count=0; - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -226,19 +226,19 @@ void Penta::ComputeBasalStress(Vector* sigma_b){ - int i,j,ig; + int i,j; int dofv[3]={0,1,2}; int dofp[1]={3}; int analysis_type,approximation; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[3][3]; - IssmDouble rho_ice,gravity,stokesreconditioning; - IssmDouble pressure,viscosity,Jdet2d; - IssmDouble bed_normal[3]; - IssmDouble basalforce[3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble stresstensor[6]={0.0}; - IssmDouble sigma_xx,sigma_yy,sigma_zz; - IssmDouble sigma_xy,sigma_xz,sigma_yz; - IssmDouble surface=0,value=0; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[3][3]; + IssmDouble rho_ice,gravity,stokesreconditioning; + IssmDouble pressure,viscosity,Jdet2d; + IssmDouble bed_normal[3]; + IssmDouble basalforce[3]; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble stresstensor[6]={0.0}; + IssmDouble sigma_xx,sigma_yy,sigma_zz; + IssmDouble sigma_xy,sigma_xz,sigma_yz; + IssmDouble surface=0,value=0; GaussPenta* gauss; @@ -276,5 +276,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3299,23 +3299,23 @@ /*Intermediaries */ int stabilization; - int i,j,ig,found=0; - IssmDouble Jdet,u,v,w,um,vm,wm; - IssmDouble h,hx,hy,hz,vx,vy,vz,vel; - IssmDouble gravity,rho_ice,rho_water; - IssmDouble epsvel=2.220446049250313e-16; - IssmDouble heatcapacity,thermalconductivity,dt; - IssmDouble pressure,enthalpy; - IssmDouble latentheat,kappa; - IssmDouble tau_parameter,diameter; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B_conduct[3][numdof]; - IssmDouble B_advec[3][numdof]; - IssmDouble Bprime_advec[3][numdof]; - IssmDouble L[numdof]; - IssmDouble dbasis[3][6]; - IssmDouble D_scalar_conduct,D_scalar_advec; - IssmDouble D_scalar_trans,D_scalar_stab; - IssmDouble D[3][3]; - IssmDouble K[3][3]={0.0}; + int i,j,found=0; + IssmDouble Jdet,u,v,w,um,vm,wm; + IssmDouble h,hx,hy,hz,vx,vy,vz,vel; + IssmDouble gravity,rho_ice,rho_water; + IssmDouble epsvel=2.220446049250313e-16; + IssmDouble heatcapacity,thermalconductivity,dt; + IssmDouble pressure,enthalpy; + IssmDouble latentheat,kappa; + IssmDouble tau_parameter,diameter; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble B_conduct[3][numdof]; + IssmDouble B_advec[3][numdof]; + IssmDouble Bprime_advec[3][numdof]; + IssmDouble L[numdof]; + IssmDouble dbasis[3][6]; + IssmDouble D_scalar_conduct,D_scalar_advec; + IssmDouble D_scalar_trans,D_scalar_stab; + IssmDouble D[3][3]; + IssmDouble K[3][3]={0.0}; Tria* tria=NULL; GaussPenta *gauss=NULL; @@ -3346,5 +3346,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3455,12 +3455,12 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,heatcapacity; - IssmDouble Jdet2d,dt; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; - IssmDouble D_scalar; + int i,j; + IssmDouble mixed_layer_capacity,thermal_exchange_velocity; + IssmDouble rho_ice,rho_water,heatcapacity; + IssmDouble Jdet2d,dt; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble basis[NUMVERTICES]; + IssmDouble D_scalar; GaussPenta *gauss=NULL; @@ -3481,5 +3481,5 @@ /* Start looping on the number of gauss (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3536,20 +3536,20 @@ /*Intermediaries */ int stabilization; - int i,j,ig,found=0; - IssmDouble Jdet,u,v,w,um,vm,wm,vel; - IssmDouble h,hx,hy,hz,vx,vy,vz; - IssmDouble gravity,rho_ice,rho_water,kappa; - IssmDouble heatcapacity,thermalconductivity,dt; - IssmDouble tau_parameter,diameter; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B_conduct[3][numdof]; - IssmDouble B_advec[3][numdof]; - IssmDouble Bprime_advec[3][numdof]; - IssmDouble L[numdof]; - IssmDouble dbasis[3][6]; - IssmDouble D_scalar_conduct,D_scalar_advec; - IssmDouble D_scalar_trans,D_scalar_stab; - IssmDouble D[3][3]; - IssmDouble K[3][3]={0.0}; + int i,j,found=0; + IssmDouble Jdet,u,v,w,um,vm,wm,vel; + IssmDouble h,hx,hy,hz,vx,vy,vz; + IssmDouble gravity,rho_ice,rho_water,kappa; + IssmDouble heatcapacity,thermalconductivity,dt; + IssmDouble tau_parameter,diameter; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble B_conduct[3][numdof]; + IssmDouble B_advec[3][numdof]; + IssmDouble Bprime_advec[3][numdof]; + IssmDouble L[numdof]; + IssmDouble dbasis[3][6]; + IssmDouble D_scalar_conduct,D_scalar_advec; + IssmDouble D_scalar_trans,D_scalar_stab; + IssmDouble D[3][3]; + IssmDouble K[3][3]={0.0}; Tria* tria=NULL; GaussPenta *gauss=NULL; @@ -3578,5 +3578,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3687,12 +3687,12 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,heatcapacity; - IssmDouble Jdet2d,dt; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; - IssmDouble D_scalar; + int i,j; + IssmDouble mixed_layer_capacity,thermal_exchange_velocity; + IssmDouble rho_ice,rho_water,heatcapacity; + IssmDouble Jdet2d,dt; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble basis[NUMVERTICES]; + IssmDouble D_scalar; GaussPenta *gauss=NULL; @@ -3713,5 +3713,5 @@ /* Start looping on the number of gauss (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3757,5 +3757,5 @@ /*Intermediaries*/ - int i,j,ig,found=0; + int i,j,found=0; int friction_type,stabilization; IssmDouble Jdet,phi,dt; @@ -3800,5 +3800,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(2,3); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3853,12 +3853,12 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdet2d; - IssmDouble heatcapacity,h_pmp; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,pressure,dt,scalar_ocean; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; + int i,j; + IssmDouble Jdet2d; + IssmDouble heatcapacity,h_pmp; + IssmDouble mixed_layer_capacity,thermal_exchange_velocity; + IssmDouble rho_ice,rho_water,pressure,dt,scalar_ocean; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble basis[NUMVERTICES]; GaussPenta* gauss=NULL; @@ -3882,5 +3882,5 @@ /* Start looping on the number of gauss 2d (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3910,14 +3910,14 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int analysis_type; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble Jdet2d,dt; - IssmDouble rho_ice,heatcapacity,geothermalflux_value; - IssmDouble basalfriction,alpha2,vx,vy; - IssmDouble scalar,enthalpy,enthalpyup; - IssmDouble pressure,pressureup; - IssmDouble basis[NUMVERTICES]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; + IssmDouble Jdet2d,dt; + IssmDouble rho_ice,heatcapacity,geothermalflux_value; + IssmDouble basalfriction,alpha2,vx,vy; + IssmDouble scalar,enthalpy,enthalpyup; + IssmDouble pressure,pressureup; + IssmDouble basis[NUMVERTICES]; Friction* friction=NULL; GaussPenta* gauss=NULL; @@ -3950,5 +3950,5 @@ gauss=new GaussPenta(0,1,2,2); gaussup=new GaussPenta(3,4,5,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4020,5 +4020,5 @@ /*Intermediaries*/ - int i,j,ig,found=0; + int i,j,found=0; int friction_type,stabilization; IssmDouble Jdet,phi,dt; @@ -4056,5 +4056,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(2,3); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4107,12 +4107,12 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdet2d; - IssmDouble mixed_layer_capacity,thermal_exchange_velocity; - IssmDouble rho_ice,rho_water,pressure,dt,scalar_ocean; - IssmDouble heatcapacity,t_pmp; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble basis[NUMVERTICES]; + int i,j; + IssmDouble Jdet2d; + IssmDouble mixed_layer_capacity,thermal_exchange_velocity; + IssmDouble rho_ice,rho_water,pressure,dt,scalar_ocean; + IssmDouble heatcapacity,t_pmp; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble basis[NUMVERTICES]; GaussPenta* gauss=NULL; @@ -4136,5 +4136,5 @@ /* Start looping on the number of gauss 2d (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4164,13 +4164,13 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int analysis_type; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble Jdet2d,dt; - IssmDouble rho_ice,heatcapacity,geothermalflux_value; - IssmDouble basalfriction,alpha2,vx,vy; - IssmDouble basis[NUMVERTICES]; - IssmDouble scalar; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; + IssmDouble Jdet2d,dt; + IssmDouble rho_ice,heatcapacity,geothermalflux_value; + IssmDouble basalfriction,alpha2,vx,vy; + IssmDouble basis[NUMVERTICES]; + IssmDouble scalar; Friction* friction=NULL; GaussPenta* gauss=NULL; @@ -4199,5 +4199,5 @@ /* Start looping on the number of gauss 2d (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4569,15 +4569,15 @@ /*Intermediaries */ - int i,j,ig; + int i,j; bool incomplete_adjoint; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3]; - IssmDouble phi[NUMVERTICES]; - IssmDouble dphi[3][NUMVERTICES]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdet; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble eps1[3],eps2[3]; + IssmDouble phi[NUMVERTICES]; + IssmDouble dphi[3][NUMVERTICES]; GaussPenta *gauss=NULL; @@ -4594,5 +4594,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4637,16 +4637,15 @@ /*Intermediaries */ - int i,j,ig; + int i,j; bool incomplete_adjoint; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble eps3dotdphii,eps3dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3],eps3[3]; - IssmDouble phi[NUMVERTICES]; - IssmDouble dphi[3][NUMVERTICES]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdet; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble eps3dotdphii,eps3dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble eps1[3],eps2[3],eps3[3]; + IssmDouble dphi[3][NUMVERTICES]; GaussPenta *gauss=NULL; @@ -4664,5 +4663,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4891,17 +4890,17 @@ void Penta::GradjDragPattyn(Vector* gradient,int control_index){ - int i,j,ig; + int i,j; int analysis_type; int vertexpidlist[NUMVERTICES]; - IssmDouble vx,vy,lambda,mu,alpha_complement,Jdet; - IssmDouble bed,thickness,Neff,drag; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble dk[NDOF3]; - IssmDouble grade_g[NUMVERTICES]={0.0}; - IssmDouble grade_g_gaussian[NUMVERTICES]; - IssmDouble basis[6]; + IssmDouble vx,vy,lambda,mu,alpha_complement,Jdet; + IssmDouble bed,thickness,Neff,drag; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; + IssmDouble dk[NDOF3]; + IssmDouble grade_g[NUMVERTICES]={0.0}; + IssmDouble grade_g_gaussian[NUMVERTICES]; + IssmDouble basis[6]; Friction* friction=NULL; - GaussPenta *gauss=NULL; + GaussPenta *gauss=NULL; /*Gradient is 0 if on shelf or not on bed*/ @@ -4924,5 +4923,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4962,17 +4961,17 @@ void Penta::GradjDragStokes(Vector* gradient,int control_index){ - int i,j,ig; + int i,j; int analysis_type; int vertexpidlist[NUMVERTICES]; - IssmDouble bed,thickness,Neff; - IssmDouble lambda,mu,xi,Jdet,vx,vy,vz; - IssmDouble alpha_complement,drag; - IssmDouble surface_normal[3],bed_normal[3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble dk[NDOF3]; - IssmDouble basis[6]; - IssmDouble grade_g[NUMVERTICES]={0.0}; - IssmDouble grade_g_gaussian[NUMVERTICES]; + IssmDouble bed,thickness,Neff; + IssmDouble lambda,mu,xi,Jdet,vx,vy,vz; + IssmDouble alpha_complement,drag; + IssmDouble surface_normal[3],bed_normal[3]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; + IssmDouble dk[NDOF3]; + IssmDouble basis[6]; + IssmDouble grade_g[NUMVERTICES]={0.0}; + IssmDouble grade_g_gaussian[NUMVERTICES]; Friction* friction=NULL; GaussPenta* gauss=NULL; @@ -4999,5 +4998,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,4); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5752,15 +5751,15 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdet; - IssmDouble viscosity,oldviscosity,newviscosity,viscosity_overshoot; //viscosity - IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[3][numdofp]; - IssmDouble Bprime[3][numdofm]; - IssmDouble D[3][3]={0.0}; // material matrix, simple scalar matrix. - IssmDouble D_scalar; - IssmDouble Ke_gg[numdofp][numdofm]={0.0}; //local element stiffness matrix - IssmDouble Ke_gg_gaussian[numdofp][numdofm]; //stiffness matrix evaluated at the gaussian point. + int i,j; + IssmDouble Jdet; + IssmDouble viscosity,oldviscosity,newviscosity,viscosity_overshoot; //viscosity + IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble B[3][numdofp]; + IssmDouble Bprime[3][numdofm]; + IssmDouble D[3][3]={0.0}; // material matrix, simple scalar matrix. + IssmDouble D_scalar; + IssmDouble Ke_gg[numdofp][numdofm]={0.0}; //local element stiffness matrix + IssmDouble Ke_gg_gaussian[numdofp][numdofm]; //stiffness matrix evaluated at the gaussian point. GaussPenta *gauss=NULL; GaussTria *gauss_tria=NULL; @@ -5797,5 +5796,5 @@ gauss=new GaussPenta(5,5); gauss_tria=new GaussTria(); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5844,16 +5843,16 @@ /*Intermediaries */ - int i,j,ig,analysis_type; - IssmDouble Jdet2d,slope_magnitude,alpha2; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble slope[3]={0.0,0.0,0.0}; - IssmDouble MAXSLOPE=.06; // 6 % - IssmDouble MOUNTAINKEXPONENT=10; - IssmDouble L[2][numdof]; - IssmDouble DL[2][2] ={{ 0,0 },{0,0}}; //for basal drag - IssmDouble DL_scalar; - IssmDouble Ke_gg[numdof][numdof] ={0.0}; - IssmDouble Ke_gg_gaussian[numdof][numdof]; //stiffness matrix contribution from drag + int i,j,analysis_type; + IssmDouble Jdet2d,slope_magnitude,alpha2; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; + IssmDouble slope[3]={0.0,0.0,0.0}; + IssmDouble MAXSLOPE=.06; // 6 % + IssmDouble MOUNTAINKEXPONENT=10; + IssmDouble L[2][numdof]; + IssmDouble DL[2][2] ={{ 0,0 },{0,0}}; //for basal drag + IssmDouble DL_scalar; + IssmDouble Ke_gg[numdof][numdof] ={0.0}; + IssmDouble Ke_gg_gaussian[numdof][numdof]; //stiffness matrix contribution from drag Friction *friction = NULL; GaussPenta *gauss=NULL; @@ -5890,5 +5889,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5957,20 +5956,20 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdet; - IssmDouble viscosity,stokesreconditioning; //viscosity - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[4][numdofs+3]; - IssmDouble Bprime[4][numdofm]; - IssmDouble B2[3][numdofm]; - IssmDouble Bprime2[3][numdofs+3]; - IssmDouble D[4][4]={0.0}; // material matrix, simple scalar matrix. - IssmDouble D2[3][3]={0.0}; // material matrix, simple scalar matrix. - IssmDouble D_scalar; - IssmDouble Ke_gg[numdofs][numdofm]={0.0}; //local element stiffness matrix - IssmDouble Ke_gg2[numdofm][numdofs]={0.0}; //local element stiffness matrix - IssmDouble Ke_gg_gaussian[numdofs+3][numdofm]; //stiffness matrix evaluated at the gaussian point. - IssmDouble Ke_gg_gaussian2[numdofm][numdofs+3]; //stiffness matrix evaluated at the gaussian point. + int i,j; + IssmDouble Jdet; + IssmDouble viscosity,stokesreconditioning; //viscosity + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble B[4][numdofs+3]; + IssmDouble Bprime[4][numdofm]; + IssmDouble B2[3][numdofm]; + IssmDouble Bprime2[3][numdofs+3]; + IssmDouble D[4][4]={0.0}; // material matrix, simple scalar matrix. + IssmDouble D2[3][3]={0.0}; // material matrix, simple scalar matrix. + IssmDouble D_scalar; + IssmDouble Ke_gg[numdofs][numdofm]={0.0}; //local element stiffness matrix + IssmDouble Ke_gg2[numdofm][numdofs]={0.0}; //local element stiffness matrix + IssmDouble Ke_gg_gaussian[numdofs+3][numdofm]; //stiffness matrix evaluated at the gaussian point. + IssmDouble Ke_gg_gaussian2[numdofm][numdofs+3]; //stiffness matrix evaluated at the gaussian point. GaussPenta *gauss=NULL; GaussTria *gauss_tria=NULL; @@ -6006,5 +6005,5 @@ gauss=new GaussPenta(5,5); gauss_tria=new GaussTria(); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6063,20 +6062,20 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int analysis_type,approximation; - IssmDouble stokesreconditioning; - IssmDouble viscosity,alpha2_gauss,Jdet2d; - IssmDouble bed_normal[3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble LMacAyealStokes[8][numdof2dm]; - IssmDouble LprimeMacAyealStokes[8][numdof2d]; - IssmDouble DLMacAyealStokes[8][8]={0.0}; - IssmDouble LStokesMacAyeal[4][numdof2d]; - IssmDouble LprimeStokesMacAyeal[4][numdof2dm]; - IssmDouble DLStokesMacAyeal[4][4]={0.0}; - IssmDouble Ke_drag_gaussian[numdof2dm][numdof2d]; - IssmDouble Ke_drag_gaussian2[numdof2d][numdof2dm]; + IssmDouble stokesreconditioning; + IssmDouble viscosity,alpha2_gauss,Jdet2d; + IssmDouble bed_normal[3]; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble LMacAyealStokes[8][numdof2dm]; + IssmDouble LprimeMacAyealStokes[8][numdof2d]; + IssmDouble DLMacAyealStokes[8][8]={0.0}; + IssmDouble LStokesMacAyeal[4][numdof2d]; + IssmDouble LprimeStokesMacAyeal[4][numdof2dm]; + IssmDouble DLStokesMacAyeal[4][4]={0.0}; + IssmDouble Ke_drag_gaussian[numdof2dm][numdof2d]; + IssmDouble Ke_drag_gaussian2[numdof2d][numdof2dm]; Friction* friction=NULL; GaussPenta *gauss=NULL; @@ -6114,5 +6113,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6364,5 +6363,5 @@ /*Intermediaries */ - int i,j,ig,approximation; + int i,j,approximation; IssmDouble Jdet; IssmDouble viscosity , oldviscosity, newviscosity, viscosity_overshoot; @@ -6400,5 +6399,5 @@ gauss=new GaussPenta(5,5); gauss_tria=new GaussTria(); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6615,14 +6614,14 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int approximation; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble viscosity,oldviscosity,newviscosity,viscosity_overshoot; //viscosity - IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble D_scalar; - IssmDouble D[5][5]={0.0}; // material matrix, simple scalar matrix. - IssmDouble B[5][numdof]; - IssmDouble Bprime[5][numdof]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdet; + IssmDouble viscosity,oldviscosity,newviscosity,viscosity_overshoot; //viscosity + IssmDouble epsilon[5],oldepsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble D_scalar; + IssmDouble D[5][5]={0.0}; // material matrix, simple scalar matrix. + IssmDouble B[5][numdof]; + IssmDouble Bprime[5][numdof]; Tria* tria=NULL; GaussPenta *gauss=NULL; @@ -6642,5 +6641,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6680,15 +6679,15 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int analysis_type; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; - IssmDouble slope_magnitude,alpha2,Jdet; - IssmDouble slope[3]={0.0,0.0,0.0}; - IssmDouble MAXSLOPE=.06; // 6 % - IssmDouble MOUNTAINKEXPONENT=10; - IssmDouble L[2][numdof]; - IssmDouble DL[2][2]={{ 0,0 },{0,0}}; //for basal drag - IssmDouble DL_scalar; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]={0.0}; + IssmDouble slope_magnitude,alpha2,Jdet; + IssmDouble slope[3]={0.0,0.0,0.0}; + IssmDouble MAXSLOPE=.06; // 6 % + IssmDouble MOUNTAINKEXPONENT=10; + IssmDouble L[2][numdof]; + IssmDouble DL[2][2]={{ 0,0 },{0,0}}; //for basal drag + IssmDouble DL_scalar; Friction *friction = NULL; GaussPenta *gauss=NULL; @@ -6713,5 +6712,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6782,13 +6781,13 @@ /*Intermediaries */ - int i,j,ig,approximation; - IssmDouble Jdet,viscosity,stokesreconditioning; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble B[8][27]; - IssmDouble B_prime[8][27]; - IssmDouble D_scalar; - IssmDouble D[8][8]={0.0}; - IssmDouble Ke_temp[27][27]={0.0}; //for the six nodes and the bubble + int i,j,approximation; + IssmDouble Jdet,viscosity,stokesreconditioning; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble B[8][27]; + IssmDouble B_prime[8][27]; + IssmDouble D_scalar; + IssmDouble D[8][8]={0.0}; + IssmDouble Ke_temp[27][27]={0.0}; //for the six nodes and the bubble GaussPenta *gauss=NULL; @@ -6807,5 +6806,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6847,14 +6846,14 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int analysis_type,approximation; - IssmDouble alpha2,Jdet2d; - IssmDouble stokesreconditioning,viscosity; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble LStokes[2][numdof2d]; - IssmDouble DLStokes[2][2]={0.0}; - IssmDouble Ke_drag_gaussian[numdof2d][numdof2d]; + IssmDouble alpha2,Jdet2d; + IssmDouble stokesreconditioning,viscosity; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble LStokes[2][numdof2d]; + IssmDouble DLStokes[2][2]={0.0}; + IssmDouble Ke_drag_gaussian[numdof2d][numdof2d]; Friction* friction=NULL; GaussPenta *gauss=NULL; @@ -6879,5 +6878,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6933,10 +6932,10 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[NDOF1][NUMVERTICES]; - IssmDouble Bprime[NDOF1][NUMVERTICES]; - IssmDouble DL_scalar; + int i,j; + IssmDouble Jdet; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble B[NDOF1][NUMVERTICES]; + IssmDouble Bprime[NDOF1][NUMVERTICES]; + IssmDouble DL_scalar; GaussPenta *gauss=NULL; @@ -6949,5 +6948,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -6979,10 +6978,10 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble surface_normal[3]; - IssmDouble Jdet2d,DL_scalar; - IssmDouble basis[NUMVERTICES]; + int i,j; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble surface_normal[3]; + IssmDouble Jdet2d,DL_scalar; + IssmDouble basis[NUMVERTICES]; GaussPenta *gauss=NULL; @@ -6997,5 +6996,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(3,4,5,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7038,13 +7037,13 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int approximation; - IssmDouble viscosity,Jdet; - IssmDouble stokesreconditioning; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble dw[3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta - IssmDouble dbasis[3][6]; //for the six nodes of the penta + IssmDouble viscosity,Jdet; + IssmDouble stokesreconditioning; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble dw[3]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble dbasis[3][6]; //for the six nodes of the penta GaussPenta *gauss=NULL; @@ -7064,5 +7063,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7100,15 +7099,15 @@ /*Intermediaries*/ - int i,j,ig; + int i,j; int approximation,analysis_type; - IssmDouble Jdet,Jdet2d; - IssmDouble stokesreconditioning; - IssmDouble bed_normal[3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble viscosity, w, alpha2_gauss; - IssmDouble dw[3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble Jdet,Jdet2d; + IssmDouble stokesreconditioning; + IssmDouble bed_normal[3]; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble viscosity, w, alpha2_gauss; + IssmDouble dw[3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[6]; //for the six nodes of the penta Tria* tria=NULL; Friction* friction=NULL; @@ -7137,5 +7136,5 @@ /* Start looping on the number of gauss 2d (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7189,13 +7188,13 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int approximation; - IssmDouble viscosity,Jdet; - IssmDouble stokesreconditioning; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble dw[3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta - IssmDouble dbasis[3][6]; //for the six nodes of the penta + IssmDouble viscosity,Jdet; + IssmDouble stokesreconditioning; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble dw[3]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble dbasis[3][6]; //for the six nodes of the penta GaussPenta *gauss=NULL; @@ -7215,5 +7214,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7251,15 +7250,15 @@ /*Intermediaries*/ - int i,j,ig; + int i,j; int approximation,analysis_type; - IssmDouble Jdet,Jdet2d; - IssmDouble stokesreconditioning; - IssmDouble bed_normal[3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble viscosity, w, alpha2_gauss; - IssmDouble dw[3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble Jdet,Jdet2d; + IssmDouble stokesreconditioning; + IssmDouble bed_normal[3]; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble viscosity, w, alpha2_gauss; + IssmDouble dw[3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[6]; //for the six nodes of the penta Tria* tria=NULL; Friction* friction=NULL; @@ -7288,5 +7287,5 @@ /* Start looping on the number of gauss 2d (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7402,15 +7401,15 @@ /*Intermediaries*/ - int i,j,k,ig; + int i,j; int node0,node1; int connectivity[2]; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_segment[2][3]; - IssmDouble z_list[NUMVERTICES]; - IssmDouble z_segment[2],slope[2]; - IssmDouble slope2,constant_part; - IssmDouble rho_ice,gravity,n,B; - IssmDouble ub,vb,z_g,surface,thickness; + IssmDouble Jdet; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_segment[2][3]; + IssmDouble z_list[NUMVERTICES]; + IssmDouble slope[2]; + IssmDouble slope2,constant_part; + IssmDouble rho_ice,gravity,n,B; + IssmDouble ub,vb,z_g,surface,thickness; GaussPenta* gauss=NULL; @@ -7445,5 +7444,5 @@ /*Loop on the Gauss points: */ gauss=new GaussPenta(node0,node1,3); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7518,10 +7517,10 @@ /*Intermediaries*/ - int i,j,ig; - IssmDouble Jdet; - IssmDouble slope[3]; //do not put 2! this goes into GetInputDerivativeValue, which addresses slope[3] also! - IssmDouble driving_stress_baseline,thickness; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[6]; + int i,j; + IssmDouble Jdet; + IssmDouble slope[3]; //do not put 2! this goes into GetInputDerivativeValue, which addresses slope[3] also! + IssmDouble driving_stress_baseline,thickness; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[6]; GaussPenta *gauss=NULL; @@ -7536,5 +7535,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(2,3); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7580,19 +7579,18 @@ /*Intermediaries*/ - int i,j,ig; + int i,j; int approximation; - IssmDouble Jdet,viscosity; - IssmDouble gravity,rho_ice,stokesreconditioning; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ - IssmDouble l1l7[7]; //for the six nodes and the bubble - IssmDouble B[8][numdofbubble]; - IssmDouble B_prime[8][numdofbubble]; - IssmDouble B_prime_bubble[8][3]; - IssmDouble D[8][8]={0.0}; - IssmDouble D_scalar; - IssmDouble Pe_gaussian[numdofbubble]={0.0}; //for the six nodes and the bubble - IssmDouble Ke_temp[numdofbubble][3]={0.0}; //for the six nodes and the bubble - IssmDouble Ke_gaussian[numdofbubble][3]; + IssmDouble Jdet,viscosity; + IssmDouble gravity,rho_ice,stokesreconditioning; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble epsilon[6]; /* epsilon=[exx,eyy,ezz,exy,exz,eyz];*/ + IssmDouble l1l7[7]; //for the six nodes and the bubble + IssmDouble B[8][numdofbubble]; + IssmDouble B_prime[8][numdofbubble]; + IssmDouble B_prime_bubble[8][3]; + IssmDouble D[8][8]={0.0}; + IssmDouble D_scalar; + IssmDouble Pe_gaussian[numdofbubble]={0.0}; //for the six nodes and the bubble + IssmDouble Ke_temp[numdofbubble][3]={0.0}; //for the six nodes and the bubble GaussPenta *gauss=NULL; @@ -7613,5 +7611,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7657,14 +7655,14 @@ /*Intermediaries*/ - int i,j,ig; + int i,j; int approximation,shelf_dampening; - IssmDouble gravity,rho_water,bed,water_pressure; - IssmDouble damper,normal_vel,vx,vy,vz,dt; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble bed_normal[3]; - IssmDouble dz[3]; - IssmDouble basis[6]; //for the six nodes of the penta - IssmDouble Jdet2d; + IssmDouble gravity,rho_water,bed,water_pressure; + IssmDouble damper,normal_vel,vx,vy,vz,dt; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble bed_normal[3]; + IssmDouble dz[3]; + IssmDouble basis[6]; //for the six nodes of the penta + IssmDouble Jdet2d; GaussPenta *gauss=NULL; @@ -7689,5 +7687,5 @@ /* Start looping on the number of gauss 2d (nodes on the bedrock) */ gauss=new GaussPenta(0,1,2,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7742,5 +7740,4 @@ /*Intermediaries*/ - int i,ig; int approximation; IssmDouble Jdet; @@ -7766,5 +7763,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(2,2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7783,5 +7780,5 @@ dvdy=dv[1]; - for (i=0;ivalues[i] += (dudx+dvdy+dwdz)*Jdet*gauss->weight*basis[i]; + for(int i=0;ivalues[i] += (dudx+dvdy+dwdz)*Jdet*gauss->weight*basis[i]; } @@ -7798,12 +7795,12 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int approximation; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble Jdet2d; - IssmDouble vx,vy,vz,dbdx,dbdy,basalmeltingvalue; - IssmDouble slope[3]; - IssmDouble basis[NUMVERTICES]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble xyz_list_tria[NUMVERTICES2D][3]; + IssmDouble Jdet2d; + IssmDouble vx,vy,vz,dbdx,dbdy,basalmeltingvalue; + IssmDouble slope[3]; + IssmDouble basis[NUMVERTICES]; GaussPenta* gauss=NULL; @@ -7828,5 +7825,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(0,1,2,2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7916,14 +7913,13 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3]; - IssmDouble phi[NUMVERTICES]; - IssmDouble dphi[3][NUMVERTICES]; + int i,j; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdet; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble eps1[3],eps2[3]; + IssmDouble dphi[3][NUMVERTICES]; GaussPenta *gauss=NULL; @@ -7938,5 +7934,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -7981,15 +7977,14 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble eps3dotdphii,eps3dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ - IssmDouble eps1[3],eps2[3],eps3[3]; - IssmDouble phi[NUMVERTICES]; - IssmDouble dphi[3][NUMVERTICES]; + int i,j; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdet; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble eps3dotdphii,eps3dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[5]; /* epsilon=[exx,eyy,exy,exz,eyz];*/ + IssmDouble eps1[3],eps2[3],eps3[3]; + IssmDouble dphi[3][NUMVERTICES]; GaussPenta *gauss=NULL; @@ -8005,5 +8000,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussPenta(5,5); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13787) @@ -405,13 +405,13 @@ /*Intermediaries */ - int i,j,ig,dim; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdettria,dt,vx,vy; - IssmDouble L[NUMVERTICES]; - IssmDouble B[2][NUMVERTICES]; - IssmDouble Bprime[2][NUMVERTICES]; - IssmDouble DL[2][2]={0.0}; - IssmDouble DLprime[2][2]={0.0}; - IssmDouble DL_scalar; + int i,j,dim; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdettria,dt,vx,vy; + IssmDouble L[NUMVERTICES]; + IssmDouble B[2][NUMVERTICES]; + IssmDouble Bprime[2][NUMVERTICES]; + IssmDouble DL[2][2]={0.0}; + IssmDouble DLprime[2][2]={0.0}; + IssmDouble DL_scalar; GaussTria *gauss=NULL; @@ -436,5 +436,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -593,9 +593,9 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdettria,dt; - IssmDouble surface_mass_balance_g,basal_melting_g,basal_melting_correction_g,thickness_g; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble L[NUMVERTICES]; + int i,j; + IssmDouble Jdettria,dt; + IssmDouble surface_mass_balance_g,basal_melting_g,basal_melting_correction_g,thickness_g; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble L[NUMVERTICES]; GaussTria* gauss=NULL; @@ -614,5 +614,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -644,9 +644,9 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdettria,dt; - IssmDouble surface_mass_balance_g,basal_melting_g,thickness_g; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble L[NUMVERTICES]; + int i,j; + IssmDouble Jdettria,dt; + IssmDouble surface_mass_balance_g,basal_melting_g,thickness_g; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble L[NUMVERTICES]; GaussTria* gauss=NULL; @@ -663,5 +663,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -689,10 +689,10 @@ /*Intermediaries */ - int i,j,ig; + int i,j; int analysis_type; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble slope[2]; - IssmDouble basis[3]; + IssmDouble Jdet; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble slope[2]; + IssmDouble basis[3]; GaussTria* gauss=NULL; @@ -713,5 +713,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -2864,13 +2864,13 @@ /*Intermediaries*/ - int i,j,ig; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble viscosity,newviscosity,oldviscosity; - IssmDouble viscosity_overshoot,thickness,Jdet; - IssmDouble epsilon[3],oldepsilon[3]; /* epsilon=[exx,eyy,exy]; */ - IssmDouble B[3][numdof]; - IssmDouble Bprime[3][numdof]; - IssmDouble D[3][3] = {0.0}; - IssmDouble D_scalar; + int i,j; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble viscosity,newviscosity,oldviscosity; + IssmDouble viscosity_overshoot,thickness,Jdet; + IssmDouble epsilon[3],oldepsilon[3]; /* epsilon=[exx,eyy,exy]; */ + IssmDouble B[3][numdof]; + IssmDouble Bprime[3][numdof]; + IssmDouble D[3][3] = {0.0}; + IssmDouble D_scalar; GaussTria *gauss = NULL; @@ -2889,5 +2889,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -2928,15 +2928,15 @@ /*Intermediaries*/ - int i,j,ig; + int i,j; int analysis_type; - IssmDouble MAXSLOPE = .06; // 6 % - IssmDouble MOUNTAINKEXPONENT = 10; - IssmDouble slope_magnitude,alpha2; - IssmDouble Jdet; - IssmDouble L[2][numdof]; - IssmDouble DL[2][2] = {{ 0,0 },{0,0}}; - IssmDouble DL_scalar; - IssmDouble slope[2] = {0.0,0.0}; - IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble MAXSLOPE = .06; // 6 % + IssmDouble MOUNTAINKEXPONENT = 10; + IssmDouble slope_magnitude,alpha2; + IssmDouble Jdet; + IssmDouble L[2][numdof]; + IssmDouble DL[2][2] = {{ 0,0 },{0,0}}; + IssmDouble DL_scalar; + IssmDouble slope[2] = {0.0,0.0}; + IssmDouble xyz_list[NUMVERTICES][3]; Friction *friction = NULL; GaussTria *gauss = NULL; @@ -2959,5 +2959,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3018,11 +3018,11 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble driving_stress_baseline,thickness; - IssmDouble Jdet; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble slope[2]; - IssmDouble basis[3]; - IssmDouble pe_g_gaussian[numdof]; + int i,j; + IssmDouble driving_stress_baseline,thickness; + IssmDouble Jdet; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble slope[2]; + IssmDouble basis[3]; + IssmDouble pe_g_gaussian[numdof]; GaussTria* gauss=NULL; @@ -3038,5 +3038,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3122,14 +3122,14 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet,thickness; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];*/ - IssmDouble eps1[2],eps2[2]; - IssmDouble phi[NUMVERTICES]; - IssmDouble dphi[2][NUMVERTICES]; + int i,j; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdet,thickness; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];*/ + IssmDouble eps1[2],eps2[2]; + IssmDouble phi[NUMVERTICES]; + IssmDouble dphi[2][NUMVERTICES]; GaussTria *gauss=NULL; @@ -3145,5 +3145,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3545,11 +3545,11 @@ void Tria::GradjBGradient(Vector* gradient,int weight_index,int control_index){ - int i,ig; + int i; int vertexpidlist[NUMVERTICES]; - IssmDouble Jdet,weight; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dbasis[NDOF2][NUMVERTICES]; - IssmDouble dk[NDOF2]; - IssmDouble grade_g[NUMVERTICES]={0.0}; + IssmDouble Jdet,weight; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dbasis[NDOF2][NUMVERTICES]; + IssmDouble dk[NDOF2]; + IssmDouble grade_g[NUMVERTICES]={0.0}; GaussTria *gauss=NULL; @@ -3562,5 +3562,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3585,11 +3585,11 @@ void Tria::GradjZGradient(Vector* gradient,int weight_index,int control_index){ - int i,ig; + int i; int vertexpidlist[NUMVERTICES]; - IssmDouble Jdet,weight; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dbasis[NDOF2][NUMVERTICES]; - IssmDouble dk[NDOF2]; - IssmDouble grade_g[NUMVERTICES]={0.0}; + IssmDouble Jdet,weight; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dbasis[NDOF2][NUMVERTICES]; + IssmDouble dk[NDOF2]; + IssmDouble grade_g[NUMVERTICES]={0.0}; GaussTria *gauss=NULL; @@ -3602,5 +3602,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3626,12 +3626,12 @@ /*Intermediaries*/ - int i,ig; + int i; int doflist[NUMVERTICES]; - IssmDouble vx,vy,lambda,mu,thickness,Jdet; - IssmDouble viscosity_complement; - IssmDouble dvx[NDOF2],dvy[NDOF2],dadjx[NDOF2],dadjy[NDOF2],dB[NDOF2]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[3],epsilon[3]; - IssmDouble grad[NUMVERTICES]={0.0}; + IssmDouble vx,vy,lambda,mu,thickness,Jdet; + IssmDouble viscosity_complement; + IssmDouble dvx[NDOF2],dvy[NDOF2],dadjx[NDOF2],dadjy[NDOF2],dB[NDOF2]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[3],epsilon[3]; + IssmDouble grad[NUMVERTICES]={0.0}; GaussTria *gauss = NULL; @@ -3650,5 +3650,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3683,12 +3683,12 @@ /*Intermediaries*/ - int i,ig; + int i; int doflist[NUMVERTICES]; - IssmDouble vx,vy,lambda,mu,thickness,Jdet; - IssmDouble viscosity_complement; - IssmDouble dvx[NDOF2],dvy[NDOF2],dadjx[NDOF2],dadjy[NDOF2],dZ[NDOF2]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[3],epsilon[3]; - IssmDouble grad[NUMVERTICES]={0.0}; + IssmDouble vx,vy,lambda,mu,thickness,Jdet; + IssmDouble viscosity_complement; + IssmDouble dvx[NDOF2],dvy[NDOF2],dadjx[NDOF2],dadjy[NDOF2],dZ[NDOF2]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[3],epsilon[3]; + IssmDouble grad[NUMVERTICES]={0.0}; GaussTria *gauss = NULL; @@ -3707,5 +3707,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3739,16 +3739,16 @@ void Tria::GradjDragMacAyeal(Vector* gradient,int control_index){ - int i,ig; + int i; int analysis_type; int vertexpidlist[NUMVERTICES]; int connectivity[NUMVERTICES]; - IssmDouble vx,vy,lambda,mu,alpha_complement,Jdet; - IssmDouble bed,thickness,Neff,drag; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dk[NDOF2]; - IssmDouble grade_g[NUMVERTICES]={0.0}; - IssmDouble grade_g_gaussian[NUMVERTICES]; - IssmDouble basis[3]; - IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ + IssmDouble vx,vy,lambda,mu,alpha_complement,Jdet; + IssmDouble bed,thickness,Neff,drag; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dk[NDOF2]; + IssmDouble grade_g[NUMVERTICES]={0.0}; + IssmDouble grade_g_gaussian[NUMVERTICES]; + IssmDouble basis[3]; + IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/ Friction* friction=NULL; GaussTria *gauss=NULL; @@ -3774,5 +3774,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3827,11 +3827,11 @@ void Tria::GradjDragGradient(Vector* gradient, int weight_index,int control_index){ - int i,ig; + int i; int vertexpidlist[NUMVERTICES]; - IssmDouble Jdet,weight; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dbasis[NDOF2][NUMVERTICES]; - IssmDouble dk[NDOF2]; - IssmDouble grade_g[NUMVERTICES]={0.0}; + IssmDouble Jdet,weight; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dbasis[NDOF2][NUMVERTICES]; + IssmDouble dk[NDOF2]; + IssmDouble grade_g[NUMVERTICES]={0.0}; GaussTria *gauss=NULL; @@ -3845,5 +3845,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3888,11 +3888,11 @@ /*Intermediaries*/ - int i,ig; + int i; int vertexpidlist[NUMVERTICES]; - IssmDouble thickness,Jdet; - IssmDouble basis[3]; - IssmDouble Dlambda[2],dp[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble grade_g[NUMVERTICES] = {0.0}; + IssmDouble thickness,Jdet; + IssmDouble basis[3]; + IssmDouble Dlambda[2],dp[2]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble grade_g[NUMVERTICES] = {0.0}; GaussTria *gauss = NULL; @@ -3907,5 +3907,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -3931,11 +3931,11 @@ /*Intermediaries*/ - int i,ig; + int i; int vertexpidlist[NUMVERTICES]; - IssmDouble thickness,Jdet; - IssmDouble basis[3]; - IssmDouble Dlambda[2],dp[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble grade_g[NUMVERTICES] = {0.0}; + IssmDouble thickness,Jdet; + IssmDouble basis[3]; + IssmDouble Dlambda[2],dp[2]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble grade_g[NUMVERTICES] = {0.0}; GaussTria *gauss = NULL; @@ -3950,5 +3950,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4007,5 +4007,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4032,9 +4032,9 @@ const int numdof=2*NUMVERTICES; - int i,ig; - IssmDouble Jelem=0,S,Jdet; - IssmDouble misfit; - IssmDouble vx,vy,vxobs,vyobs,weight; - IssmDouble xyz_list[NUMVERTICES][3]; + int i; + IssmDouble Jelem=0,S,Jdet; + IssmDouble misfit; + IssmDouble vx,vy,vxobs,vyobs,weight; + IssmDouble xyz_list[NUMVERTICES][3]; GaussTria *gauss=NULL; @@ -4055,5 +4055,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(3); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4093,12 +4093,12 @@ const int numdof=NDOF2*NUMVERTICES; - int i,ig; - IssmDouble Jelem=0; - IssmDouble misfit,Jdet; - IssmDouble epsvel=2.220446049250313e-16; - IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ - IssmDouble velocity_mag,obs_velocity_mag; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble vx,vy,vxobs,vyobs,weight; + int i; + IssmDouble Jelem=0; + IssmDouble misfit,Jdet; + IssmDouble epsvel=2.220446049250313e-16; + IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ + IssmDouble velocity_mag,obs_velocity_mag; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble vx,vy,vxobs,vyobs,weight; GaussTria *gauss=NULL; @@ -4118,5 +4118,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4158,12 +4158,12 @@ const int numdof=NDOF2*NUMVERTICES; - int i,ig; + int i; int fit=-1; - IssmDouble Jelem=0, S=0; - IssmDouble epsvel=2.220446049250313e-16; - IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ - IssmDouble misfit, Jdet; - IssmDouble vx,vy,vxobs,vyobs,weight; - IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jelem=0, S=0; + IssmDouble epsvel=2.220446049250313e-16; + IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ + IssmDouble misfit, Jdet; + IssmDouble vx,vy,vxobs,vyobs,weight; + IssmDouble xyz_list[NUMVERTICES][3]; GaussTria *gauss=NULL; @@ -4183,5 +4183,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4224,9 +4224,8 @@ const int numdof=NDOF2*NUMVERTICES; - int i,ig; - IssmDouble Jelem=0; - IssmDouble misfit,Jdet; - IssmDouble vx,vy,vxobs,vyobs,weight; - IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jelem=0; + IssmDouble misfit,Jdet; + IssmDouble vx,vy,vxobs,vyobs,weight; + IssmDouble xyz_list[NUMVERTICES][3]; GaussTria *gauss=NULL; @@ -4246,5 +4245,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4284,12 +4283,11 @@ const int numdof=2*NUMVERTICES; - int i,ig; - IssmDouble Jelem=0; - IssmDouble scalex=1,scaley=1; - IssmDouble misfit,Jdet; - IssmDouble epsvel=2.220446049250313e-16; - IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ - IssmDouble vx,vy,vxobs,vyobs,weight; - IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jelem=0; + IssmDouble scalex=1,scaley=1; + IssmDouble misfit,Jdet; + IssmDouble epsvel=2.220446049250313e-16; + IssmDouble meanvel=3.170979198376458e-05; /*1000 m/yr*/ + IssmDouble vx,vy,vxobs,vyobs,weight; + IssmDouble xyz_list[NUMVERTICES][3]; GaussTria *gauss=NULL; @@ -4309,5 +4307,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4368,5 +4366,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4415,5 +4413,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4467,5 +4465,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4496,11 +4494,11 @@ /*Intermediaries*/ - int i,ig; - IssmDouble thickness,thicknessobs,weight; - IssmDouble Jdet; - IssmDouble Jelem = 0; - IssmDouble xyz_list[NUMVERTICES][3]; + int i; + IssmDouble thickness,thicknessobs,weight; + IssmDouble Jdet; + IssmDouble Jelem = 0; + IssmDouble xyz_list[NUMVERTICES][3]; GaussTria *gauss = NULL; - IssmDouble dH[2]; + IssmDouble dH[2]; /*If on water, return 0: */ @@ -4515,5 +4513,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4544,5 +4542,5 @@ /*Intermediaries */ - int i,ig,resp; + int i,resp; IssmDouble Jdet; IssmDouble thickness,thicknessobs,weight; @@ -4571,5 +4569,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4631,5 +4629,5 @@ /*Intermediaries */ - int i,resp,ig; + int i,resp; int *responses=NULL; int num_responses; @@ -4667,5 +4665,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -4813,5 +4811,5 @@ /*Intermediaries */ - int i,resp,ig; + int i,resp; int *responses=NULL; int num_responses; @@ -4849,5 +4847,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5016,5 +5014,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5065,15 +5063,14 @@ /*Intermediaries */ - int i,j,ig; + int i,j; bool incomplete_adjoint; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble Jdet,thickness; - IssmDouble eps1dotdphii,eps1dotdphij; - IssmDouble eps2dotdphii,eps2dotdphij; - IssmDouble mu_prime; - IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];*/ - IssmDouble eps1[2],eps2[2]; - IssmDouble phi[NUMVERTICES]; - IssmDouble dphi[2][NUMVERTICES]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble Jdet,thickness; + IssmDouble eps1dotdphii,eps1dotdphij; + IssmDouble eps2dotdphii,eps2dotdphij; + IssmDouble mu_prime; + IssmDouble epsilon[3];/* epsilon=[exx,eyy,exy];*/ + IssmDouble eps1[2],eps2[2]; + IssmDouble dphi[2][NUMVERTICES]; GaussTria *gauss=NULL; @@ -5091,5 +5088,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5315,21 +5312,21 @@ /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; + const int numdof=NDOF1*NUMVERTICES; /*Intermediaries */ - IssmDouble diffusivity; - int i,j,ig; - IssmDouble Jdettria,DL_scalar,dt,h; - IssmDouble vx,vy,vel,dvxdx,dvydy; - IssmDouble dvx[2],dvy[2]; - IssmDouble v_gauss[2]={0.0}; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble L[NUMVERTICES]; - IssmDouble B[2][NUMVERTICES]; - IssmDouble Bprime[2][NUMVERTICES]; - IssmDouble K[2][2] ={0.0}; - IssmDouble KDL[2][2] ={0.0}; - IssmDouble DL[2][2] ={0.0}; - IssmDouble DLprime[2][2] ={0.0}; + IssmDouble diffusivity; + int i,j; + IssmDouble Jdettria,DL_scalar,dt,h; + IssmDouble vx,vy,vel,dvxdx,dvydy; + IssmDouble dvx[2],dvy[2]; + IssmDouble v_gauss[2]={0.0}; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble L[NUMVERTICES]; + IssmDouble B[2][NUMVERTICES]; + IssmDouble Bprime[2][NUMVERTICES]; + IssmDouble K[2][2] ={0.0}; + IssmDouble KDL[2][2] ={0.0}; + IssmDouble DL[2][2] ={0.0}; + IssmDouble DLprime[2][2] ={0.0}; GaussTria *gauss=NULL; @@ -5353,5 +5350,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5423,10 +5420,10 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble Jdettria,dt; - IssmDouble basal_melting_g; - IssmDouble old_watercolumn_g; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basis[numdof]; + int i,j; + IssmDouble Jdettria,dt; + IssmDouble basal_melting_g; + IssmDouble old_watercolumn_g; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basis[numdof]; GaussTria* gauss=NULL; @@ -5446,5 +5443,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5697,16 +5694,16 @@ /*Intermediaries */ int stabilization; - int i,j,ig,dim; - IssmDouble Jdettria,vx,vy,dvxdx,dvydy,vel,h; - IssmDouble dvx[2],dvy[2]; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble L[NUMVERTICES]; - IssmDouble B[2][NUMVERTICES]; - IssmDouble Bprime[2][NUMVERTICES]; - IssmDouble K[2][2] = {0.0}; - IssmDouble KDL[2][2] = {0.0}; - IssmDouble DL[2][2] = {0.0}; - IssmDouble DLprime[2][2] = {0.0}; - IssmDouble DL_scalar; + int i,j,dim; + IssmDouble Jdettria,vx,vy,dvxdx,dvydy,vel,h; + IssmDouble dvx[2],dvy[2]; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble L[NUMVERTICES]; + IssmDouble B[2][NUMVERTICES]; + IssmDouble Bprime[2][NUMVERTICES]; + IssmDouble K[2][2] = {0.0}; + IssmDouble KDL[2][2] = {0.0}; + IssmDouble DL[2][2] = {0.0}; + IssmDouble DLprime[2][2] = {0.0}; + IssmDouble DL_scalar; GaussTria *gauss = NULL; @@ -5732,5 +5729,5 @@ /*Start looping on the number of gaussian points:*/ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5806,11 +5803,11 @@ /*Intermediaries*/ - int i,j,ig,dim; - IssmDouble vx,vy,Jdettria; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble B[2][NUMVERTICES]; - IssmDouble Bprime[2][NUMVERTICES]; - IssmDouble DL[2][2]={0.0}; - IssmDouble DL_scalar; + int i,j,dim; + IssmDouble vx,vy,Jdettria; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble B[2][NUMVERTICES]; + IssmDouble Bprime[2][NUMVERTICES]; + IssmDouble DL[2][2]={0.0}; + IssmDouble DL_scalar; GaussTria *gauss=NULL; @@ -5826,5 +5823,5 @@ /*Start looping on the number of gaussian points:*/ gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5874,8 +5871,8 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble dhdt_g,basal_melting_g,surface_mass_balance_g,Jdettria; - IssmDouble L[NUMVERTICES]; + int i,j; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dhdt_g,basal_melting_g,surface_mass_balance_g,Jdettria; + IssmDouble L[NUMVERTICES]; GaussTria* gauss=NULL; @@ -5891,5 +5888,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); @@ -5917,8 +5914,8 @@ /*Intermediaries */ - int i,j,ig; - IssmDouble xyz_list[NUMVERTICES][3]; - IssmDouble basal_melting_g,surface_mass_balance_g,dhdt_g,Jdettria; - IssmDouble L[NUMVERTICES]; + int i,j; + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble basal_melting_g,surface_mass_balance_g,dhdt_g,Jdettria; + IssmDouble L[NUMVERTICES]; GaussTria* gauss=NULL; @@ -5934,5 +5931,5 @@ /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ + for(int ig=gauss->begin();igend();ig++){ gauss->GaussPoint(ig); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13787) @@ -355,9 +355,8 @@ /*Intermediaries*/ - int i; - TriaP1Input *xinputB = NULL; - int B_numvalues; - const int numnodes = 3; - IssmDouble minvalues[numnodes]; + int i; + TriaP1Input *xinputB = NULL; + const int numnodes = 3; + IssmDouble minvalues[numnodes]; /*Check that inputB is of the same type*/ @@ -388,5 +387,4 @@ int i; TriaP1Input *xinputB = NULL; - int B_numvalues; const int numnodes = 3; IssmDouble maxvalues[numnodes]; Index: /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp (revision 13787) @@ -545,5 +545,5 @@ FILE* fid){ - int i=-1,j; + int i=-1; char* kstr; char* ktok; Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 13787) @@ -377,5 +377,4 @@ const int numdof = NDOF2*NUMVERTICES; int dofs[1] = {0}; - IssmDouble Ke_gg[4][4]; IssmDouble thickness; IssmDouble h[2]; @@ -457,24 +456,24 @@ ElementVector* Riftfront::PenaltyCreatePVectorDiagnosticHoriz(IssmDouble kmax){ - const int numdof = NDOF2*NUMVERTICES; - int i,j; - IssmDouble rho_ice; - IssmDouble rho_water; - IssmDouble gravity; - IssmDouble thickness; - IssmDouble h[2]; - IssmDouble bed; - IssmDouble b[2]; - IssmDouble pressure; - IssmDouble pressure_litho; - IssmDouble pressure_air; - IssmDouble pressure_melange; - IssmDouble pressure_water; - int fill; - bool shelf; + const int numdof = NDOF2*NUMVERTICES; + int j; + IssmDouble rho_ice; + IssmDouble rho_water; + IssmDouble gravity; + IssmDouble thickness; + IssmDouble h[2]; + IssmDouble bed; + IssmDouble b[2]; + IssmDouble pressure; + IssmDouble pressure_litho; + IssmDouble pressure_air; + IssmDouble pressure_melange; + IssmDouble pressure_water; + int fill; + bool shelf; /*Objects: */ - Tria *tria1 = NULL; - Tria *tria2 = NULL; + Tria *tria1 = NULL; + Tria *tria2 = NULL; /*enum of element? */ Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13787) @@ -7,5 +7,4 @@ int i; - int m,n; /*Contour:*/ @@ -42,8 +41,6 @@ /*Contour:*/ Contour* contouri=NULL; - int numnodes; double* xc=NULL; double* yc=NULL; - double value; /*output: */ Index: /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 13787) @@ -16,5 +16,4 @@ long iii, jjj; long test; - float howlong; float nsteps, ssteps, wsteps, esteps; float nwsteps, nesteps, swsteps, sesteps; Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13787) @@ -25,5 +25,4 @@ double* x=NULL; double* y=NULL; - double x_grid,y_grid; int i; Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13787) @@ -19,10 +19,7 @@ /*Intermediary*/ - int i,j; + int i; int interpolation_type; bool debug; - double area; - double area_1,area_2,area_3; - double data_value; double xmin,xmax; double ymin,ymax; Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13787) @@ -25,5 +25,5 @@ R2 r; I2 I; - int i,j,k; + int i,j; int it; int i0,i1,i2; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 13787) @@ -14,5 +14,4 @@ void CreateParametersControl(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){ - int i; Parameters *parameters = NULL; bool control_analysis; @@ -21,8 +20,8 @@ int num_cm_responses; int *control_type = NULL; - IssmDouble *cm_responses = NULL; - IssmDouble *cm_jump = NULL; - IssmDouble *optscal = NULL; - IssmDouble *maxiter = NULL; + IssmDouble *cm_responses = NULL; + IssmDouble *cm_jump = NULL; + IssmDouble *optscal = NULL; + IssmDouble *maxiter = NULL; /*Get parameters: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 13787) @@ -16,5 +16,5 @@ /*Intermediary*/ - int i,j,k,n; + int i; int dim,materials_type; int numberofelements; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13787) @@ -44,5 +44,4 @@ Constraints *constraints = NULL; SpcStatic *spcstatic = NULL; - int node1,node2; int dim; int numberofvertices; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13787) @@ -13,5 +13,4 @@ int numdofs=2; //default numdofs - int i; int* doftype=NULL; Index: /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 13787) @@ -13,5 +13,5 @@ /*intermediary: */ - int i,j; + int i; int fsize,ssize; int connectivity, numberofdofspernode; Index: /issm/trunk-jpl/src/c/solutions/dakota_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 13787) @@ -43,10 +43,9 @@ #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in. -#include "ParallelLibrary.H" -#include "ProblemDescDB.H" -#include "DakotaStrategy.H" -#include "DakotaModel.H" -#include "DakotaInterface.H" - +#include +#include +#include +#include +#include #endif /*}}}*/ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp (revision 13787) @@ -10,7 +10,7 @@ /*Petsc includes: */ -#include "petscmat.h" -#include "petscvec.h" -#include "petscksp.h" +#include +#include +#include /*ISSM includes: */ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp (revision 13787) @@ -10,7 +10,7 @@ /*Petsc includes: */ -#include "petscmat.h" -#include "petscvec.h" -#include "petscksp.h" +#include +#include +#include /*ISSM includes: */ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp (revision 13786) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp (revision 13787) @@ -10,7 +10,7 @@ /*Petsc includes: */ -#include "petscmat.h" -#include "petscvec.h" -#include "petscksp.h" +#include +#include +#include /*ISSM includes: */