From e4f73b3e58f62ed09f5217fc03b92294d2834571 Mon Sep 17 00:00:00 2001
From: ygutier2 <yair.fosado@ed.ac.uk>
Date: Sat, 2 Jul 2022 20:54:01 +0100
Subject: [PATCH] final changes commit

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 1_DNAModels/.DS_Store                         | Bin 6148 -> 6148 bytes
 1_DNAModels/3_oxDNA/.DS_Store                 | Bin 0 -> 6148 bytes
 1_DNAModels/3_oxDNA/oxDNA1/bash.run.sh        |  10 +++++-----
 1_DNAModels/3_oxDNA/oxDNA2/bash.run.sh        |  10 +++++-----
 2_Melting/.DS_Store                           | Bin 6148 -> 6148 bytes
 2_Melting/1_linear/.DS_Store                  | Bin 0 -> 6148 bytes
 .../1_linear/2_equilibration/bash.run.sh      |  10 +++++-----
 3_oxView/.DS_Store                            | Bin 0 -> 6148 bytes
 README.md                                     |  16 ++++++++++------
 10 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 1_DNAModels/3_oxDNA/.DS_Store
 create mode 100644 2_Melting/1_linear/.DS_Store
 create mode 100644 3_oxView/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 567e7e8b7b8826f5327abfb6d2c9abdab530b001..2bf1a94da2fd050f3bc5e6fc6a31bb34207765f9 100644
GIT binary patch
delta 102
zcmZoMXfc@J&&akhU^g=(+h!gXGsek=EN3UHunH@b1sCPz<maU`FfcFzF$aS&Lp(!1
gLj^+^LncEiL-}MimK(AdqR6@?7GBuQ&heKY020X=(EtDd

delta 66
zcmV-I0KNZ&FoZCWPXPq6P`d*G1hWhTHUR<3lTHSJ3mJQRH90gaATl>Klg$Ml0h*KS
Y1s?&MlOY8blPd?@v498xvj+(M4}o_RxBvhE

diff --git a/1_DNAModels/.DS_Store b/1_DNAModels/.DS_Store
index 7f40061918ad5804a97dbbe294b12dd7306f3b3d..107d9c2dffd8d3b28b5d3f4f00f39de03ff4e30d 100644
GIT binary patch
delta 54
zcmZoMXfc@J&&akhU^g=(+vLA2GMhD6SeZE48H^d?8S)t_CL6LoV280K*j{aB=lIJH
E0Ft;4#sB~S

delta 32
ocmZoMXfc@J&&aYdU^g=(%jCZ-GMhD6SeZ7K++y6!&heKY0INv~bpQYW

diff --git a/1_DNAModels/3_oxDNA/.DS_Store b/1_DNAModels/3_oxDNA/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4deea2eb89cd3304dd6488ea331258cbd1ad82aa
GIT binary patch
literal 6148
zcmeHK!A=4(5N&0}f-!P1kz+63IP7wOlgYZ`!HY3jqX#vx8;ERzTLO!yxMqJt|Hv=!
zcbsX90nx;hG0;h7-n7%{W?s^EhY&)&QQIM;L<nJ^h*lBIH-d501zFQG79f>-91tfQ
z5Bp(HgbS<9gkiui@ZT7~vzsS^+>-`5A@k?=E$sKAVPf0wbS-DC=QkKDvf@_p+V6_7
zp9INh=mmpI9GwP9H`M-_5WP=72+yO=xLMjc6mb$nac3Ztqjm?DTwO$QTZ}z1irYiE
zkFNrZ6<DEJDo-Z0dWAdnYFgnF$F4gSUUTd;EwJ4^XaBf$`|vn<N}pd8s}wFFDcc&S
z@Cwdck$3(e?uqyY<}qhBR-L)PmX?6(7Xqe48C)d>^l@REt5me9)i7Wf_!R?qKX6b)
zS7WA7UL9a$3jm0}5mLa%UIKHtMpt8|5F#K{r2?u{s#^@I(qW$Kb*{!tp-LxIHy>1g
znd%OO%CE!zTrMZnRcNeXz%Ve+Ku!%y`2HXL-2cxfnUP_@FtAh%P^;lLJSa)OtqaBB
vTgyRPpeVR5Qz%ow=;v5E_!O5xr9h0M1L$hZ6v7OM`4Nyb7-JatQwBZ&yG@gV

literal 0
HcmV?d00001

