Skip to content

Openmp #113

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

Open
NiklasPhabian wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Openmp #113

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f77917
Initial commit.
michaelleerilee Sep 19, 2021
962c953
Added an install time OpenMP checker to setup.py.
michaelleerilee Sep 19, 2021
dad30d7
Changed default lib to omp, not gomp.
michaelleerilee Sep 19, 2021
cc287bf
Merge branch 'master' into openmp
NiklasPhabian Nov 18, 2022
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
49 changes: 27 additions & 22 deletions pystare/PySTARE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@

#include <algorithm>


#include <omp.h>
#undef FMTX
#define FMTX(x) " 0x" << setfill('0') << setw(16) << hex << x << dec


// Info
const char* stare_version() { return STARE_version(); }

Expand All @@ -25,34 +28,36 @@ void _from_latlon(double* lat, int len_lat, double * lon, int len_lon, int64_t*
}
}

void _from_latlon2D(double* lat, int lalen1, int lalen2,
double* lon, int lolen1, int lolen2,
int64_t* indices, int len1, int len2, int level, bool adapt_resolution,
bool fill_value_enabled,
double fill_value_in,
int fill_value_out // would prefer int64_t, but it doesn't work.
) {

void _from_latlon2D(double* lat, int lalen1, int lalen2,
double* lon, int lolen1, int lolen2,
int64_t* indices, int len1, int len2, int level, bool adapt_resolution,
bool fill_value_enabled,
double fill_value_in,
int fill_value_out // would prefer int64_t, but it doesn't work.
) {
int n;
static EmbeddedLevelNameEncoding lj; // Use this to get the mask
int lvl;

if (!fill_value_enabled) {
for (int i=0; i<lalen1; i++) {
for (int j=0; j<lalen2; j++) {
n = i * lalen2 + j;
indices[n] = stare.ValueFromLatLonDegrees(lat[n], lon[n], level);
if (adapt_resolution) {
if (j==0) {
indices[n+1] = stare.ValueFromLatLonDegrees(lat[n+1], lon[n+1], level);
lvl = stare.cmpSpatialResolutionEstimateI(indices[n], indices[n+1]);
indices[n] = (indices[n]& ~lj.levelMaskSciDB) | lvl;
} else {
lvl = stare.cmpSpatialResolutionEstimateI(indices[n-1], indices[n]);
indices[n] = (indices[n]& ~lj.levelMaskSciDB) | lvl;
}
}
for (int i=0; i<lalen1; i++) {
#pragma omp parallel for
for (int j=0; j<lalen2; j++) {
n = i * lalen2 + j;
indices[n] = stare.ValueFromLatLonDegrees(lat[n], lon[n], level);
if (adapt_resolution) {
if (j==0) {
indices[n+1] = stare.ValueFromLatLonDegrees(lat[n+1], lon[n+1], level);
lvl = stare.cmpSpatialResolutionEstimateI(indices[n], indices[n+1]);
indices[n] = (indices[n]& ~lj.levelMaskSciDB) | lvl;
} else {
lvl = stare.cmpSpatialResolutionEstimateI(indices[n-1], indices[n]);
indices[n] = (indices[n]& ~lj.levelMaskSciDB) | lvl;
}
}
}
}
}
} else {
for (int i=0; i<lalen1; i++) {
bool skipped = true;
Expand Down