mass replace calls to fread() with utils::sfread() (73892711) · Commits · 郑智淋 / lammps

src/MANYBODY/pair_atm.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include "neigh_list.h"
		#include "neigh_request.h"
		#include "neighbor.h"
		#include "utils.h"

		using namespace LAMMPS_NS;

		@@ -310,10 +311,10 @@ void PairATM::read_restart(FILE *fp)
		int me = comm->me;
		for (i = 1; i <= atom->ntypes; i++) {
		for (j = i; j <= atom->ntypes; j++) {
		if (me == 0) fread(&setflag[i][j],sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&setflag[i][j],sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&setflag[i][j],1,MPI_INT,0,world);
		if (setflag[i][j]) for (k = j; k <= atom->ntypes; k++) {
		if (me == 0) fread(&nu[i][j][k],sizeof(double),1,fp);
		if (me == 0) utils::sfread(FLERR,&nu[i][j][k],sizeof(double),1,fp,NULL,error);
		MPI_Bcast(&nu[i][j][k],1,MPI_DOUBLE,0,world);
		}
		}
		@@ -338,8 +339,8 @@ void PairATM::read_restart_settings(FILE *fp)
		{
		int me = comm->me;
		if (me == 0) {
		fread(&cut_global,sizeof(double),1,fp);
		fread(&cut_triple,sizeof(double),1,fp);
		utils::sfread(FLERR,&cut_global,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut_triple,sizeof(double),1,fp,NULL,error);
		}
		MPI_Bcast(&cut_global,1,MPI_DOUBLE,0,world);
		MPI_Bcast(&cut_triple,1,MPI_DOUBLE,0,world);

src/MC/pair_dsmc.cpp

+9 −8

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include "domain.h"
		#include "update.h"
		#include "random_mars.h"
		#include "utils.h"

		using namespace LAMMPS_NS;

		@@ -345,12 +346,12 @@ void PairDSMC::read_restart(FILE *fp)
		int me = comm->me;
		for (i = 1; i <= atom->ntypes; i++)
		for (j = i; j <= atom->ntypes; j++) {
		if (me == 0) fread(&setflag[i][j],sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&setflag[i][j],sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&setflag[i][j],1,MPI_INT,0,world);
		if (setflag[i][j]) {
		if (me == 0) {
		fread(&sigma[i][j],sizeof(double),1,fp);
		fread(&cut[i][j],sizeof(double),1,fp);
		utils::sfread(FLERR,&sigma[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut[i][j],sizeof(double),1,fp,NULL,error);
		}
		MPI_Bcast(&sigma[i][j],1,MPI_DOUBLE,0,world);
		MPI_Bcast(&cut[i][j],1,MPI_DOUBLE,0,world);
		@@ -378,11 +379,11 @@ void PairDSMC::write_restart_settings(FILE *fp)
		void PairDSMC::read_restart_settings(FILE *fp)
		{
		if (comm->me == 0) {
		fread(&cut_global,sizeof(double),1,fp);
		fread(&max_cell_size,sizeof(double),1,fp);
		fread(&seed,sizeof(int),1,fp);
		fread(&offset_flag,sizeof(int),1,fp);
		fread(&mix_flag,sizeof(int),1,fp);
		utils::sfread(FLERR,&cut_global,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&max_cell_size,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&seed,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&offset_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&mix_flag,sizeof(int),1,fp,NULL,error);
		}

		MPI_Bcast(&cut_global,1,MPI_DOUBLE,0,world);

src/MISC/pair_nm_cut.cpp

+11 −10

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include "math_const.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;
		using namespace MathConst;
		@@ -318,15 +319,15 @@ void PairNMCut::read_restart(FILE *fp)
		int me = comm->me;
		for (i = 1; i <= atom->ntypes; i++)
		for (j = i; j <= atom->ntypes; j++) {
		if (me == 0) fread(&setflag[i][j],sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&setflag[i][j],sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&setflag[i][j],1,MPI_INT,0,world);
		if (setflag[i][j]) {
		if (me == 0) {
		fread(&e0[i][j],sizeof(double),1,fp);
		fread(&r0[i][j],sizeof(double),1,fp);
		fread(&nn[i][j],sizeof(double),1,fp);
		fread(&mm[i][j],sizeof(double),1,fp);
		fread(&cut[i][j],sizeof(double),1,fp);
		utils::sfread(FLERR,&e0[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&r0[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&nn[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&mm[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut[i][j],sizeof(double),1,fp,NULL,error);
		}
		MPI_Bcast(&e0[i][j],1,MPI_DOUBLE,0,world);
		MPI_Bcast(&r0[i][j],1,MPI_DOUBLE,0,world);
		@@ -356,10 +357,10 @@ void PairNMCut::write_restart_settings(FILE *fp)
		void PairNMCut::read_restart_settings(FILE *fp)
		{
		if (comm->me == 0) {
		fread(&cut_global,sizeof(double),1,fp);
		fread(&offset_flag,sizeof(int),1,fp);
		fread(&mix_flag,sizeof(int),1,fp);
		fread(&tail_flag,sizeof(int),1,fp);
		utils::sfread(FLERR,&cut_global,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&offset_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&mix_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&tail_flag,sizeof(int),1,fp,NULL,error);
		}
		MPI_Bcast(&cut_global,1,MPI_DOUBLE,0,world);
		MPI_Bcast(&offset_flag,1,MPI_INT,0,world);

src/MISC/pair_nm_cut_coul_cut.cpp

+13 −12

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include "math_const.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;
		using namespace MathConst;
		@@ -369,16 +370,16 @@ void PairNMCutCoulCut::read_restart(FILE *fp)
		int me = comm->me;
		for (i = 1; i <= atom->ntypes; i++)
		for (j = i; j <= atom->ntypes; j++) {
		if (me == 0) fread(&setflag[i][j],sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&setflag[i][j],sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&setflag[i][j],1,MPI_INT,0,world);
		if (setflag[i][j]) {
		if (me == 0) {
		fread(&e0[i][j],sizeof(double),1,fp);
		fread(&r0[i][j],sizeof(double),1,fp);
		fread(&nn[i][j],sizeof(double),1,fp);
		fread(&mm[i][j],sizeof(double),1,fp);
		fread(&cut_lj[i][j],sizeof(double),1,fp);
		fread(&cut_coul[i][j],sizeof(double),1,fp);
		utils::sfread(FLERR,&e0[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&r0[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&nn[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&mm[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut_lj[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut_coul[i][j],sizeof(double),1,fp,NULL,error);
		}
		MPI_Bcast(&e0[i][j],1,MPI_DOUBLE,0,world);
		MPI_Bcast(&r0[i][j],1,MPI_DOUBLE,0,world);
		@@ -410,11 +411,11 @@ void PairNMCutCoulCut::write_restart_settings(FILE *fp)
		void PairNMCutCoulCut::read_restart_settings(FILE *fp)
		{
		if (comm->me == 0) {
		fread(&cut_lj_global,sizeof(double),1,fp);
		fread(&cut_coul_global,sizeof(double),1,fp);
		fread(&offset_flag,sizeof(int),1,fp);
		fread(&mix_flag,sizeof(int),1,fp);
		fread(&tail_flag,sizeof(int),1,fp);
		utils::sfread(FLERR,&cut_lj_global,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut_coul_global,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&offset_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&mix_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&tail_flag,sizeof(int),1,fp,NULL,error);
		}
		MPI_Bcast(&cut_lj_global,1,MPI_DOUBLE,0,world);
		MPI_Bcast(&cut_coul_global,1,MPI_DOUBLE,0,world);

src/MISC/pair_nm_cut_coul_long.cpp

+14 −13

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include "math_const.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;
		using namespace MathConst;
		@@ -413,15 +414,15 @@ void PairNMCutCoulLong::read_restart(FILE *fp)
		int me = comm->me;
		for (i = 1; i <= atom->ntypes; i++)
		for (j = i; j <= atom->ntypes; j++) {
		if (me == 0) fread(&setflag[i][j],sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&setflag[i][j],sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&setflag[i][j],1,MPI_INT,0,world);
		if (setflag[i][j]) {
		if (me == 0) {
		fread(&e0[i][j],sizeof(double),1,fp);
		fread(&r0[i][j],sizeof(double),1,fp);
		fread(&nn[i][j],sizeof(double),1,fp);
		fread(&mm[i][j],sizeof(double),1,fp);
		fread(&cut_lj[i][j],sizeof(double),1,fp);
		utils::sfread(FLERR,&e0[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&r0[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&nn[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&mm[i][j],sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut_lj[i][j],sizeof(double),1,fp,NULL,error);
		}
		MPI_Bcast(&e0[i][j],1,MPI_DOUBLE,0,world);
		MPI_Bcast(&r0[i][j],1,MPI_DOUBLE,0,world);
		@@ -454,13 +455,13 @@ void PairNMCutCoulLong::write_restart_settings(FILE *fp)
		void PairNMCutCoulLong::read_restart_settings(FILE *fp)
		{
		if (comm->me == 0) {
		fread(&cut_lj_global,sizeof(double),1,fp);
		fread(&cut_coul,sizeof(double),1,fp);
		fread(&offset_flag,sizeof(int),1,fp);
		fread(&mix_flag,sizeof(int),1,fp);
		fread(&tail_flag,sizeof(int),1,fp);
		fread(&ncoultablebits,sizeof(int),1,fp);
		fread(&tabinner,sizeof(double),1,fp);
		utils::sfread(FLERR,&cut_lj_global,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&cut_coul,sizeof(double),1,fp,NULL,error);
		utils::sfread(FLERR,&offset_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&mix_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&tail_flag,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&ncoultablebits,sizeof(int),1,fp,NULL,error);
		utils::sfread(FLERR,&tabinner,sizeof(double),1,fp,NULL,error);
		}
		MPI_Bcast(&cut_lj_global,1,MPI_DOUBLE,0,world);
		MPI_Bcast(&cut_coul,1,MPI_DOUBLE,0,world);

Admin message