Commit d48980f9 authored by Juan Caneses Marin (nfc)'s avatar Juan Caneses Marin (nfc)
Browse files

Created bin directory to store and git ignore binary files. updated the shell... 

Created bin directory to store and git ignore binary files. updated the shell scripts to compile and run code
parent 6c86fdb4

.gitignore

+4 −4
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
**.dat

**.asv



# Ignore all output directories, these are usually called case?

case?/

# Ignore contents of the following directories

/OutputFiles/*

/bin/*



# Ignore executable files

*.exe

MPEX

*.o



# Ignore all .save fils

# Ignore all .save files

**.save

src/make_linFP.f

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
COMPILER = gfortran

OPTFLAGS = -O3

DBGFLAGS = -g

OBJ_1 = Modules.o Main.o PotentialProfile.o

OBJ_1 = Modules.o linFP.o PotentialProfile.o

OBJ_2 = fitpack.o MoveParticlePack.o CoulombCollisions.o



All: $(OBJ_1) $(OBJ_2)
@@ -12,8 +12,8 @@ All: $(OBJ_1) $(OBJ_2) 
Modules.o: Modules.f90

	$(COMPILER) $(OPTFLAGS) -c Modules.f90



Main.o: Main.f90

	$(COMPILER) $(OPTFLAGS) -fopenmp -c Main.f90

linFP.o: linFP.f90

	$(COMPILER) $(OPTFLAGS) -fopenmp -c linFP.f90



PotentialProfile.o: PotentialProfile.f90

	$(COMPILER) $(OPTFLAGS) -c PotentialProfile.f90

src/make_test_spline.f

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
COMPILER=gfortran

DBGFLAGS=-g

OPTFLAGS=-O3

OBJ_1 = Modules.o testSpline.o

OBJ_1 = Modules.o test_spline.o

OBJ_2 = fitpack.o MoveParticlePack.o



All: $(OBJ_1) $(OBJ_2)
@@ -12,8 +12,8 @@ All: $(OBJ_1) $(OBJ_2) 
Modules.o: Modules.f90

	$(COMPILER) $(OPTFLAGS) -c Modules.f90



testSpline.o: testSpline.f90

	$(COMPILER) $(OPTFLAGS) -fopenmp -c testSpline.f90

test_spline.o: test_spline.f90

	$(COMPILER) $(OPTFLAGS) -fopenmp -c test_spline.f90



fitpack.o: fitpack.f

	$(COMPILER) $(OPTFLAGS) -c -w fitpack.f

src/run_linFP.sh

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ export INPUT_FILE 
# Compile source code:

# ===================================================

make -f $REPO_DIR/src/make_linFP.f

mv $REPO_DIR/src/linFP $REPO_DIR/bin/



# Run code:

# ===================================================
@@ -45,7 +46,7 @@ if [ $? -eq 0 ] ; then 
	echo 'Code is running...'

	echo '**********************'

	echo ''

	./linFP

	$REPO_DIR/bin/linFP

	echo ''

	echo 'Calculation complete!'

	echo ''

src/run_test_spline.sh

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ export OMP_PROC_BIND 
# Compile source code:

# ===================================================

make -f $REPO_DIR/src/make_test_spline.f

mv $REPO_DIR/src/test_spline $REPO_DIR/bin/



# Run code:

# ===================================================
@@ -44,7 +45,7 @@ if [ $? -eq 0 ] ; then 
	echo 'Code is running...'

	echo '**********************'

	echo ''

	./test_spline

	$REPO_DIR/bin/test_spline

	echo ''

	echo 'Calculation complete!'

	echo ''