use new utils::sfread() utility function in several classes (cad62930) · Commits · 郑智淋 / lammps

src/angle_hybrid.cpp

+4 −3

Changes for src/angle_hybrid.cpp: 4 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include "force.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;

		@@ -334,7 +335,7 @@ void AngleHybrid::write_restart(FILE *fp)
		void AngleHybrid::read_restart(FILE *fp)
		{
		int me = comm->me;
		if (me == 0) fread(&nstyles,sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&nstyles,sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&nstyles,1,MPI_INT,0,world);
		styles = new Angle*[nstyles];
		keywords = new char*[nstyles];
		@@ -343,10 +344,10 @@ void AngleHybrid::read_restart(FILE *fp)

		int n,dummy;
		for (int m = 0; m < nstyles; m++) {
		if (me == 0) fread(&n,sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&n,sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&n,1,MPI_INT,0,world);
		keywords[m] = new char[n];
		if (me == 0) fread(keywords[m],sizeof(char),n,fp);
		if (me == 0) utils::sfread(FLERR,keywords[m],sizeof(char),n,fp,NULL,error);
		MPI_Bcast(keywords[m],n,MPI_CHAR,0,world);
		styles[m] = force->new_angle(keywords[m],0,dummy);
		styles[m]->read_restart_settings(fp);

+2 −1

Changes for src/angle_zero.cpp: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include "math_const.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;
		using namespace MathConst;
		@@ -128,7 +129,7 @@ void AngleZero::read_restart(FILE *fp)
		allocate();

		if (comm->me == 0) {
		fread(&theta0[1],sizeof(double),atom->nangletypes,fp);
		utils::sfread(FLERR,&theta0[1],sizeof(double),atom->nangletypes,fp,NULL,error);
		}
		MPI_Bcast(&theta0[1],atom->nangletypes,MPI_DOUBLE,0,world);

+4 −3

Changes for src/bond_hybrid.cpp: 4 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include "force.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;

		@@ -335,7 +336,7 @@ void BondHybrid::write_restart(FILE *fp)
		void BondHybrid::read_restart(FILE *fp)
		{
		int me = comm->me;
		if (me == 0) fread(&nstyles,sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&nstyles,sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&nstyles,1,MPI_INT,0,world);
		styles = new Bond*[nstyles];
		keywords = new char*[nstyles];
		@@ -344,10 +345,10 @@ void BondHybrid::read_restart(FILE *fp)

		int n,dummy;
		for (int m = 0; m < nstyles; m++) {
		if (me == 0) fread(&n,sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&n,sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&n,1,MPI_INT,0,world);
		keywords[m] = new char[n];
		if (me == 0) fread(keywords[m],sizeof(char),n,fp);
		if (me == 0) utils::sfread(FLERR,keywords[m],sizeof(char),n,fp,NULL,error);
		MPI_Bcast(keywords[m],n,MPI_CHAR,0,world);
		styles[m] = force->new_bond(keywords[m],0,dummy);
		styles[m]->read_restart_settings(fp);

+2 −1

Changes for src/bond_zero.cpp: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include "comm.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;

		@@ -126,7 +127,7 @@ void BondZero::read_restart(FILE *fp)
		allocate();

		if (comm->me == 0) {
		fread(&r0[1],sizeof(double),atom->nbondtypes,fp);
		utils::sfread(FLERR,&r0[1],sizeof(double),atom->nbondtypes,fp,NULL,error);
		}
		MPI_Bcast(&r0[1],atom->nbondtypes,MPI_DOUBLE,0,world);

+5 −3

Changes for src/dihedral_hybrid.cpp: 5 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,9 +21,11 @@
		#include "force.h"
		#include "memory.h"
		#include "error.h"
		#include "utils.h"

		using namespace LAMMPS_NS;


		#define EXTRA 1000

		/* ---------------------------------------------------------------------- */
		@@ -319,7 +321,7 @@ void DihedralHybrid::write_restart(FILE *fp)
		void DihedralHybrid::read_restart(FILE *fp)
		{
		int me = comm->me;
		if (me == 0) fread(&nstyles,sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&nstyles,sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&nstyles,1,MPI_INT,0,world);
		styles = new Dihedral*[nstyles];
		keywords = new char*[nstyles];
		@@ -328,10 +330,10 @@ void DihedralHybrid::read_restart(FILE *fp)

		int n,dummy;
		for (int m = 0; m < nstyles; m++) {
		if (me == 0) fread(&n,sizeof(int),1,fp);
		if (me == 0) utils::sfread(FLERR,&n,sizeof(int),1,fp,NULL,error);
		MPI_Bcast(&n,1,MPI_INT,0,world);
		keywords[m] = new char[n];
		if (me == 0) fread(keywords[m],sizeof(char),n,fp);
		if (me == 0) utils::sfread(FLERR,keywords[m],sizeof(char),n,fp,NULL,error);
		MPI_Bcast(keywords[m],n,MPI_CHAR,0,world);
		styles[m] = force->new_dihedral(keywords[m],0,dummy);
		styles[m]->read_restart_settings(fp);