Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compass/meta.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda_package/mpas_tools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version_info__ = (0, 0, 8)
__version_info__ = (0, 0, 9)
__version__ = '.'.join(str(vi) for vi in __version_info__)
2 changes: 1 addition & 1 deletion conda_package/recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "mpas_tools" %}
{% set version = "0.0.8" %}
{% set version = "0.0.9" %}

package:
name: '{{ name|lower }}'
Expand Down
36 changes: 15 additions & 21 deletions mesh_tools/mesh_conversion_tools/netcdf_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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++){
Expand Down Expand Up @@ -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++){
Expand Down Expand Up @@ -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++){
Expand Down Expand Up @@ -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++){
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down