Skip to content

Sa #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 101 commits into
base: master
Choose a base branch
from
Open

Sa #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
22a3799
Added cyanobacteria and sucrose-dependent e. coli species
Jsakkos May 30, 2020
9de6f41
Add sucrose export rate variable suc_exp
Jsakkos May 31, 2020
a77885d
Fixed suc_exp error
Jsakkos Jun 1, 2020
217664c
Added Allclean.sh
Jsakkos Jun 9, 2020
ba11cb2
Sucrose export test
Jsakkos Jun 14, 2020
4c5837e
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Jun 15, 2020
c6f3a23
Added axenic examples
Jsakkos Jun 25, 2020
5073090
enable-vtk varient builds but crashes
PDoakORNL Jun 26, 2020
e2d0783
Updated monod kinetics to include CO2 dissolution and included parame…
Jsakkos Jul 2, 2020
57997bf
Updated .gitignore
Jsakkos Jul 2, 2020
ec04ea6
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Jul 2, 2020
38e412f
Merge branch 'add_phototroph' into phototroph_cades_build
PDoakORNL Jul 3, 2020
41c7f16
Included variable loop for sucrose and well sizes
Jsakkos Jul 6, 2020
7c836de
Added Python script for growth curve generation
Jsakkos Jul 6, 2020
f2e601b
readme about CADES build
PDoakORNL Jul 13, 2020
a67f16f
sample slurm script file for cades
PDoakORNL Jul 13, 2020
c3b04f2
Merge pull request #1 from PDoakORNL/phototroph_cades_build
Jsakkos Jul 16, 2020
5ff144d
Update CADES_README.md
Jsakkos Jul 16, 2020
f46ea79
Update CADES_README.md
Jsakkos Jul 16, 2020
f057839
Added slurm script for validation
Jsakkos Jul 17, 2020
983a406
Fixed script name
Jsakkos Jul 17, 2020
3146f87
Update CADES_README.md
PDoakORNL Jul 17, 2020
793dd27
Merge pull request #2 from PDoakORNL/patch-1
Jsakkos Jul 17, 2020
b38cb8e
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
2a63988
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
92aa985
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
82cc1e3
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
eb1e189
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
9ae0eac
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
33d3978
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
116b3a1
Update lammps_validation_job.slurm
Jsakkos Jul 17, 2020
950d842
Create mpi_test.slurm
Jsakkos Jul 21, 2020
34dd866
Added Python script to generate atom definition files
Jsakkos Jul 28, 2020
d629c6a
Merge branch 'add_phototroph' of https://github.com/Jsakkos/NUFEB int…
Jsakkos Jul 28, 2020
6aa8fb9
Added diffusion test
Jsakkos Jul 29, 2020
222607f
Updated atom generation script
Jsakkos Jul 31, 2020
ff9750a
Added python call to generate atom files
Jsakkos Jul 31, 2020
134c583
Corrected python call
Jsakkos Jul 31, 2020
2bd81d5
Reduced mem
Jsakkos Jul 31, 2020
a468621
Fixed script name
Jsakkos Jul 31, 2020
03219b5
Updated validation script
Jsakkos Aug 14, 2020
d606a59
Updated nufebatom
Jsakkos Aug 14, 2020
5f03cae
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Aug 15, 2020
7c03eb5
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Aug 18, 2020
6855458
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Sep 1, 2020
34fdeb1
Updated atom definition script bc syntax
Jsakkos Sep 4, 2020
95335aa
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Sep 10, 2020
8f85329
Updated diffusion calculation to mirror master
Jsakkos Sep 11, 2020
2d71eee
Updated K_s
Jsakkos Sep 15, 2020
5412cb2
Updated monod kinetics
Sep 15, 2020
0f611d8
Updated sucrose export rate
Jsakkos Sep 17, 2020
802326d
Updated Monod
Jsakkos Sep 18, 2020
04a65fa
Updated sucrose secretion to match experimental data
Jsakkos Sep 29, 2020
2ac5086
Updated co-culture atom definition file generation script
Sep 30, 2020
c414072
Updated NUFEBatom.py
Sep 30, 2020
5edf965
Fixed co-culture atom definition script
Jsakkos Oct 1, 2020
f9342a4
Updated NUFEBatom to generate slurm files for each set of runs
Oct 1, 2020
c419d91
Update CADES_README.md
Jsakkos Oct 1, 2020
7b71209
Fixed error in NUFEBatom
Oct 1, 2020
e104f16
Merge branch 'add_phototroph' of https://github.com/Jsakkos/NUFEB int…
Oct 1, 2020
e8d3509
Merge branch 'add_phototroph' of https://github.com/Jsakkos/NUFEB int…
Oct 1, 2020
c73292f
Updated SLURM template to email on failure only
Oct 2, 2020
97551b7
Fixed mismatch between atom and grid dump frequency
Oct 2, 2020
d986b2b
Added tarball generation to each loop
Oct 5, 2020
a5e3f0d
Fix O2 mass balance and added tarball generation after run
Oct 6, 2020
14c5faf
Updated tarball generation
Jsakkos Oct 7, 2020
eb978a8
Updated growth parameter coefficients
Jsakkos Oct 14, 2020
2e35992
Fixed diffusion grid specification
Jsakkos Oct 14, 2020
10e2e2d
Updated replicate generation and added HDF5 support
Oct 16, 2020
d26c503
Merge branch 'add_phototroph' of https://github.com/Jsakkos/NUFEB int…
Oct 16, 2020
cc74243
Fixed diffusion grid error
Jsakkos Oct 19, 2020
b293c7c
Update CADES_README.md
Jsakkos Oct 19, 2020
e85c98e
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Oct 29, 2020
801739e
Merge pull request #3 from nufeb/master
Jsakkos Nov 2, 2020
b626ff2
Merge remote-tracking branch 'origin/master' into add_phototroph
Nov 2, 2020
21d1404
Changes made to NUFEBatom.py to do saltelli sampling for cyano case
Nov 12, 2020
953c1b2
Changed Inputscript-template.txt to enable saltelli sampling
Nov 12, 2020
6186f80
Changed slurm-template.txt to enable saltelli sampling
Nov 12, 2020
50634fc
Changed NUFEBatom.py to enable saltelli sampling; this version is tes…
Nov 12, 2020
71d7b55
deleted jump SELF from Inputscript-template.txt
Nov 12, 2020
296adfa
Merge branch 'master' of https://github.com/Jsakkos/NUFEB
Jsakkos Nov 13, 2020
12ce7ec
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Nov 13, 2020
529971d
Merge remote-tracking branch 'origin/master' into SA
Jsakkos Nov 13, 2020
c3f6a35
User can now choose Saltelli grid; bounds for n_cyanos was changed to…
Nov 30, 2020
3012ba2
Added auto halt upen co2 limitation
Dec 4, 2020
5eba2a3
Merge branch 'master' of https://github.com/nufeb/NUFEB
Jsakkos Dec 7, 2020
93c8ec3
Merge remote-tracking branch 'origin/master' into add_phototroph
Jsakkos Dec 7, 2020
30f9e7a
Merge branch 'add_phototroph' of https://github.com/Jsakkos/NUFEB int…
Jsakkos Dec 7, 2020
756ba4c
Merge branch 'add_phototroph' into SA
Jsakkos Dec 7, 2020
7037329
Create Build.yml
Jsakkos Dec 9, 2020
08be466
Update Build.yml
Jsakkos Dec 9, 2020
e2879c8
Update Build.yml
Jsakkos Dec 9, 2020
30fd856
Update Build.yml
Jsakkos Dec 9, 2020
8896e15
Update Build.yml
Jsakkos Dec 9, 2020
573d3c2
Update Build.yml
Jsakkos Dec 9, 2020
7eaad7a
slurm template that keeps track of the sample run
Dec 10, 2020
cadc5d4
a Inputscript_template.txt that keeps track of the sample run; hd5 is…
Dec 10, 2020
ec7ec2b
Delete Build.yml
Jsakkos Dec 11, 2020
506f306
Merge branch 'master' of https://github.com/nufeb/NUFEB
Jsakkos Jan 4, 2021
6b9c0ed
Merge branch 'master' of https://github.com/nufeb/NUFEB
Jsakkos Jan 6, 2021
7079924
Merge remote-tracking branch 'origin/master' into SA
Jsakkos Jan 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,9 @@
.project
.cproject
.settings/
# Simulation outputs
*.vtu
*.vti
*.vtr
\Sucrose*
*.csv
40 changes: 40 additions & 0 deletions CADES_README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Instructions for NUFEB + phototroph on CADES CONDO


