diff --git a/lib/atc/Makefile.g++ b/lib/atc/Makefile.g++ index cfdfb5dd5..66361ebc5 100644 --- a/lib/atc/Makefile.g++ +++ b/lib/atc/Makefile.g++ @@ -1,134 +1,134 @@ SHELL = /bin/sh # which file will be copied to Makefile.lammps -EXTRAMAKE = Makefile.lammps.linalg +EXTRAMAKE = Makefile.lammps.installed # ------ FILES ------ SRC = ATC_HardyKernel.cpp \ ATC_Transfer.cpp \ ATC_TransferHardy.cpp \ ATC_TransferThermal.cpp \ ATC_TransferUtility.cpp \ AtomicRegulator.cpp \ ElasticTimeIntegrator.cpp \ ElectronFlux.cpp \ ElectronHeatCapacity.cpp \ ElectronHeatFlux.cpp \ ElectronPhononExchange.cpp \ ExtrinsicModel.cpp \ ExtrinsicModelTwoTemperature.cpp \ FE_Element.cpp \ FE_Engine.cpp \ FE_Mesh.cpp \ FieldEulerIntegrator.cpp \ ImplicitSolveOperator.cpp \ Kinetostat.cpp \ LammpsInterface.cpp \ Material.cpp \ Matrix.cpp \ OutputManager.cpp \ PhysicsModelThermal.cpp \ PhysicsModelTwoTemperature.cpp \ PrescribedDataManager.cpp \ Solver.cpp \ Thermostat.cpp \ TimeFilter.cpp \ TimeIntegrator.cpp \ Vector.cpp \ XT_Function.cpp INC = Array2D.h \ Array.h \ ATC_Error.h \ ATC_HardyKernel.h \ ATC_Transfer.h \ ATC_TransferHardy.h \ ATC_TransferThermal.h \ ATC_TypeDefs.h \ \ AtomicRegulator.h \ CG.h \ CloneVector.h \ DenseMatrix.h \ DenseVector.h \ DiagonalMatrix.h \ ElasticTimeIntegrator.h \ ElectronFlux.h \ ElectronHeatCapacity.h \ ElectronHeatFlux.h \ ElectronPhononExchange.h \ ExtrinsicModel.h \ ExtrinsicModelTwoTemperature.h \ FE_Element.h \ FE_Engine.h \ FE_Mesh.h \ FieldEulerIntegrator.h \ GMRES.h \ ImplicitSolveOperator.h \ Kinetostat.h \ LammpsInterface.h \ Material.h \ MatrixDef.h \ Matrix.h \ MatrixLibrary.h \ OutputManager.h \ PhysicsModel.h \ PhysicsModelThermal.h \ PhysicsModelTwoTemperature.h \ PrescribedDataManager.h \ Quadrature.h \ Solver.h \ SparseMatrix.h \ SparseMatrix-inl.h \ SparseVector.h \ SparseVector-inl.h \ StringManip.h \ Thermostat.h \ TimeFilter.h \ TimeIntegrator.h \ Utility.h \ Vector.h \ XT_Function.h # ------ DEFINITIONS ------ LIB = libatc.a OBJ = $(SRC:.cpp=.o) # ------ SETTINGS ------ # include any MPI settings needed for the ATC library to build with -# the same MPI library that LAMMPS is built with +# must be the same MPI library that LAMMPS is built with CC = g++ CCFLAGS = -O -g -fPIC -I../../src -DMPICH_IGNORE_CXX_SEEK ARCHIVE = ar ARCHFLAG = -rc DEPFLAGS = -M LINK = g++ LINKFLAGS = -O USRLIB = SYSLIB = # ------ MAKE PROCEDURE ------ lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) - @cp $(EXTRAMAKE) Makefile.lammps + @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ %.o:%.cpp $(CC) $(CCFLAGS) -c $< %.d:%.cpp $(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@ # ------ DEPENDENCIES ------ DEPENDS = $(OBJ:.o=.d) # ------ CLEAN ------ clean: rm *.o *.d *~ $(LIB) diff --git a/lib/atc/Makefile.icc b/lib/atc/Makefile.icc index d959c3d10..0268527fc 100644 --- a/lib/atc/Makefile.icc +++ b/lib/atc/Makefile.icc @@ -1,134 +1,134 @@ SHELL = /bin/sh # which file will be copied to Makefile.lammps EXTRAMAKE = Makefile.lammps.installed # ------ FILES ------ SRC = ATC_HardyKernel.cpp \ ATC_Transfer.cpp \ ATC_TransferHardy.cpp \ ATC_TransferThermal.cpp \ ATC_TransferUtility.cpp \ AtomicRegulator.cpp \ ElasticTimeIntegrator.cpp \ ElectronFlux.cpp \ ElectronHeatCapacity.cpp \ ElectronHeatFlux.cpp \ ElectronPhononExchange.cpp \ ExtrinsicModel.cpp \ ExtrinsicModelTwoTemperature.cpp \ FE_Element.cpp \ FE_Engine.cpp \ FE_Mesh.cpp \ FieldEulerIntegrator.cpp \ ImplicitSolveOperator.cpp \ Kinetostat.cpp \ LammpsInterface.cpp \ Material.cpp \ Matrix.cpp \ OutputManager.cpp \ PhysicsModelThermal.cpp \ PhysicsModelTwoTemperature.cpp \ PrescribedDataManager.cpp \ Solver.cpp \ Thermostat.cpp \ TimeFilter.cpp \ TimeIntegrator.cpp \ Vector.cpp \ XT_Function.cpp INC = Array2D.h \ Array.h \ ATC_Error.h \ ATC_HardyKernel.h \ ATC_Transfer.h \ ATC_TransferHardy.h \ ATC_TransferThermal.h \ ATC_TypeDefs.h \ \ AtomicRegulator.h \ CG.h \ CloneVector.h \ DenseMatrix.h \ DenseVector.h \ DiagonalMatrix.h \ ElasticTimeIntegrator.h \ ElectronFlux.h \ ElectronHeatCapacity.h \ ElectronHeatFlux.h \ ElectronPhononExchange.h \ ExtrinsicModel.h \ ExtrinsicModelTwoTemperature.h \ FE_Element.h \ FE_Engine.h \ FE_Mesh.h \ FieldEulerIntegrator.h \ GMRES.h \ ImplicitSolveOperator.h \ Kinetostat.h \ LammpsInterface.h \ Material.h \ MatrixDef.h \ Matrix.h \ MatrixLibrary.h \ OutputManager.h \ PhysicsModel.h \ PhysicsModelThermal.h \ PhysicsModelTwoTemperature.h \ PrescribedDataManager.h \ Quadrature.h \ Solver.h \ SparseMatrix.h \ SparseMatrix-inl.h \ SparseVector.h \ SparseVector-inl.h \ StringManip.h \ Thermostat.h \ TimeFilter.h \ TimeIntegrator.h \ Utility.h \ Vector.h \ XT_Function.h # ------ DEFINITIONS ------ LIB = libatc.a OBJ = $(SRC:.cpp=.o) # ------ SETTINGS ------ # include any MPI settings needed for the ATC library to build with -# the same MPI library that LAMMPS is built with +# must be the same MPI library that LAMMPS is built with CC = icc CCFLAGS = -O -g -fPIC -I../../src -DMPICH_IGNORE_CXX_SEEK ARCHIVE = ar ARCHFLAG = -rc DEPFLAGS = -M LINK = icc LINKFLAGS = -O USRLIB = SYSLIB = # ------ MAKE PROCEDURE ------ lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ %.o:%.cpp $(CC) $(CCFLAGS) -c $< %.d:%.cpp $(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@ # ------ DEPENDENCIES ------ DEPENDS = $(OBJ:.o=.d) # ------ CLEAN ------ clean: rm *.o *.d *~ $(LIB) diff --git a/lib/atc/Makefile.serial b/lib/atc/Makefile.serial index 977a910cb..cf2a28dfc 100644 --- a/lib/atc/Makefile.serial +++ b/lib/atc/Makefile.serial @@ -1,134 +1,134 @@ SHELL = /bin/sh # which file will be copied to Makefile.lammps EXTRAMAKE = Makefile.lammps.installed # ------ FILES ------ SRC = ATC_HardyKernel.cpp \ ATC_Transfer.cpp \ ATC_TransferHardy.cpp \ ATC_TransferThermal.cpp \ ATC_TransferUtility.cpp \ AtomicRegulator.cpp \ ElasticTimeIntegrator.cpp \ ElectronFlux.cpp \ ElectronHeatCapacity.cpp \ ElectronHeatFlux.cpp \ ElectronPhononExchange.cpp \ ExtrinsicModel.cpp \ ExtrinsicModelTwoTemperature.cpp \ FE_Element.cpp \ FE_Engine.cpp \ FE_Mesh.cpp \ FieldEulerIntegrator.cpp \ ImplicitSolveOperator.cpp \ Kinetostat.cpp \ LammpsInterface.cpp \ Material.cpp \ Matrix.cpp \ OutputManager.cpp \ PhysicsModelThermal.cpp \ PhysicsModelTwoTemperature.cpp \ PrescribedDataManager.cpp \ Solver.cpp \ Thermostat.cpp \ TimeFilter.cpp \ TimeIntegrator.cpp \ Vector.cpp \ XT_Function.cpp INC = Array2D.h \ Array.h \ ATC_Error.h \ ATC_HardyKernel.h \ ATC_Transfer.h \ ATC_TransferHardy.h \ ATC_TransferThermal.h \ ATC_TypeDefs.h \ \ AtomicRegulator.h \ CG.h \ CloneVector.h \ DenseMatrix.h \ DenseVector.h \ DiagonalMatrix.h \ ElasticTimeIntegrator.h \ ElectronFlux.h \ ElectronHeatCapacity.h \ ElectronHeatFlux.h \ ElectronPhononExchange.h \ ExtrinsicModel.h \ ExtrinsicModelTwoTemperature.h \ FE_Element.h \ FE_Engine.h \ FE_Mesh.h \ FieldEulerIntegrator.h \ GMRES.h \ ImplicitSolveOperator.h \ Kinetostat.h \ LammpsInterface.h \ Material.h \ MatrixDef.h \ Matrix.h \ MatrixLibrary.h \ OutputManager.h \ PhysicsModel.h \ PhysicsModelThermal.h \ PhysicsModelTwoTemperature.h \ PrescribedDataManager.h \ Quadrature.h \ Solver.h \ SparseMatrix.h \ SparseMatrix-inl.h \ SparseVector.h \ SparseVector-inl.h \ StringManip.h \ Thermostat.h \ TimeFilter.h \ TimeIntegrator.h \ Utility.h \ Vector.h \ XT_Function.h # ------ DEFINITIONS ------ LIB = libatc.a OBJ = $(SRC:.cpp=.o) # ------ SETTINGS ------ # include any MPI settings needed for the ATC library to build with -# the same MPI library that LAMMPS is built with +# must be the same MPI library that LAMMPS is built with CC = g++ CCFLAGS = -O -g -fPIC -I../../src -I../../src/STUBS ARCHIVE = ar ARCHFLAG = -rc DEPFLAGS = -M LINK = g++ LINKFLAGS = -O USRLIB = SYSLIB = # ------ MAKE PROCEDURE ------ lib: $(OBJ) $(ARCHIVE) $(ARFLAGS) $(LIB) $(OBJ) @cp $(EXTRAMAKE) Makefile.lammps # ------ COMPILE RULES ------ %.o:%.cpp $(CC) $(CCFLAGS) -c $< %.d:%.cpp $(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@ # ------ DEPENDENCIES ------ DEPENDS = $(OBJ:.o=.d) # ------ CLEAN ------ clean: rm *.o *.d *~ $(LIB)