From 3c475c517963a313d62824df7fb9790ddd1ebd94 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Tue, 28 May 2019 17:43:53 +0200
Subject: [PATCH] Fixing CYGWIN installation
---
example/README(YES, YOU MUST READ IT) | 2 +-
example/Vector/3_molecular_dynamic/main.cpp | 55 ++++++++++-----------
install | 3 ++
upgrade | 2 +-
4 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/example/README(YES, YOU MUST READ IT) b/example/README(YES, YOU MUST READ IT)
index eb7f6aaa6..4c2ea3654 100644
--- a/example/README(YES, YOU MUST READ IT)
+++ b/example/README(YES, YOU MUST READ IT)
@@ -1,5 +1,5 @@
This Package contain the examples. In order to compile the examples go in the root folder where you installed
-OpenFPM (example /usr/local/OpenFPM_install) and copy from there the file example.mk
+OpenFPM (example the defaukt would be /usr/local/openfpm_pdata/include) and copy from there the file example.mk
compile the examples with
diff --git a/example/Vector/3_molecular_dynamic/main.cpp b/example/Vector/3_molecular_dynamic/main.cpp
index 29c8894da..c7ab10f14 100644
--- a/example/Vector/3_molecular_dynamic/main.cpp
+++ b/example/Vector/3_molecular_dynamic/main.cpp
@@ -478,7 +478,6 @@ int main(int argc, char* argv[])
// calculate forces or a(tn + 1) Step 2
calc_forces(vd,NN,sigma12,sigma6,r_cut*r_cut);
-
// Integrate the velocity Step 3
auto it4 = vd.getDomainIterator();
@@ -494,33 +493,33 @@ int main(int argc, char* argv[])
++it4;
}
- // After every iteration collect some statistic about the configuration
- if (i % 100 == 0)
- {
- // We write the particle position for visualization (Without ghost)
- vd.deleteGhost();
- vd.write("particles_",f);
-
- // we resync the ghost
- vd.ghost_get<>();
-
- // We calculate the energy
- double energy = calc_energy(vd,NN,sigma12,sigma6,r_cut*r_cut);
- auto & vcl = create_vcluster();
- vcl.sum(energy);
- vcl.execute();
-
- // we save the energy calculated at time step i c contain the time-step y contain the energy
- x.add(i);
- y.add({energy});
-
- // We also print on terminal the value of the energy
- // only one processor (master) write on terminal
- if (vcl.getProcessUnitID() == 0)
- std::cout << "Energy: " << energy << std::endl;
-
- f++;
- }
+ // After every iteration collect some statistic about the configuration
+ if (i % 100 == 0)
+ {
+ // We write the particle position for visualization (Without ghost)
+ vd.deleteGhost();
+ vd.write("particles_",f);
+
+ // we resync the ghost
+ vd.ghost_get<>();
+
+ // We calculate the energy
+ double energy = calc_energy(vd,NN,sigma12,sigma6,r_cut*r_cut);
+ auto & vcl = create_vcluster();
+ vcl.sum(energy);
+ vcl.execute();
+
+ // we save the energy calculated at time step i c contain the time-step y contain the energy
+ x.add(i);
+ y.add({energy});
+
+ // We also print on terminal the value of the energy
+ // only one processor (master) write on terminal
+ if (vcl.getProcessUnitID() == 0)
+ std::cout << "Energy: " << energy << std::endl;
+
+ f++;
+ }
}
//! \cond [md steps] \endcond
diff --git a/install b/install
index 281ccc2bd..6f01173e4 100755
--- a/install
+++ b/install
@@ -541,6 +541,9 @@ bash_library="$bash_library\""
##### Writing openfpm_vars file
+# in cygwin we have to add to PATH additional directories
+
+bash_path="$i_dir/BOOST/bin:$i_dir/HDF5/bin:$bash_path"
echo "$bash_path" > $HOME/openfpm_vars
echo "$bash_library" >> $HOME/openfpm_vars
diff --git a/upgrade b/upgrade
index 45503e5c7..c5ce3d2cf 100644
--- a/upgrade
+++ b/upgrade
@@ -1 +1 @@
-openfpm.mpi-cbg.de/upload/upgrade_210
+openfpm.mpi-cbg.de/upload/upgrade_200
--
GitLab