diff --git a/Code.v05-00/src/AIM/Aerosol.cpp b/Code.v05-00/src/AIM/Aerosol.cpp index 79523ab33..bf4a8ebdf 100644 --- a/Code.v05-00/src/AIM/Aerosol.cpp +++ b/Code.v05-00/src/AIM/Aerosol.cpp @@ -1128,8 +1128,10 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { Vector_2D moment(Ny, Vector_1D(Nx, 0.0E+00)); const double FACTOR = 3.0 / double(4.0 * PI); + /* #pragma omp parallel for default(shared) private(iNx, jNy, iBin) \ schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (iBin = 0; iBin < nBin; iBin++) { for (jNy = 0; jNy < Ny; jNy++) @@ -1189,10 +1191,12 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { UInt iNx = 0; UInt jNy = 0; + /* #pragma omp parallel for default(shared) private(iNx, jNy) \ - reduction(+ \ + reduction(+ \ : totalnumber_sum) \ - schedule(dynamic, 1) if (!PARALLEL_CASES) + schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (jNy = 0; jNy < Ny; jNy++) { for (iNx = 0; iNx < Nx; iNx++) @@ -1213,8 +1217,10 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { UInt iNx = 0; UInt iBin = 0; + /* #pragma omp parallel for default(shared) private(iNx, jNy, iBin) \ - schedule(dynamic, 1) if (!PARALLEL_CASES) + schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (iBin = 0; iBin < nBin; iBin++) { for (jNy = 0; jNy < Ny; jNy++) @@ -1312,10 +1318,12 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { UInt iNx = 0; UInt jNy = 0; + /* #pragma omp parallel for default(shared) private(iNx, jNy) \ reduction(+ \ - : totalicemass_sum) \ + : totalicemass_sum) \ schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (jNy = 0; jNy < Ny; jNy++) { for (iNx = 0; iNx < Nx; iNx++) @@ -1335,8 +1343,10 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { Vector_2D TVol = TotalVolume(); const double FACTOR = RHO_ICE * 1.0E+06; + /* #pragma omp parallel for default(shared) private(iNx, jNy) \ - schedule(dynamic, 1) if (!PARALLEL_CASES) + schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (jNy = 0; jNy < Ny; jNy++) { for (iNx = 0; iNx < Nx; iNx++) @@ -1436,8 +1446,10 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { Vector_1D PDF(nBin, 0.0E+00); + /* #pragma omp parallel for default(shared) private(iNx, jNy, iBin) \ - schedule(dynamic, 1) if (!PARALLEL_CASES) + schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (iBin = 0; iBin < nBin; iBin++) { for (jNy = 0; jNy < Ny; jNy++) @@ -1466,8 +1478,10 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { Vector_1D PDF(nBin, 0.0E+00); + /* #pragma omp parallel for default(shared) private(iNx, jNy, iBin) \ - schedule(dynamic, 1) if (!PARALLEL_CASES) + schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (iBin = 0; iBin < nBin; iBin++) { for (jNy = 0; jNy < Ny; jNy++) @@ -1619,10 +1633,12 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { double moment = 0.0E+00; + /* #pragma omp parallel for default(shared) private(iBin) \ - reduction(+ \ + reduction(+ \ : moment) \ schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (iBin = 0; iBin < nBin; iBin++) { moment += (log(bin_Edges[iBin + 1] / bin_Edges[iBin])) * pow(bin_Centers[iBin], n) * PDF[iBin]; @@ -1640,10 +1656,12 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { double moment = 0.0E+00; const double FACTOR = 3.0 / double(4.0 * PI); + /* #pragma omp parallel for default(shared) private(iBin) \ reduction(+ \ : moment) \ schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (iBin = 0; iBin < nBin; iBin++) moment += (log(bin_Edges[iBin + 1] / bin_Edges[iBin])) * pow(FACTOR * bin_VCenters[iBin][jNy][iNx], n / double(3.0)) * pdf[iBin][jNy][iNx]; @@ -1714,8 +1732,10 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { Vector_1D PDF(nBin, 0.0E+00); + /* #pragma omp parallel for default(shared) private(iNx, jNy, iBin) \ schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (iBin = 0; iBin < nBin; iBin++) { for (jNy = 0; jNy < Ny; jNy++) @@ -1758,8 +1778,10 @@ void Aerosol::addAerosolToPDF( const Aerosol &rhs ) { UInt jNy = 0; UInt iBin = 0; + /* #pragma omp parallel for default(shared) private(iNx, jNy, iBin) \ - schedule(dynamic, 1) if (!PARALLEL_CASES) + schedule(dynamic, 1) if (!PARALLEL_CASES) + */ for (jNy = 0; jNy < Ny; jNy++) { for (iNx = 0; iNx < Nx; iNx++) diff --git a/Code.v05-00/src/Core/LAGRIDPlumeModel.cpp b/Code.v05-00/src/Core/LAGRIDPlumeModel.cpp index 895cb6a27..388a2bdf2 100644 --- a/Code.v05-00/src/Core/LAGRIDPlumeModel.cpp +++ b/Code.v05-00/src/Core/LAGRIDPlumeModel.cpp @@ -187,10 +187,10 @@ SimStatus LAGRIDPlumeModel::runFullModel() { // dp/dz = -rho*g = -(n/V)Mg Vector_3D& pdfRef = iceAerosol_.getPDF(); auto pressureEdges = met_.PressEdges(); - double localND; + // double localND; #pragma omp parallel for for (std::size_t j=0; j