diff --git a/.DS_Store b/.DS_Store
index 567e7e8b7b8826f5327abfb6d2c9abdab530b001..2bf1a94da2fd050f3bc5e6fc6a31bb34207765f9 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/1_DNAModels/.DS_Store b/1_DNAModels/.DS_Store
index 7f40061918ad5804a97dbbe294b12dd7306f3b3d..107d9c2dffd8d3b28b5d3f4f00f39de03ff4e30d 100644
Binary files a/1_DNAModels/.DS_Store and b/1_DNAModels/.DS_Store differ
diff --git a/1_DNAModels/3_oxDNA/.DS_Store b/1_DNAModels/3_oxDNA/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4deea2eb89cd3304dd6488ea331258cbd1ad82aa
Binary files /dev/null and b/1_DNAModels/3_oxDNA/.DS_Store differ
diff --git a/1_DNAModels/3_oxDNA/oxDNA1/bash.run.sh b/1_DNAModels/3_oxDNA/oxDNA1/bash.run.sh
index af0f4172d17a81d0716300b482563e95fceb2650..bdb973ab2b23af847a1959e79fe273c0f1883f4e 100755
--- a/1_DNAModels/3_oxDNA/oxDNA1/bash.run.sh
+++ b/1_DNAModels/3_oxDNA/oxDNA1/bash.run.sh
@@ -1,7 +1,10 @@
#!/bin/bash
+#Current working directory variable
+cwd=`pwd`
#Location of the LAMMPS executables
-LAMMPSparallel="/Disk/ds-sopa-personal/ygutier2/SoftwareMD/lammps-29Sep2021/exec/lmp_mpi_29Sep2021"
+LAMMPS="${cwd}/../../../lmp_serial_29Sept2021"
+LAMMPSparallel="${cwd}/../../../lmp_mpi_29Sept2021"
#Name of the lammps script to run
lscript="oxDNA.commands"
@@ -14,9 +17,6 @@ intl="initial_configuration_N${nbp}_phi0.6"
#Number of cpu's to use in the simulation
ncpu=1
-
-#Current working directory variable
-cwd=`pwd`
mkdir -p REP1
cd REP1
@@ -30,4 +30,4 @@ cwd=`pwd`
echo "variable seed equal ${r1}" > parameters.dat
echo "variable seed1 equal ${r2}" >> parameters.dat
- mpirun -np ${ncpu} ${LAMMPSparallel} -in ${lscript}
+ mpirun -np ${ncpu} ${LAMMPSparallel} -in ${lscript}
\ No newline at end of file
diff --git a/1_DNAModels/3_oxDNA/oxDNA2/bash.run.sh b/1_DNAModels/3_oxDNA/oxDNA2/bash.run.sh
index af0f4172d17a81d0716300b482563e95fceb2650..bdb973ab2b23af847a1959e79fe273c0f1883f4e 100755
--- a/1_DNAModels/3_oxDNA/oxDNA2/bash.run.sh
+++ b/1_DNAModels/3_oxDNA/oxDNA2/bash.run.sh
@@ -1,7 +1,10 @@
#!/bin/bash
+#Current working directory variable
+cwd=`pwd`
#Location of the LAMMPS executables
-LAMMPSparallel="/Disk/ds-sopa-personal/ygutier2/SoftwareMD/lammps-29Sep2021/exec/lmp_mpi_29Sep2021"
+LAMMPS="${cwd}/../../../lmp_serial_29Sept2021"
+LAMMPSparallel="${cwd}/../../../lmp_mpi_29Sept2021"
#Name of the lammps script to run
lscript="oxDNA.commands"
@@ -14,9 +17,6 @@ intl="initial_configuration_N${nbp}_phi0.6"
#Number of cpu's to use in the simulation
ncpu=1
-
-#Current working directory variable
-cwd=`pwd`
mkdir -p REP1
cd REP1
@@ -30,4 +30,4 @@ cwd=`pwd`
echo "variable seed equal ${r1}" > parameters.dat
echo "variable seed1 equal ${r2}" >> parameters.dat
- mpirun -np ${ncpu} ${LAMMPSparallel} -in ${lscript}
+ mpirun -np ${ncpu} ${LAMMPSparallel} -in ${lscript}
\ No newline at end of file
diff --git a/2_Melting/.DS_Store b/2_Melting/.DS_Store
index 11fc59f2f1cb5fae362eb1bed446a7e75aef2edc..71d769745b438cda857696f5da0e02d7058e4898 100644
Binary files a/2_Melting/.DS_Store and b/2_Melting/.DS_Store differ
diff --git a/2_Melting/1_linear/.DS_Store b/2_Melting/1_linear/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..54e6c5562d88540d894c38dcd083df4910f93058
Binary files /dev/null and b/2_Melting/1_linear/.DS_Store differ
diff --git a/2_Melting/1_linear/2_equilibration/bash.run.sh b/2_Melting/1_linear/2_equilibration/bash.run.sh
index 9bf467a8e814d2045cb5d7f4659a05b1a5535aa5..bcfc972b23e744d653f05a8db87f99ef70ca77ad 100755
--- a/2_Melting/1_linear/2_equilibration/bash.run.sh
+++ b/2_Melting/1_linear/2_equilibration/bash.run.sh
@@ -1,7 +1,10 @@
#!/bin/bash
+#Current working directory variable
+cwd=`pwd`
#Location of the LAMMPS executables
-LAMMPSparallel="/Disk/ds-sopa-personal/ygutier2/SoftwareMD/lammps-29Sep2021/exec/lmp_mpi_29Sep2021"
+LAMMPS="${cwd}/../../../lmp_serial_29Sept2021"
+LAMMPSparallel="${cwd}/../../../lmp_mpi_29Sept2021"
#Name of the lammps script to run
lscript="oxDNA.commands"
@@ -14,9 +17,6 @@ intl="linear.N${nbp}.lammps"
#Number of cpu's to use in the simulation
ncpu=1
-
-#Current working directory variable
-cwd=`pwd`
mkdir -p REP1
cd REP1
@@ -30,4 +30,4 @@ cwd=`pwd`
echo "variable seed equal ${r1}" > parameters.dat
echo "variable seed1 equal ${r2}" >> parameters.dat
- mpirun -np ${ncpu} ${LAMMPSparallel} -in ${lscript}
+ mpirun -np ${ncpu} ${LAMMPSparallel} -in ${lscript}
\ No newline at end of file
diff --git a/3_oxView/.DS_Store b/3_oxView/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5e42517ad40ba41f389b130da796611968926df4
Binary files /dev/null and b/3_oxView/.DS_Store differ
diff --git a/README.md b/README.md
index 1b9f420590ecd4bd8da433f007310ce32b2e7053..664c20893b096b0b33236c979f3a7326485a466b 100755
--- a/README.md
+++ b/README.md
@@ -10,7 +10,11 @@ Furtheremore, we will discuss how to:
4. Analyse the output from simulations.
## Requirements
-In this section you will find the software neccessary for this tutorial and instructions on how to install it.
+In this section you will find the software neccessary for this tutorial and instructions on how to install it. The tutorial assumes that a LAMMPS executable called **lmp\_mpi\_29Sep2021** exist into this folder (see below for installation).
+
+Also, we recomend to create an alias for ovito. To this end, open a terminal into your home directory and type *vim bash.rc*. Then add the line:
+
+alias=ovito
### Git
Git is a distributed version control software. This is, a way to save changes over time without overwriting previous versions. The instructions to install it in *Windows, Linux and Mac* can be found in the following [Link](https://github.com/git-guides/install-git).
@@ -23,7 +27,7 @@ In this tutorial we will implement simulations of DNA using [oxDNA](https://dna.
One important feature of the oxDNA model is that [recently](https://link.springer.com/article/10.1140/epje/i2018-11669-8) it was implemented as a package that can be build into LAMMPS. Here, I mentioned the general steps on how to build LAMMPS with this package (assuming that you are using a computer with either macOS or linux-OS such as Ubuntu). For different operating systems please follow instructions [here](https://docs.lammps.org/Install.html).
-We will work with the current stable release of LAMMPS (**29-September-2021**) that can be installed in the following way: Assuming that you have a terminal located in the **home** directory, you have to type:
+We will work with the current stable release of LAMMPS (**29-Sept-2021**) that can be installed in the following way: Assuming that you have a terminal located in the **home** directory, you have to type:
> git clone -b stable https://github.com/lammps/lammps.git mylammps
>
@@ -33,13 +37,13 @@ We will work with the current stable release of LAMMPS (**29-September-2021**) t
>
> cd ../
>
-> make yes-molecule yes-asphere yes-CG-DNA
+> make yes-molecule yes-asphere yes-CG-DNA yes-extra-molecule
>
-> make serial
+> make mpi
>
-> mv lmp\_serial ~/lmp\_serial_29Sep2021
+> mv lmp\_mpi ~/lmp\_mpi_29Sep2021
-With this, an executable with the name **lmp\_serial\_29Sep2021** shoul have been created in your home directory (*~/*).
+With this, an executable with the name **lmp\_mpi\_29Sep2021** shoul have been created in your home directory (*~/*). Copy the executable into this folder, where you downloaded the tutorial.
### Ovito
In the tutorial we will learn how to visualize the output generated from simulations. To this end, we will use [Ovito](https://www.ovito.org) a visualization tool that can deal with aspherical particles. This is necessary to capture the planarity of bases in a nucleotide.