From 76b90965c3183c17c4cbb672728bfcf14b02e29b Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 7 Oct 2008 15:06:17 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2162
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/GRANULAR/atom_vec_granular.cpp | 28 ++++++++--------------------
 src/GRANULAR/fix_pour.cpp          |  5 +----
 src/set.cpp                        | 21 ++++++---------------
 3 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/src/GRANULAR/atom_vec_granular.cpp b/src/GRANULAR/atom_vec_granular.cpp
index f7b8d97956..9d313e8a47 100644
--- a/src/GRANULAR/atom_vec_granular.cpp
+++ b/src/GRANULAR/atom_vec_granular.cpp
@@ -533,11 +533,8 @@ int AtomVecGranular::unpack_restart(double *buf)
 
   radius[nlocal] = buf[m++];
   density[nlocal] = buf[m++];
-  if (domain->dimension == 3) 
-    rmass[nlocal] = 4.0*PI/3.0 * 
-      radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
-  else
-    rmass[nlocal] = PI * radius[nlocal]*radius[nlocal] * density[nlocal];
+  rmass[nlocal] = 4.0*PI/3.0 * 
+    radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
 
   omega[nlocal][0] = buf[m++];
   omega[nlocal][1] = buf[m++];
@@ -576,11 +573,8 @@ void AtomVecGranular::create_atom(int itype, double *coord)
 
   radius[nlocal] = 0.5;
   density[nlocal] = 1.0;
-  if (domain->dimension == 3)
-    rmass[nlocal] = 4.0*PI/3.0 *
-      radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
-  else
-    rmass[nlocal] = PI * radius[nlocal]*radius[nlocal] * density[nlocal];
+  rmass[nlocal] = 4.0*PI/3.0 *
+    radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
   omega[nlocal][0] = 0.0;
   omega[nlocal][1] = 0.0;
   omega[nlocal][2] = 0.0;
@@ -608,11 +602,8 @@ void AtomVecGranular::data_atom(double *coord, int imagetmp, char **values)
 
   radius[nlocal] = 0.5 * atof(values[2]);
   density[nlocal] = atof(values[3]);
-  if (domain->dimension == 3)
-    rmass[nlocal] = 4.0*PI/3.0 *
-      radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
-  else
-    rmass[nlocal] = PI * radius[nlocal]*radius[nlocal] * density[nlocal];
+  rmass[nlocal] = 4.0*PI/3.0 *
+    radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
 
   x[nlocal][0] = coord[0];
   x[nlocal][1] = coord[1];
@@ -640,11 +631,8 @@ int AtomVecGranular::data_atom_hybrid(int nlocal, char **values)
 {
   radius[nlocal] = 0.5 * atof(values[0]);
   density[nlocal] = atof(values[1]);
-  if (domain->dimension == 3)
-    rmass[nlocal] = 4.0*PI/3.0 *
-      radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
-  else
-    rmass[nlocal] = PI * radius[nlocal]*radius[nlocal] * density[nlocal];
+  rmass[nlocal] = 4.0*PI/3.0 *
+    radius[nlocal]*radius[nlocal]*radius[nlocal] * density[nlocal];
 
   v[nlocal][0] = 0.0;
   v[nlocal][1] = 0.0;
diff --git a/src/GRANULAR/fix_pour.cpp b/src/GRANULAR/fix_pour.cpp
index a931219513..f41b2f84c9 100644
--- a/src/GRANULAR/fix_pour.cpp
+++ b/src/GRANULAR/fix_pour.cpp
@@ -456,10 +456,7 @@ void FixPour::pre_exchange()
       atom->type[m] = ntype;
       atom->radius[m] = radtmp;
       atom->density[m] = denstmp;
-      if (domain->dimension == 3) 
-	atom->rmass[m] = 4.0*PI/3.0 * radtmp*radtmp*radtmp * denstmp;
-      else
-	atom->rmass[m] = PI * radtmp*radtmp * denstmp;
+      atom->rmass[m] = 4.0*PI/3.0 * radtmp*radtmp*radtmp * denstmp;
       atom->mask[m] = 1 | groupbit;
       atom->v[m][0] = vxtmp;
       atom->v[m][1] = vytmp;
diff --git a/src/set.cpp b/src/set.cpp
index c725ca833a..552c7e2687 100644
--- a/src/set.cpp
+++ b/src/set.cpp
@@ -345,12 +345,8 @@ void Set::set(int keyword)
 
       else if (keyword == DIAMETER) {
 	atom->radius[i] = 0.5 * dvalue;
-	if (domain->dimension == 3)
-	  atom->rmass[i] = 4.0*PI/3.0 * 
-	    atom->radius[i]*atom->radius[i]*atom->radius[i] * atom->density[i];
-	else
-	  atom->rmass[i] = PI * 
-	    atom->radius[i]*atom->radius[i] * atom->density[i];
+	atom->rmass[i] = 4.0*PI/3.0 * 
+	  atom->radius[i]*atom->radius[i]*atom->radius[i] * atom->density[i];
 
       // density setting triggers setting of rmass
       // for granular, rmass is function of diameter and density
@@ -358,15 +354,10 @@ void Set::set(int keyword)
 	
       } else if (keyword == DENSITY) {
 	atom->density[i] = dvalue;
-	if (granflag) {
-	  if (domain->dimension == 3)
-	    atom->rmass[i] = 4.0*PI/3.0 * 
-	      atom->radius[i]*atom->radius[i]*atom->radius[i] * 
-	      atom->density[i];
-	  else
-	    atom->rmass[i] = PI * 
-	      atom->radius[i]*atom->radius[i] * atom->density[i];
-	}
+	if (granflag)
+	  atom->rmass[i] = 4.0*PI/3.0 * 
+	    atom->radius[i]*atom->radius[i]*atom->radius[i] * 
+	    atom->density[i];
 	if (periflag) atom->rmass[i] = dvalue;
 
       } else if (keyword == VOLUME) atom->vfrac[i] = dvalue;