tversion no in separate file, rename devs to sigma0 - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit e040d05d88a188d6c3d82df54de032b72b5b5ca8
(DIR) parent 5eecbc9aa76a85ffc07b5eabd762351a118438e1
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 14 Jan 2015 09:44:16 +0100
version no in separate file, rename devs to sigma0
Diffstat:
M src/constants.h | 4 +---
M src/contactsearch.cuh | 2 +-
M src/datatypes.h | 4 ++--
M src/file_io.cpp | 8 ++++----
M src/integration.cuh | 4 ++--
A src/version.h | 7 +++++++
6 files changed, 17 insertions(+), 12 deletions(-)
---
(DIR) diff --git a/src/constants.h b/src/constants.h
t@@ -2,6 +2,7 @@
#define CONSTANTS_H_
#include "typedefs.h"
+#include "version.h"
////////////////////////
// SYMBOLIC CONSTANTS //
t@@ -15,9 +16,6 @@ const Float PI = 3.14159265358979;
// Number of dimensions (1 and 2 NOT functional)
const unsigned int ND = 3;
-// Define source code version
-const double VERSION = 2.00;
-
// Max. number of contacts per particle
//const int NC = 16;
const int NC = 32;
(DIR) diff --git a/src/contactsearch.cuh b/src/contactsearch.cuh
t@@ -434,7 +434,7 @@ __global__ void interact(
w_3_nx = MAKE_FLOAT4( 0.0f,-1.0f, 0.0f, L.y);
w_4_nx = MAKE_FLOAT4( 0.0f, 1.0f, 0.0f, 0.0f);
- // default wall mass, vel, force, and devs
+ // default wall mass, vel, force, and sigma0
w_0_mvfd = MAKE_FLOAT4(0.0f, 0.0f, 0.0f, 0.0f);
w_1_mvfd = MAKE_FLOAT4(0.0f, 0.0f, 0.0f, 0.0f);
w_2_mvfd = MAKE_FLOAT4(0.0f, 0.0f, 0.0f, 0.0f);
(DIR) diff --git a/src/datatypes.h b/src/datatypes.h
t@@ -94,8 +94,8 @@ struct Params {
unsigned int nb0; // Number of inter-particle bonds at t=0
Float sigma_b; // Bond tensile strength
Float tau_b; // Bond shear strength
- Float devs_A; // Amplitude of modulations in normal stress
- Float devs_f; // Frequency of modulations in normal stress
+ Float sigma0_A; // Amplitude of modulations in normal stress
+ Float sigma0_f; // Frequency of modulations in normal stress
};
// Structure containing wall parameters
(DIR) diff --git a/src/file_io.cpp b/src/file_io.cpp
t@@ -217,8 +217,8 @@ void DEM::readbin(const char *target)
ifs.read(as_bytes(walls.mvfd[i].z), sizeof(Float));
ifs.read(as_bytes(walls.mvfd[i].w), sizeof(Float));
}
- ifs.read(as_bytes(params.devs_A), sizeof(params.devs_A));
- ifs.read(as_bytes(params.devs_f), sizeof(params.devs_f));
+ ifs.read(as_bytes(params.sigma0_A), sizeof(params.sigma0_A));
+ ifs.read(as_bytes(params.sigma0_f), sizeof(params.sigma0_f));
// Read bond parameters
t@@ -519,8 +519,8 @@ void DEM::writebin(const char *target)
ofs.write(as_bytes(walls.mvfd[i].z), sizeof(Float));
ofs.write(as_bytes(walls.mvfd[i].w), sizeof(Float));
}
- ofs.write(as_bytes(params.devs_A), sizeof(params.devs_A));
- ofs.write(as_bytes(params.devs_f), sizeof(params.devs_f));
+ ofs.write(as_bytes(params.sigma0_A), sizeof(params.sigma0_A));
+ ofs.write(as_bytes(params.sigma0_f), sizeof(params.sigma0_f));
// Write bond parameters
ofs.write(as_bytes(params.lambda_bar), sizeof(params.lambda_bar));
(DIR) diff --git a/src/integration.cuh b/src/integration.cuh
t@@ -314,7 +314,7 @@ __global__ void integrateWalls(
// read-after-write, write-after-read, or write-after-write hazards.
Float4 w_nx = dev_walls_nx[idx];
Float4 w_mvfd = dev_walls_mvfd[idx];
- int wmode = dev_walls_wmode[idx]; // Wall BC, 0: fixed, 1: devs, 2: vel
+ int wmode = dev_walls_wmode[idx]; // Wall BC, 0: fixed, 1: sigma0, 2: vel
if (wmode != 0) { // wmode == 0: Wall fixed: do nothing
t@@ -336,7 +336,7 @@ __global__ void integrateWalls(
// Apply sinusoidal variation if specified
const Float sigma_0 = w_mvfd.w
- + devC_params.devs_A*sin(2.0*PI*devC_params.devs_f * t_current);
+ + devC_params.sigma0_A*sin(2.0*PI*devC_params.sigma0_f * t_current);
// Normal load = Normal stress times wall surface area,
// directed downwards.
(DIR) diff --git a/src/version.h b/src/version.h
t@@ -0,0 +1,7 @@
+#ifndef VERSION_H_
+#define VERSION_H_
+
+// Define source code version
+const double VERSION = 2.10;
+
+#endif