diff --git a/common/ModBasicMath.F90 b/common/ModBasicMath.F90 index 1c187e4..3d4c209 100644 --- a/common/ModBasicMath.F90 +++ b/common/ModBasicMath.F90 @@ -191,7 +191,6 @@ subroutine QuadFit_1D(x, f, a0, a1, a2) lhs = 0. rhs = 0. do i = 1, size(x) - print *, "i = ", i xi = x(i) xi2 = xi*xi xi3 = xi*xi2 @@ -206,13 +205,7 @@ subroutine QuadFit_1D(x, f, a0, a1, a2) lhs(3, 3) = lhs(3, 3) + xi4 - print *, "lhs" - do j = 1, 3 - print *, lhs(j, :) - end do - rhs = rhs + (/1._WP, xi, xi2/)*f(i) - print *, "rhs = ", rhs end do ! i lhs(2, 1) = lhs(1, 2) diff --git a/examples/carotid_web/init.sbatch b/examples/carotid_web/init.sbatch deleted file mode 100644 index 9daf158..0000000 --- a/examples/carotid_web/init.sbatch +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -#Do the following before running -#change initcond.F90 layers variable -#change the #cpus and #cores here -#change log file name to reflect proc and layer count -#change num processes in srun to reflect the total execution threads - -#run this in the case directory of RBC3D - -#SBATCH --account=gts-sbryngelson3 -#SBATCH -N8 --ntasks-per-node=24 -#SBATCH --mem-per-cpu=4GB -#SBATCH -t8:00:00 -#SBATCH -q embers -#SBATCH --mail-user=smanasreh6@gatech.edu -#SBATCH --mail-type=BEGIN,END,FAIL -#SBATCH -o "./run_logs/carotidweb.log" - -cd $SLURM_SUBMIT_DIR - -cd D -rm * -cd ../ - -ml gcc mvapich2 netcdf-c netcdf-cxx netcdf-fortran fftw - -cd ../../common -make clean -make .depend -make - -cd ../examples/carotid_web -make clean -make .depend -make -srun ./initcond #for continue run, comment this out - -sbatch run.sbatch \ No newline at end of file diff --git a/examples/carotid_web/initcond.F90 b/examples/carotid_web/initcond.F90 index f431daa..040dd7f 100644 --- a/examples/carotid_web/initcond.F90 +++ b/examples/carotid_web/initcond.F90 @@ -12,7 +12,7 @@ program randomized_cell_gen integer, parameter :: ranseed = 112 !initial condition setup parameters - real(WP), parameter :: hematocrit = 0.16 + real(WP), parameter :: hematocrit = 0.2 real(WP) :: tuber = 4 real(WP), parameter :: tubelen = 30 @@ -34,14 +34,10 @@ program randomized_cell_gen nodeNum = nodeNum + 1 !calculate number of cells for the defined hematocrit, assuming all blood cells are healthy RBCs for volume - !hematocrit = 4 * nrbc / (tube_radius^2 * tube_length) - print *, "hematocrit", hematocrit + !hematocrit = 4 * nrbc / (3 * tube_radius^2 * tube_length) nrbcMax = ((3*(tubelen*tuber**2*hematocrit))/4) - ! nrbcMax = 500 - if (rootWorld) then - write (*, *) "Num RBCs in simulation is ", nrbcMax - end if + if (rootWorld) write (*, *) "Num RBCs in simulation is ", nrbcMax !set other initialization params vBkg(1:2) = 0.; vBkg(3) = 8. diff --git a/examples/carotid_web/run.sbatch b/examples/carotid_web/run.sbatch deleted file mode 100644 index 7d36e5a..0000000 --- a/examples/carotid_web/run.sbatch +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -#run this in the case directory of RBC3D - -#SBATCH --account=gts-sbryngelson3 -#SBATCH -N8 --ntasks-per-node=24 -#SBATCH --mem-per-cpu=4GB -#SBATCH -t8:00:00 -#SBATCH -q embers -#SBATCH --mail-user=smanasreh6@gatech.edu -#SBATCH --mail-type=BEGIN,END,FAIL -#SBATCH -o "./run_logs/carotidweb4.log" - -cd $SLURM_SUBMIT_DIR - -ml gcc mvapich2 netcdf-c netcdf-cxx netcdf-fortran fftw - -# rm -r D/* - -cd ../../common -make clean -make - -make clean -make .depend -make - -cd ../examples/carotid_web -# srun ./initcond -srun ./tube -# timeout 7h srun ./tube -# EX_CODE=$? - -# echo "SLURM_JOB_EXIT_CODE" -# echo $SLURM_JOB_EXIT_CODE - -# move files to scratch, except for log file and restart.LATEST -# cp -r D ~/../../../../scratch1/4/smanasreh6/carotid_web2 -# cd D -# rm restart0* x* -# cd ../ - -# sbatch run.sbatch - -# if [[ ${EX_CODE} == 124 ]]; then -# sbatch run.sbatch -# # scontrol requeue $SLURM_JOB_ID -# fi \ No newline at end of file diff --git a/examples/randomized_case/initcond.F90 b/examples/randomized_case/initcond.F90 index 6c839ec..aeb669b 100644 --- a/examples/randomized_case/initcond.F90 +++ b/examples/randomized_case/initcond.F90 @@ -34,7 +34,7 @@ program randomized_cell_gen nodeNum = nodeNum + 1 !calculate number of cells for the defined hematocrit, assuming all blood cells are healthy RBCs for volume - !hematocrit = 4 * nrbc / (tube_radius^2 * tube_length) + !hematocrit = 4 * nrbc / (3 * tube_radius^2 * tube_length) nrbcMax = ((3*(tubelen*tuber**2*hematocrit))/4) if (rootWorld) write (*, *) "Num RBCs in simulation is ", nrbcMax diff --git a/format.sh b/format.sh deleted file mode 100644 index d954e50..0000000 --- a/format.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -echo "formatting example cases and common directory in" - -echo "$PWD" -pip3 install --upgrade fprettify -fprettify ./examples -r --indent 2 -fprettify ./common -r --indent 2 - -echo "done" \ No newline at end of file