Merge pull request #296 from xylar/fix_sphere_radius_cell_culler

Fix reading of sphere_radius, x_period and mesh_spec
MPAS-Dev · Mar 5, 2020 · 51ec7be · 51ec7be
2 parents 87defeb + bf30d49
commit 51ec7be
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 26 deletions.
diff --git a/compass/meta.yaml b/compass/meta.yaml
@@ -1,21 +1,21 @@
 {% set name = "compass" %}
-{% set version = "0.1.0" %}
+{% set version = "0.1.1" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 build:
   noarch: python
-  number: 1
+  number: 0
 
 requirements:
   host:
     - python
   run:
     - python
     - geometric_features 0.1.6 with_data*
-    - mpas_tools 0.0.8
+    - mpas_tools 0.0.9
     - jigsaw 0.9.12
     - jigsawpy 0.2.1
     - metis

diff --git a/conda_package/mpas_tools/__init__.py b/conda_package/mpas_tools/__init__.py
@@ -1,2 +1,2 @@
-__version_info__ = (0, 0, 8)
+__version_info__ = (0, 0, 9)
 __version__ = '.'.join(str(vi) for vi in __version_info__)
diff --git a/conda_package/recipe/meta.yaml b/conda_package/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "mpas_tools" %}
-{% set version = "0.0.8" %}
+{% set version = "0.0.9" %}
 
 package:
   name: '{{ name|lower }}'

diff --git a/mesh_tools/mesh_conversion_tools/netcdf_utils.cpp b/mesh_tools/mesh_conversion_tools/netcdf_utils.cpp
@@ -117,7 +117,7 @@ bool netcdf_mpas_read_onsphere(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		sph_name = "YES";
@@ -200,15 +200,13 @@ double netcdf_mpas_read_sphereradius(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		sph_name = "YES             ";
 
 		for(int i = 0; i < vals -> num(); i++){
-			tmp_name = vals -> as_string(i);
-
-			return atof(vals -> as_string(i));
+			return vals -> as_double(i);
 		}
 	} else {
 		return 0.0;
@@ -282,7 +280,7 @@ bool netcdf_mpas_read_isperiodic(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		sph_name = "YES";
@@ -365,13 +363,11 @@ double netcdf_mpas_read_xperiod(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		for(int i = 0; i < vals -> num(); i++){
-			tmp_name = vals -> as_string(i);
-
-			return atof(vals -> as_string(i));
+			return vals -> as_double(i);
 		}
 	} else {
 		return -1.0;
@@ -445,7 +441,7 @@ double netcdf_mpas_read_yperiod(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		for(int i = 0; i < vals -> num(); i++){
@@ -524,7 +520,7 @@ string netcdf_mpas_read_history(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		for(int i = 0; i < vals -> num(); i++){
@@ -603,7 +599,7 @@ string netcdf_mpas_read_fileid(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		for(int i = 0; i < vals -> num(); i++){
@@ -684,7 +680,7 @@ string netcdf_mpas_read_parentid(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		for(int i = 0; i < vals -> num(); i++){
@@ -762,15 +758,13 @@ double netcdf_mpas_read_meshspec(string filename){/*{{{*/
 
 	if(valid){
 		att_id = ncid.get_att(sph_name.c_str());
-		
+
 		vals = att_id -> values();
 
 		sph_name = "YES             ";
 
 		for(int i = 0; i < vals -> num(); i++){
-			tmp_name = vals -> as_string(i);
-
-			return atof(vals -> as_string(i));
+			return vals -> as_double(i);
 		}
 	} else {
 		return 0.0;
@@ -1343,7 +1337,7 @@ void netcdf_mpas_read_mesh_density ( string filename, int ncells, double mesh_de
 	//  Get the variable values.
 	//
 	NcError err(NcError::silent_nonfatal); // Don't error if the variable isn't found.
-	
+
 #ifdef _DEBUG
 	cout << "   Reading meshDensity" << endl;
 #endif
@@ -1671,7 +1665,7 @@ void netcdf_mpas_read_xyzvertex ( string filename, int nvertices, double xvertex
 	//
 	//    Input, int NVERTICES, the number of vertices.
 	//
-	//    Output, double XVERTEX[NVERTICES], YVERTEXL[NVERTICES], 
+	//    Output, double XVERTEX[NVERTICES], YVERTEXL[NVERTICES],
 	//    ZVERTEX[NVERTICES], the coordinates of the nodes.
 	//
 	NcVar *var_id;
@@ -2047,7 +2041,7 @@ void netcdf_mpas_read_xyzedge ( string filename, int nedges, double xedge[], dou
 	//
 	//    Input, int NEDGES, the number of edges.
 	//
-	//    Output, double XEDGE[NEDGES], YEDGE[NEDGES], 
+	//    Output, double XEDGE[NEDGES], YEDGE[NEDGES],
 	//    ZEDGE[NEDGES], the coordinates of the edges.
 	//
 	NcVar *var_id;