Commit 0bedebc0 authored by Michael Lamparski's avatar Michael Lamparski
Browse files

migrate omp constructs to new macros 

These changes were automatically generated using the script
posted in https://github.com/lammps/lammps/pull/1651#issuecomment-525814475
parent 9a1b4a8e

src/MPIIO/dump_atom_mpiio.cpp

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
   Contributing author: Paul Coffman (IBM)

------------------------------------------------------------------------- */



#include "omp_compat.h"

#include "dump_atom_mpiio.h"

#include <cmath>

#include <cstdlib>
@@ -587,7 +588,7 @@ int DumpAtomMPIIO::convert_image_omp(int n, double *mybuf) 
    mpifh_buffer_line_per_thread[i] = (char *) malloc(DUMP_BUF_CHUNK_SIZE * sizeof(char));

    mpifh_buffer_line_per_thread[i][0] = '\0';



#pragma omp parallel default(none) shared(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

#pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

    {

      int tid = omp_get_thread_num();

      int m=0;
@@ -677,7 +678,7 @@ int DumpAtomMPIIO::convert_noimage_omp(int n, double *mybuf) 
    mpifh_buffer_line_per_thread[i] = (char *) malloc(DUMP_BUF_CHUNK_SIZE * sizeof(char));

    mpifh_buffer_line_per_thread[i][0] = '\0';



#pragma omp parallel default(none) shared(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

#pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

    {

      int tid = omp_get_thread_num();

      int m=0;

src/MPIIO/dump_cfg_mpiio.cpp

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
   Contributing author: Paul Coffman (IBM)

------------------------------------------------------------------------- */



#include "omp_compat.h"

#include "dump_cfg_mpiio.h"

#include <cmath>

#include <cstdlib>
@@ -365,7 +366,7 @@ int DumpCFGMPIIO::convert_string_omp(int n, double *mybuf) 
    mpifh_buffer_line_per_thread[i] = (char *) malloc(DUMP_BUF_CHUNK_SIZE * sizeof(char));

    mpifh_buffer_line_per_thread[i][0] = '\0';



#pragma omp parallel default(none) shared(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

#pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

    {

      int tid = omp_get_thread_num();

      int m=0;

src/MPIIO/dump_custom_mpiio.cpp

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
   Contributing author: Paul Coffman (IBM)

------------------------------------------------------------------------- */



#include "omp_compat.h"

#include "dump_custom_mpiio.h"

#include <cmath>

#include <cstdlib>
@@ -612,7 +613,7 @@ int DumpCustomMPIIO::convert_string_omp(int n, double *mybuf) 
    mpifh_buffer_line_per_thread[i] = (char *) malloc(DUMP_BUF_CHUNK_SIZE * sizeof(char));

    mpifh_buffer_line_per_thread[i][0] = '\0';



#pragma omp parallel default(none) shared(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

#pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

    {

      int tid = omp_get_thread_num();

      int m=0;

src/MPIIO/dump_xyz_mpiio.cpp

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
   Contributing author: Paul Coffman (IBM)

------------------------------------------------------------------------- */



#include "omp_compat.h"

#include "dump_xyz_mpiio.h"

#include <cmath>

#include <cstdlib>
@@ -350,7 +351,7 @@ int DumpXYZMPIIO::convert_string_omp(int n, double *mybuf) 
    mpifh_buffer_line_per_thread[i] = (char *) malloc(DUMP_BUF_CHUNK_SIZE * sizeof(char));

    mpifh_buffer_line_per_thread[i][0] = '\0';



#pragma omp parallel default(none) shared(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

#pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(bufOffset, bufRange, bufLength, mpifhStringCountPerThread, mpifh_buffer_line_per_thread, mybuf)

    {

      int tid = omp_get_thread_num();

      int m=0;

src/USER-DIFFRACTION/compute_saed.cpp

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
   Contributing authors: Shawn Coleman & Douglas Spearot (Arkansas)

------------------------------------------------------------------------- */



#include "omp_compat.h"

#include "compute_saed.h"

#include <mpi.h>

#include <cmath>
@@ -418,7 +419,7 @@ void ComputeSAED::compute_vector() 
  double frac = 0.1;



#if defined(_OPENMP)

#pragma omp parallel default(none) shared(offset,ASFSAED,typelocal,xlocal,Fvec,m,frac)

#pragma omp parallel LMP_DEFAULT_NONE LMP_SHARED(offset,ASFSAED,typelocal,xlocal,Fvec,m,frac)

#endif

  {

    double *f = new double[ntypes];    // atomic structure factor by type

CRA Git | Maintained and supported by SUSTech CRA and CCSE