diff --git a/.DS_Store b/.DS_Store index 8f1410e..3f0ce6b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/forma1d.m b/1d_trap/forma1d.m similarity index 100% rename from forma1d.m rename to 1d_trap/forma1d.m diff --git a/forma1d.mat b/1d_trap/forma1d.mat similarity index 100% rename from forma1d.mat rename to 1d_trap/forma1d.mat diff --git a/test_forma1d.m b/1d_trap/test_forma1d.m similarity index 94% rename from test_forma1d.m rename to 1d_trap/test_forma1d.m index 351bbc5..6c4f6bf 100644 --- a/test_forma1d.m +++ b/1d_trap/test_forma1d.m @@ -20,7 +20,7 @@ load forma1d.mat -[k_forma1d, D_forma1d] = forma1d(s-s0, Dt, gamma); +[k_forma1d, D_forma1d] = forma1d(x-x0, Dt, gamma); disp(['FORMA 1D results:']) disp(['k* = ' num2str( k_forma1d ) ' N/m']) diff --git a/2d_forcefield/.DS_Store b/2d_forcefield/.DS_Store new file mode 100644 index 0000000..bce8c82 Binary files /dev/null and b/2d_forcefield/.DS_Store differ diff --git a/BB_index_filter.m b/2d_forcefield/BB_index_filter.m similarity index 100% rename from BB_index_filter.m rename to 2d_forcefield/BB_index_filter.m diff --git a/FORMA2D_F0_J0.m b/2d_forcefield/FORMA2D_F0_J0.m similarity index 100% rename from FORMA2D_F0_J0.m rename to 2d_forcefield/FORMA2D_F0_J0.m diff --git a/doublebeam_dataxvsdx.mat.zip b/2d_forcefield/doublebeam_dataxvsdx.mat similarity index 98% rename from doublebeam_dataxvsdx.mat.zip rename to 2d_forcefield/doublebeam_dataxvsdx.mat index a1cf499..2ceea04 100644 Binary files a/doublebeam_dataxvsdx.mat.zip and b/2d_forcefield/doublebeam_dataxvsdx.mat differ diff --git a/forma_2D_field.m b/2d_forcefield/forma_2D_field.m similarity index 100% rename from forma_2D_field.m rename to 2d_forcefield/forma_2D_field.m diff --git a/2d_trap/.DS_Store b/2d_trap/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/2d_trap/.DS_Store differ diff --git a/forma2d.m b/2d_trap/forma2d.m similarity index 100% rename from forma2d.m rename to 2d_trap/forma2d.m diff --git a/forma2d.mat b/2d_trap/forma2d.mat similarity index 100% rename from forma2d.mat rename to 2d_trap/forma2d.mat diff --git a/test_forma2d.m b/2d_trap/test_forma2d.m similarity index 98% rename from test_forma2d.m rename to 2d_trap/test_forma2d.m index 6af37e3..0bab56c 100644 --- a/test_forma2d.m +++ b/2d_trap/test_forma2d.m @@ -19,8 +19,8 @@ clc load forma2d.mat -x=p-p0; -y=q-q0; +x=x-x0; +y=y-y0; [k_forma2d, Omega_forma2d, theta_forma2d, D_forma2d] = forma2d([x,y], Dt, gamma); disp(['FORMA 2D results:']) diff --git a/README.md b/README.md index 6b0319f..6ad0e53 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,9 @@ Laura Pérez García, Jaime Donlucas Pérez, Giorgio Volpe, Alejandro V. Arzola, Nature Communications 9, 5166 (2018) https://doi.org/10.1038/s41467-018-07437-x -# 1. Requirements to implement FORMA codes in Matlab - -The data points of your trajectories should be in in a way that the origin is in the center of the trap, i. e. where the $F=0$ - http://softmatterlab.org +![double_well](https://user-images.githubusercontent.com/47359519/60442443-5246d500-9c19-11e9-9fcc-77b35dfe46bc.jpg) diff --git a/test_forma2d.mat b/test_forma2d.mat deleted file mode 100644 index 9a0ccb0..0000000 Binary files a/test_forma2d.mat and /dev/null differ