Commit 6c86fdb4 authored by Caneses Marin, Juan Francisco's avatar Caneses Marin, Juan Francisco
Browse files

Changed naming of files and codes. Also started to add a program to test splines called test_spline

parent c3cc1bc6

src/Main.f90→src/linFP.f90

+2 −4
Original line number Diff line number Diff line 
PROGRAM LinearFokkerPlanckSolver_1D2V

PROGRAM linFP

! ==============================================================================

! PURPOSE:

! Created by JF Caneses Marin on 2019-09-05
@@ -24,7 +24,7 @@ TYPE(splTYP) :: spline_ddBz 
TYPE(splTYP) :: spline_Phi

TYPE(spltestTYP) :: spline_Test

! DO loop indices:

INTEGER(i4) :: i,j,k,tt

INTEGER(i4) :: i,j,k

! Pseudo random number seed:

INTEGER(i4) :: seed_size

INTEGER(i4), DIMENSION(:), ALLOCATABLE :: seed
@@ -34,8 +34,6 @@ INTEGER(i4) :: jsize 
INTEGER(i4), DIMENSION(:), ALLOCATABLE :: jrng

! Thread ID:

INTEGER(i4) :: id

! CPU time at start and end of computation:

REAL(r8) :: tstart, tend

! OPENMP computational time:

DOUBLE PRECISION :: ostart, oend, oend_estimate

! Cyclotron resonance number change:

src/Makefile_openMP.f→src/make_linFP.f

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ OBJ_1 = Modules.o Main.o PotentialProfile.o 
OBJ_2 = fitpack.o MoveParticlePack.o CoulombCollisions.o



All: $(OBJ_1) $(OBJ_2)

	gfortran  $(OPTFLAGS) -fopenmp $(OBJ_1) $(OBJ_2) -o MPEX

	gfortran  $(OPTFLAGS) -fopenmp $(OBJ_1) $(OBJ_2) -o linFP

	rm *.o *.mod



Modules.o: Modules.f90
@@ -28,4 +28,4 @@ CoulombCollisions.o: CoulombCollisions.f90 
	$(COMPILER) $(OPTFLAGS) -fopenmp -c CoulombCollisions.f90



clean:

	rm *.o *.mod MPEX *.dat
 
	rm *.o *.mod linFP *.dat

src/make_test_spline.f

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#

COMPILER=gfortran

DBGFLAGS=-g

OPTFLAGS=-O3

OBJ_1 = Modules.o testSpline.o

OBJ_2 = fitpack.o MoveParticlePack.o



All: $(OBJ_1) $(OBJ_2)

	$(COMPILER) $(OPTFLAGS) -fopenmp $(OBJ_1) $(OBJ_2) -o test_spline

	rm *.o *.mod



Modules.o: Modules.f90

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



testSpline.o: testSpline.f90

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



fitpack.o: fitpack.f

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



MoveParticlePack.o: MoveParticlePack.f90

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



clean:

	rm *.o *.mod test_spline *.dat

src/runProg.sh→src/run_linFP.sh

100755 → 100644
+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ export INPUT_FILE 


# Compile source code:

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

make -f $REPO_DIR/src/Makefile_openMP.f

make -f $REPO_DIR/src/make_linFP.f



# Run code:

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

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

	echo ''

	./MPEX

	./linFP

	echo ''

	echo 'Calculation complete!'

	echo ''

src/run_test_spline.sh

0 → 100644
+55 −0
Original line number Diff line number Diff line 
#!/bin/bash



# Select input file:

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

INPUT_FILE="Bfield_b.txt"

NZ_STR=501



# Set number of threads:

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

OMP_NUM_THREADS=4



# Set processor binding for openMP:

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

OMP_PROC_BIND=true



# Get repo directory:

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

REPO_DIR=$(echo $PWD | sed "s|/src||g")



# Get input file directory:

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

INPUT_FILE_DIR=$REPO_DIR/BfieldData/$INPUT_FILE



# Make environment variables available to shell:

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

export REPO_DIR

export INPUT_FILE_DIR

export INPUT_FILE

export NZ_STR

export OMP_NUM_THREADS

export OMP_PROC_BIND



# Compile source code:

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

make -f $REPO_DIR/src/make_test_spline.f



# Run code:

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

if [ $? -eq 0 ] ; then

	echo ''

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

	echo 'Succesful compilation!'

	echo ''

	echo 'Code is running...'

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

	echo ''

	./test_spline

	echo ''

	echo 'Calculation complete!'

	echo ''

else

	echo ''

	echo 'Compilation error'

	echo ''

fi