merge with dev - suppress unused variable

This commit is contained in:
Desmis
2019-02-06 08:48:54 +01:00
29 changed files with 368 additions and 41 deletions

View File

@@ -1839,11 +1839,15 @@ BENCHFUN
for (int iteration = 1; iteration <= dnparams.passes; ++iteration) {
#ifdef _OPENMP
#pragma omp parallel
#endif
{
if (methmed < 2)
{
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 1; i < hei - 1; ++i) {
if (methmed == 0) {
@@ -1858,7 +1862,9 @@ BENCHFUN
}
} else
{
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 2; i < hei - 2; ++i) {
if (methmed == 3) {
@@ -1902,7 +1908,9 @@ BENCHFUN
if (methmed < 2)
{
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 1; i < hei - 1; ++i) {
if (methmed == 0) {
@@ -1917,7 +1925,9 @@ BENCHFUN
}
} else
{
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 2; i < hei - 2; ++i) {
if (methmed == 3) {
@@ -1962,7 +1972,9 @@ BENCHFUN
if (methmed < 2)
{
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 1; i < hei - 1; ++i) {
if (methmed == 0) {
@@ -1977,7 +1989,9 @@ BENCHFUN
}
} else
{
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = 2; i < hei - 2; ++i) {
if (methmed == 3) {