Skip to content

Added EXTERNL definition in netcdf_par.h #1508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WardF merged 5 commits into from
Nov 5, 2019
Merged

Added EXTERNL definition in netcdf_par.h #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
726030d
Added EXTERNL definition in support of https://github.com/Unidata/net…
WardF Nov 4, 2019
72d889d
A better solution to previous fix, in line with documented usage of n…
WardF Nov 4, 2019
ea51c67
Removed previous kludgy fix.
WardF Nov 4, 2019
07d157d
Whack-a-mole
WardF Nov 4, 2019
91dfcd0
Fixed another instance of netcdf_par.h being included before netcdf.h
WardF Nov 4, 2019
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
7 changes: 4 additions & 3 deletions include/nc4internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#ifndef _NC4INTERNAL_
#define _NC4INTERNAL_
#include "netcdf.h"

#include "config.h"
#include <stdio.h>
Expand All @@ -23,12 +24,12 @@
#include "ncindex.h"
#include "nc_provenance.h"


#include "netcdf_f.h"
#include "netcdf_mem.h"
#ifdef USE_PARALLEL
#include "netcdf_par.h"
#endif /* USE_PARALLEL */
#include "netcdf.h"
#include "netcdf_f.h"
#include "netcdf_mem.h"

/* Always needed */
#include "nc.h"
Expand Down
3 changes: 2 additions & 1 deletion include/nc_tests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "netcdf.h"
#include "nc_logging.h"
#ifdef USE_PARALLEL
#include "netcdf_par.h"
Copy link
Copy Markdown
Contributor

@edhartnett edhartnett Nov 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be better to have netcdf_par.h #include netcdf.h?

#endif
#include "netcdf.h"


/** NC_MAX_DIMS for tests. Allows different NC_MAX_DIMS values
* without breaking this test with a heap or stack overflow. */
Expand Down
9 changes: 5 additions & 4 deletions libdap2/dapdump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*********************************************************************/

#include "config.h"
#include "netcdf.h"
#ifdef USE_PARALLEL
#include "netcdf_par.h"
#endif
Expand Down Expand Up @@ -91,7 +92,7 @@ dumpmetadata(int ncid, NChdr** hdrp)
CHECK(stat);
fprintf(stdout,"dim[%d]: name=%s size=%lu\n",
i,hdr->dims[i].name,(unsigned long)hdr->dims[i].size);
}
}
hdr->vars = (Var*)malloc(hdr->nvars*sizeof(Var));
MEMCHECK(hdr->vars,NC_ENOMEM);
for(i=0;i<hdr->nvars;i++) {
Expand Down Expand Up @@ -145,7 +146,7 @@ dumpmetadata(int ncid, NChdr** hdrp)
}
fprintf(stdout,"\n");
}
}
}
fflush(stdout);
return NC_NOERR;
}
Expand Down Expand Up @@ -338,7 +339,7 @@ dumptreer(CDFnode* root, NCbytes* buf, int indent, int visible)
ncbytescat(buf," ");
ncbytescat(buf,(root->ncbasename?root->ncbasename:"<?>"));
break;
default: break;
default: break;
}

if(nclistlength(root->array.dimsetplus) > 0) dimset = root->array.dimsetplus;
Expand Down Expand Up @@ -415,7 +416,7 @@ dumpnode(CDFnode* node)
default: break;
}
break;
default: break;
default: break;
}
snprintf(tmp,sizeof(tmp),"%s %s {\n",
(nctype?nctype:primtype),node->ocname);
Expand Down
⚡