Unverified Commit dc8e1415 authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

Merge pull request #896 from akohlmey/cplusplus-compliance-lib

C++ style header includes and C++ standard conforming code changes in lib folder
parents 9f03a679 8705ea9f
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -2015,8 +2015,8 @@ pecified
      LammpsInterface::instance()->int_allmax(&send_size,&max_size);

      if (comm_rank == 0) {
        int intbuf[max_size];
        double buf[max_size];
        int *intbuf = new int[max_size];
        double *buf = new double[max_size];
        for (int iproc = 1; iproc < nprocs; iproc++) {
          LammpsInterface::instance()->int_recv(intbuf,max_size,iproc);
          LammpsInterface::instance()->recv(buf,max_size,iproc);
@@ -2024,15 +2024,19 @@ pecified
            out << intbuf[i] << "  " << buf[i] << "\n";
          }  
        }
        delete[] intbuf;
        delete[] buf;
      } else {
        int intbuf[send_size];
        double buf[send_size];
        int *intbuf = new int[send_size];
        double *buf = new double[send_size];
        for (int i = 0; i < send_size; i++) {
          intbuf[i] = id2tag[i];
          buf[i] = atomicVolumeMatrix(i,i);
        }
        LammpsInterface::instance()->int_send(intbuf,send_size);
        LammpsInterface::instance()->send(buf,send_size);
        delete[] intbuf;
        delete[] buf;
      }
    }
                
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#include <cstdlib>
#include <iostream>
#include <string>
#include <stdio.h>
#include <cstdio>

// for macros
#include "MatrixDef.h"
+1 −2
Original line number Diff line number Diff line
@@ -2,10 +2,9 @@
#define ARRAY2D_H

#include <cstdlib>
#include <cstdio>
#include <string>
#include <iostream>
#include <cstdlib>
#include <stdio.h>

#include "Array.h"

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@

#include <iostream>
#include <vector>
#include <math.h>
#include <cmath>

using ATC_Utility::command_line;
using ATC_Utility::str2dbl;
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
#include "Utility.h"

// Other headers
#include "math.h"
#include <cmath>

using ATC_Utility::dbl_geq;
using ATC_Utility::det3;
Loading