diff --git a/src/Infrastructure/Mesh/src/ESMCI_Mesh_GToM_Glue.C b/src/Infrastructure/Mesh/src/ESMCI_Mesh_GToM_Glue.C index 30a7fd544c..f60a7dafe4 100644 --- a/src/Infrastructure/Mesh/src/ESMCI_Mesh_GToM_Glue.C +++ b/src/Infrastructure/Mesh/src/ESMCI_Mesh_GToM_Glue.C @@ -487,10 +487,10 @@ Par::Out() << "GID=" << gid << ", LID=" << lid << std::endl; MeshDB::iterator ni = mesh.node_begin(), ne = mesh.node_end(); for (; ni != ne; ++ni) { - // Get Cart. coords + // Get Cart. coords pointer double *c = node_coord->data(*ni); - // Get orig coords + // Get orig coords pointer double *orig_c; if (add_orig_coords) { orig_c=node_orig_coord->data(*ni); @@ -527,8 +527,6 @@ Par::Out() << "GID=" << gid << ", LID=" << lid << std::endl; } } } - - /// STOPPED HERE, BUT CHECK ABOVE // Other arrays for (UInt i = 0; i < arrays.size(); ++i) { diff --git a/src/Infrastructure/Mesh/src/ESMCI_Mesh_Vector_Regrid.C b/src/Infrastructure/Mesh/src/ESMCI_Mesh_Vector_Regrid.C index a637600d54..d8c286c488 100644 --- a/src/Infrastructure/Mesh/src/ESMCI_Mesh_Vector_Regrid.C +++ b/src/Infrastructure/Mesh/src/ESMCI_Mesh_Vector_Regrid.C @@ -89,7 +89,7 @@ void get_vec_dims_for_vectorRegrid(ESMCI::Array &array, int &num_vec_dims, int * // Class for holding coordinates to make other classes below cleaner class Coord { // Data - double c[2]; // Holds lon, lat + double c[2]; // Holds lon, lat in radians public: @@ -261,6 +261,12 @@ void CoordFromId::add(Mesh *mesh, MeshObj::id_type obj_type) { // Get pointer to coords double *c = node_coords->data(node); + + // If degrees, convert + if (mesh->coordsys == ESMC_COORDSYS_SPH_DEG) { + c[0] *= ESMC_CoordSys_Deg2Rad; + c[1] *= ESMC_CoordSys_Deg2Rad; + } // Add to list searchable.push_back(CoordFromIdEntry(id,c[0],c[1])); @@ -288,6 +294,12 @@ void CoordFromId::add(Mesh *mesh, MeshObj::id_type obj_type) { // Get pointer to coords double *c = elem_coords->data(elem); + + // If degrees, convert + if (mesh->coordsys == ESMC_COORDSYS_SPH_DEG) { + c[0] *= ESMC_CoordSys_Deg2Rad; + c[1] *= ESMC_CoordSys_Deg2Rad; + } // Add to list searchable.push_back(CoordFromIdEntry(id,c[0],c[1]));