# clone repo
module load env/cades-cnms
```shell
cd $SCRATCH
git clone https://github.com/Jsakkos/NUFEB --recursive
git checkout add_phototroph
git pull
```
# To build
```shell
. $SOFTWARECNMS/spack/share/spack/setup-env.sh
spack load openmpi/qnfab5m
spack load vtk%[email protected]

./install_cades.sh --enable-vtk
```
# To test
## interactively
```shell
salloc -A cnms -p high_mem --nodes=1 --mem=80G --exclusive -t 00:30:00
srun --ntasks-per-node 32 -n 32 ../../lammps/src/lmp_mpi -in Inputscript.lammps
```
## batches
```shell
module load env/cades-cnms
module load anaconda3
cd $SCRATCH
cd NUFEB/examples/cyanobacteria-sucrose
python NUFEBatom --n 3 --r 3
./slurmRun.sh
```
# To login remotely
https://support.cades.ornl.gov/user-documentation/_book/external-access-ucams.html
```shell
ssh [email protected]
ssh [email protected]
```
116 changes: 116 additions & 0 deletions Inputscript-template.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# NUFEB simulation

atom_style bio
atom_modify map array sort 1000 5.0e-7
boundary ff ff ff
newton off
processors * * *


# Amount of bacteria and Nutrients information
# n_cyanos ${n_cyanos}
# co2 ${co2}
# light ${light}
# SucRatio ${SucRatio}
# Nsample ${Nsample}

