Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 5633) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 5634) @@ -1470,5 +1470,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vx_values[numvertices]; double maxabsvx; @@ -1478,5 +1477,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vx_values[0],&gaussgrids[0][0],numvertices,VxEnum); + GetParameterListOnVertices(&vx_values[0],VxEnum); /*process units if requested: */ @@ -1499,5 +1498,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vy_values[numvertices]; double maxabsvy; @@ -1507,5 +1505,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vy_values[0],&gaussgrids[0][0],numvertices,VyEnum); + GetParameterListOnVertices(&vy_values[0],VyEnum); /*process units if requested: */ @@ -1528,5 +1526,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vz_values[numvertices]; double maxabsvz; @@ -1536,5 +1533,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vz_values[0],&gaussgrids[0][0],numvertices,VzEnum); + GetParameterListOnVertices(&vz_values[0],VzEnum); /*process units if requested: */ @@ -1557,5 +1554,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vel_values[numvertices]; double maxvel; @@ -1565,5 +1561,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vel_values[0],&gaussgrids[0][0],numvertices,VelEnum); + GetParameterListOnVertices(&vel_values[0],VelEnum); /*process units if requested: */ @@ -1587,5 +1583,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vx_values[numvertices]; double maxvx; @@ -1595,5 +1590,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vx_values[0],&gaussgrids[0][0],numvertices,VxEnum); + GetParameterListOnVertices(&vx_values[0],VxEnum); /*process units if requested: */ @@ -1617,5 +1612,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vy_values[numvertices]; double maxvy; @@ -1625,5 +1619,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vy_values[0],&gaussgrids[0][0],numvertices,VyEnum); + GetParameterListOnVertices(&vy_values[0],VyEnum); /*process units if requested: */ @@ -1647,5 +1641,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vz_values[numvertices]; double maxvz; @@ -1655,5 +1648,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vz_values[0],&gaussgrids[0][0],numvertices,VzEnum); + GetParameterListOnVertices(&vz_values[0],VzEnum); /*process units if requested: */ @@ -1677,5 +1670,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vel_values[numvertices]; double minvel; @@ -1685,5 +1677,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vel_values[0],&gaussgrids[0][0],numvertices,VelEnum); + GetParameterListOnVertices(&vel_values[0],VelEnum); /*process units if requested: */ @@ -1707,5 +1699,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vx_values[numvertices]; double minvx; @@ -1715,5 +1706,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vx_values[0],&gaussgrids[0][0],numvertices,VxEnum); + GetParameterListOnVertices(&vx_values[0],VxEnum); /*process units if requested: */ @@ -1737,5 +1728,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vy_values[numvertices]; double minvy; @@ -1745,5 +1735,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vy_values[0],&gaussgrids[0][0],numvertices,VyEnum); + GetParameterListOnVertices(&vy_values[0],VyEnum); /*process units if requested: */ @@ -1767,5 +1757,4 @@ int dim; const int numvertices=3; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; double vz_values[numvertices]; double minvz; @@ -1775,5 +1764,5 @@ /*retrive velocity values at nodes */ - inputs->GetParameterValues(&vz_values[0],&gaussgrids[0][0],numvertices,VzEnum); + GetParameterListOnVertices(&vz_values[0],VzEnum); /*process units if requested: */ @@ -1813,5 +1802,4 @@ double gauss_weight; double gauss_l1l2l3[3]; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* parameters: */ @@ -1904,5 +1892,4 @@ double gauss_weight; double gauss_l1l2l3[3]; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* parameters: */ @@ -1928,9 +1915,9 @@ /* Recover input data: */ - inputs->GetParameterValues(&obs_vx_list[0],&gaussgrids[0][0],3,VxObsEnum); - inputs->GetParameterValues(&obs_vy_list[0],&gaussgrids[0][0],3,VyObsEnum); - inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxEnum); - inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyEnum); - inputs->GetParameterValues(&weights_list[0],&gaussgrids[0][0],3,WeightsEnum); + GetParameterListOnVertices(&obs_vx_list[0],VxObsEnum); + GetParameterListOnVertices(&obs_vy_list[0],VyObsEnum); + GetParameterListOnVertices(&vx_list[0],VxEnum); + GetParameterListOnVertices(&vy_list[0],VyEnum); + GetParameterListOnVertices(&weights_list[0],WeightsEnum); /*retrieve some parameters: */ @@ -2027,5 +2014,4 @@ double gauss_weight; double gauss_l1l2l3[3]; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* parameters: */ @@ -2055,9 +2041,9 @@ /* Recover input data: */ - inputs->GetParameterValues(&obs_vx_list[0],&gaussgrids[0][0],3,VxObsEnum); - inputs->GetParameterValues(&obs_vy_list[0],&gaussgrids[0][0],3,VyObsEnum); - inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxEnum); - inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyEnum); - inputs->GetParameterValues(&weights_list[0],&gaussgrids[0][0],3,WeightsEnum); + GetParameterListOnVertices(&obs_vx_list[0],VxObsEnum); + GetParameterListOnVertices(&obs_vy_list[0],VyObsEnum); + GetParameterListOnVertices(&vx_list[0],VxEnum); + GetParameterListOnVertices(&vy_list[0],VyEnum); + GetParameterListOnVertices(&weights_list[0],WeightsEnum); /*retrieve some parameters: */ @@ -2159,5 +2145,4 @@ double gauss_weight; double gauss_l1l2l3[3]; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* parameters: */ @@ -2187,9 +2172,9 @@ /* Recover input data: */ - inputs->GetParameterValues(&obs_vx_list[0],&gaussgrids[0][0],3,VxObsEnum); - inputs->GetParameterValues(&obs_vy_list[0],&gaussgrids[0][0],3,VyObsEnum); - inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxEnum); - inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyEnum); - inputs->GetParameterValues(&weights_list[0],&gaussgrids[0][0],3,WeightsEnum); + GetParameterListOnVertices(&obs_vx_list[0],VxObsEnum); + GetParameterListOnVertices(&obs_vy_list[0],VyObsEnum); + GetParameterListOnVertices(&vx_list[0],VxEnum); + GetParameterListOnVertices(&vy_list[0],VyEnum); + GetParameterListOnVertices(&weights_list[0],WeightsEnum); /*retrieve some parameters: */ @@ -2289,5 +2274,4 @@ double gauss_weight; double gauss_l1l2l3[3]; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* parameters: */ @@ -2319,9 +2303,9 @@ /* Recover input data: */ - inputs->GetParameterValues(&obs_vx_list[0],&gaussgrids[0][0],3,VxObsEnum); - inputs->GetParameterValues(&obs_vy_list[0],&gaussgrids[0][0],3,VyObsEnum); - inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxEnum); - inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyEnum); - inputs->GetParameterValues(&weights_list[0],&gaussgrids[0][0],3,WeightsEnum); + GetParameterListOnVertices(&obs_vx_list[0],VxObsEnum); + GetParameterListOnVertices(&obs_vy_list[0],VyObsEnum); + GetParameterListOnVertices(&vx_list[0],VxEnum); + GetParameterListOnVertices(&vy_list[0],VyEnum); + GetParameterListOnVertices(&weights_list[0],WeightsEnum); /*retrieve some parameters: */ @@ -2421,5 +2405,4 @@ double gauss_weight; double gauss_l1l2l3[3]; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* parameters: */ @@ -2452,9 +2435,9 @@ /* Recover input data: */ inputs->GetParameterValue(&S,SurfaceAreaEnum); - inputs->GetParameterValues(&obs_vx_list[0],&gaussgrids[0][0],3,VxObsEnum); - inputs->GetParameterValues(&obs_vy_list[0],&gaussgrids[0][0],3,VyObsEnum); - inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxEnum); - inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyEnum); - inputs->GetParameterValues(&weights_list[0],&gaussgrids[0][0],3,WeightsEnum); + GetParameterListOnVertices(&obs_vx_list[0],VxObsEnum); + GetParameterListOnVertices(&obs_vy_list[0],VyObsEnum); + GetParameterListOnVertices(&vx_list[0],VxEnum); + GetParameterListOnVertices(&vy_list[0],VyEnum); + GetParameterListOnVertices(&weights_list[0],WeightsEnum); /*retrieve some parameters: */ @@ -3137,5 +3120,4 @@ double xyz_list[numvertices][3]; int* doflist=NULL; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* gaussian points: */ @@ -3201,5 +3183,5 @@ /*Modify z so that it reflects the surface*/ - surface_input->GetParameterValues(&surface_list[0],&gaussgrids[0][0],3); + GetParameterListOnVertices(&surface_list[0],SurfaceEnum); for(i=0;iGetParameterValues(&obs_vx_list[0],&gaussgrids[0][0],3,VxObsEnum); - inputs->GetParameterValues(&obs_vy_list[0],&gaussgrids[0][0],3,VyObsEnum); - - inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxEnum); - inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyEnum); - - inputs->GetParameterValues(&weights_list[0],&gaussgrids[0][0],3,WeightsEnum); + GetParameterListOnVertices(&obs_vx_list[0],VxObsEnum); + GetParameterListOnVertices(&obs_vy_list[0],VyObsEnum); + GetParameterListOnVertices(&vx_list[0],VxEnum); + GetParameterListOnVertices(&vy_list[0],VyEnum); + GetParameterListOnVertices(&weights_list[0],WeightsEnum); inputs->GetParameterValue(&response,CmResponseEnum); @@ -5378,5 +5357,4 @@ double xyz_list[numvertices][3]; int* doflist=NULL; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* grid data: */ @@ -5429,11 +5407,9 @@ /* Recover input data: */ - inputs->GetParameterValues(&obs_vx_list[0],&gaussgrids[0][0],3,VxObsEnum); - inputs->GetParameterValues(&obs_vy_list[0],&gaussgrids[0][0],3,VyObsEnum); - - inputs->GetParameterValues(&vx_list[0],&gaussgrids[0][0],3,VxEnum); - inputs->GetParameterValues(&vy_list[0],&gaussgrids[0][0],3,VyEnum); - - inputs->GetParameterValues(&weights_list[0],&gaussgrids[0][0],3,WeightsEnum); + GetParameterListOnVertices(&obs_vx_list[0],VxObsEnum); + GetParameterListOnVertices(&obs_vy_list[0],VyObsEnum); + GetParameterListOnVertices(&vx_list[0],VxEnum); + GetParameterListOnVertices(&vy_list[0],VyEnum); + GetParameterListOnVertices(&weights_list[0],WeightsEnum); inputs->GetParameterValue(&response,CmResponseEnum); @@ -6071,6 +6047,6 @@ double alpha2,vx,vy; double geothermalflux_value; - double alpha2_list[numvertices]; //TO BE DELETED - double gauss[numvertices][numvertices] = {{1,0,0},{0,1,0},{0,0,1}}; //TO BE DELETED + double alpha2_list[numvertices]; //TO BE DELETED + double gauss[numvertices][numvertices] = {{1,0,0},{0,1,0},{0,0,1}}; //TO BE DELETED double vx_list[numvertices]; //TO BE DELETED double vy_list[numvertices]; //TO BE DELETED @@ -6653,5 +6629,4 @@ double gauss_weight; double gauss_l1l2l3[3]; - double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; /* parameters: */ @@ -6931,5 +6906,4 @@ double thickness[numvertices]; double rho_ice,g; - double gauss[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; Input* vz_input=NULL; double* vz_ptr=NULL; @@ -6970,5 +6944,5 @@ rho_ice=matpar->GetRhoIce(); g=matpar->GetG(); - inputs->GetParameterValues(&thickness[0],&gauss[0][0],3,ThicknessEnum); + GetParameterListOnVertices(&thickness[0],ThicknessEnum); for(i=0;i