diff --git a/1_DNAModels/3_oxDNA/oxDNA1/bash.run.sh b/1_DNAModels/3_oxDNA/oxDNA1/bash.run.sh
index af0f417..bdb973a 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 af0f417..bdb973a 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
GIT binary patch
delta 222
zcmZoMXfc=|#>B!ku~2NHo}wrV0|Nsi1A_nqLmopaLn1>_Qh9N~W<loV%!(i>4hBPp
zc!nH?Ol0Y#octu9+{wurObwY5)zxO^Itqs7MzuN$)rJP<hB^vnh6c5@oE+k+hPIvw
zxs_GbHMMm!fjWSI5oj40@Iz@BH4DhVu&pe(C@&{JFC8eyxS5CP6VqmP4t@@x>wzx(
V&ODi4#E}DN9uvrn%@HDNm;wD~EB62Z

delta 85
zcmZoMXfc=|#>B)qu~2NHo}wrd0|Nsi1A_nqLq0=EQh9MfQcix-#=_-{lMO^zHcPO+
mXWH1n$-J4JgP#MaX|o{5cjn3bB90tDZ6JLtn<GTlFarQ?L=&3;

diff --git a/2_Melting/1_linear/.DS_Store b/2_Melting/1_linear/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..54e6c5562d88540d894c38dcd083df4910f93058
GIT binary patch
literal 6148
zcmeHK!A=4(5S;>Q!5BH1$gvl199R!>GTERWyqT=ggBsWkL^oNt3X4P$v%jH#<QMom
z&a}m7(0DOM%uF(U)9Fl0UrA>R0HQVQdH_`bkf?-(GB%$Gjg!tu!FdRUnPUhsB&ZSe
zXQJ8h7a5?lTZK(%Ll3Uu{rQEE;Yn&pqtW0hN_2#g&(T#953)w%MHGsqg~cT)E3&du
zISVfID9FNWIB13a6Y3p=*+t~+L#>lHJB*Iv-l$z&+tFzj#%Zr_lH+a<Lr#z5w5vxg
zJxsd;Gf!X#q%6yFyILEMx0-e3H8&@9HTD`!udcSd#$-~K>l@zoe&_P`ZhSv^c(hy#
z{977XbvT75G``vPP0&vhot|Ulbe3s0BQwAZFavYWfV<Y@@|^F3e?Bw74E#I;bU!Fm
zLf>I-(Oeza(B~tKmk3GFrndy4a_BqEE#e4@u&IbPRk$aHu<7VmF3xwDTeRsQ%*r^A
zTUodliZH9AUzu<azC~`C0cPMM14Y}dQvKii`u+bgiF?cdGw`n%5T)H<w}o4BwRL85
vRBIJ#2bF~4a*J;%XqZxru~dp{s7BDQ$UyWR<`&U|!XE;L25y*vUuEDGaWYrd

literal 0
HcmV?d00001

diff --git a/2_Melting/1_linear/2_equilibration/bash.run.sh b/2_Melting/1_linear/2_equilibration/bash.run.sh
index 9bf467a..bcfc972 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
GIT binary patch
literal 6148
zcmeHK&2G~`5S~o}-2@?mgw!7Q!YzlGLvup1LOAq><f=WiD6w%MmK<*sJ4D5}@@uqj
z)F<fcbY^!`6a^$MAcAJ3*>84sX4m_zwLbtLhO5{E=mLO5C2X{@_=!+E>5ep<hftV4
z<}il^<S>S0Cz>7qA_KH`FTukVOCiM7`>}o*u3-V6Ktl$fqjkQBQXOIRU9?D(yy*Au
zMWfkz^7KH;j_f?|d<<rK9TZ`)%7@|df@&YaVir03RO|H74x_VVx*m65z0+9{CfRgp
zl9PCfA(!V#7VGs;ud+Bd{RFl_%C>BeyGLbtJm@KJ@TTgi((4bro;vpWRn?Y<uf4Y?
zllj%R@_TiCWBC^NYZ`gsa09n!{KnM32Fonf*%yr7^t9=Lkr`kHn1MZIz-?#p*`9ts
ze>O9~4E#9;Xn#<sgucVtqS-pIpz9;Gw+Knlrndy4a_Bp(En*9bu&IbPRk$aHu<7Vm
zF3xvYTeRsQ%*fb}8(Fv)iZG+2Uzu<azC|vX0cK#Efu^l?>HL5H>-Yb564#gkX5hbK
zK(t1|XoypCXY0=7=&V(!6I2q4t1UjJpka<;jHRRa2-OJs6&Z-W!`dQxQ1~KXXyAew
I_^S*&03+>LYybcN

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index 1b9f420..664c208 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.
-- 
GitLab