comm_modify vel yes
read_data_bio atom_${n_cyanos}_${co2}_${light}_${SucRatio}_${Nsample}.in


###############Output directories##############################
shell mkdir Run_${n_cyanos}_${co2}_${light}_${SucRatio}_${Nsample}
shell cd Run_${n_cyanos}_${co2}_${light}_${SucRatio}_${Nsample}

##############Define initial particle distribution##############

lattice sc 1e-6 origin 0 0 0
region reg block 0 1000 0 1000 0 100

${CYANOGroup}
${ECWGroup}

neighbor 5e-7 bin
neigh_modify delay 0 one 5000

##############Define DEM Variables&Commands##############

pair_style gran/hooke/history 1.e-4 NULL 1.e-5 NULL 0.0 1
pair_coeff * *

#pair_style brownian 1.5 0 0 1e-6 1e-5 300 5878567
#pair_coeff * *

timestep 10

fix 1 all nve/limit 1e-8
fix fv all viscous 1e-5

fix zw all wall/gran hooke/history 2000 NULL 500.0 NULL 1.5 0 zplane 0.0 ${Zheight}

variable kanc equal 50

#fix zwa all walladh v_kanc zplane 0.0 1e-04

variable ke equal 5e+10
#fix j1 all epsadh 1 v_ke 1

##############Define IBm Variables##############

#variables used in fix eps_extract
variable EPSdens equal 30
variable EPSratio equal 1.3

#variables used in fix division
variable divDia1 equal 1.96e-6
variable divDia2 equal 1.04e-6

#variables used in fix kinetics
variable diffT equal 1e-4
variable tol equal 1e-13
variable etaHET equal 0.6
variable layer equal -1

#variables used in fix death
#variable deadDia equal 9e-7


##############Define IBm Commands##############

fix k1 all kinetics 100 ${GridMesh} v_diffT v_layer niter 1000000
fix kgm all kinetics/growth/monod sucexp $SucRatio
fix g1 all kinetics/diffusion v_tol closedflag $Closed
${CYANODiv}
${ECWDiv}
#fix d2 all death 1 v_deadDia demflag 0


##############Define IBm Computes##############

compute myNtypes all ntypes
compute myMass all biomass
compute myCon all avg_con

##############Simulation exit condition##############
variable co2 equal c_myCon[4]
fix 10 all halt 1 v_co2 <= 1e-19

variable light equal c_myCon[1]
fix 11 all halt 1 v_light <= 1e-19


##############Simulation Output##############

#dump id all custom 100 output.lammmps id type diameter x y z
dump traj all bio/hdf5 100 trajectory.h5 id type radius x y z con
#${DumpOutput}
#dump du1 all vtk 100 atom_*.vtu id type diameter x y z
#dump du2 all grid 100 grid_%_*.vti con
dump du3 all bio 100 ntypes biomass avg_con
thermo_style custom step cpu atoms c_myNtypes[*] c_myMass[*] c_myCon[*]
thermo 100
thermo_modify lost ignore

run $Timesteps
shell cd ..
clear
Loading