From 32d641d3f970dc8c8082f12022ceb151a1bb6289 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 16 May 2014 20:57:10 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12000
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/KSPACE/pair_lj_cut_coul_long.cpp   |  1 +
 src/KSPACE/pair_lj_cut_coul_msm.cpp    |  1 +
 src/KSPACE/pair_lj_cut_tip4p_long.cpp  |  3 +++
 src/MOLECULE/pair_lj_cut_tip4p_cut.cpp | 12 ++++++++++++
 src/MOLECULE/pair_lj_cut_tip4p_cut.h   |  1 +
 src/comm_tiled.cpp                     |  2 ++
 src/fix_nh.cpp                         |  6 ++++++
 src/pair_lj_cut_coul_cut.cpp           |  1 +
 8 files changed, 27 insertions(+)

diff --git a/src/KSPACE/pair_lj_cut_coul_long.cpp b/src/KSPACE/pair_lj_cut_coul_long.cpp
index bb89f14c41..427012fa08 100644
--- a/src/KSPACE/pair_lj_cut_coul_long.cpp
+++ b/src/KSPACE/pair_lj_cut_coul_long.cpp
@@ -977,5 +977,6 @@ void *PairLJCutCoulLong::extract(const char *str, int &dim)
   if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul;
   dim = 2;
   if (strcmp(str,"epsilon") == 0) return (void *) epsilon;
+  if (strcmp(str,"sigma") == 0) return (void *) sigma;
   return NULL;
 }
diff --git a/src/KSPACE/pair_lj_cut_coul_msm.cpp b/src/KSPACE/pair_lj_cut_coul_msm.cpp
index d075b7db6d..ac3b1c3edc 100644
--- a/src/KSPACE/pair_lj_cut_coul_msm.cpp
+++ b/src/KSPACE/pair_lj_cut_coul_msm.cpp
@@ -488,5 +488,6 @@ void *PairLJCutCoulMSM::extract(const char *str, int &dim)
   if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul;
   dim = 2;
   if (strcmp(str,"epsilon") == 0) return (void *) epsilon;
+  if (strcmp(str,"sigma") == 0) return (void *) sigma;
   return NULL;
 }
diff --git a/src/KSPACE/pair_lj_cut_tip4p_long.cpp b/src/KSPACE/pair_lj_cut_tip4p_long.cpp
index dbcacc0dd8..baca5131af 100644
--- a/src/KSPACE/pair_lj_cut_tip4p_long.cpp
+++ b/src/KSPACE/pair_lj_cut_tip4p_long.cpp
@@ -586,6 +586,9 @@ void *PairLJCutTIP4PLong::extract(const char *str, int &dim)
   if (strcmp(str,"typeA") == 0) return (void *) &typeA;
   if (strcmp(str,"typeB") == 0) return (void *) &typeB;
   if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul;
+  dim = 2;
+  if (strcmp(str,"epsilon") == 0) return (void *) epsilon;
+  if (strcmp(str,"sigma") == 0) return (void *) sigma;
   return NULL;
 }
 
diff --git a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
index 39f8a3c1f9..f76e8260ce 100644
--- a/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
+++ b/src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
@@ -17,6 +17,7 @@
 
 #include "math.h"
 #include "stdlib.h"
+#include "string.h"
 #include "pair_lj_cut_tip4p_cut.h"
 #include "atom.h"
 #include "force.h"
@@ -722,6 +723,17 @@ void PairLJCutTIP4PCut::compute_newsite(double *xO,  double *xH1,
   xM[2] = xO[2] + alpha * 0.5 * (delz1 + delz2);
 }
 
+/* ---------------------------------------------------------------------- */
+
+void *PairLJCutTIP4PCut::extract(const char *str, int &dim)
+{
+  dim = 0;
+  if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul;
+  dim = 2;
+  if (strcmp(str,"epsilon") == 0) return (void *) epsilon;
+  if (strcmp(str,"sigma") == 0) return (void *) sigma;
+  return NULL;
+}
 /* ----------------------------------------------------------------------
    memory usage of hneigh
 ------------------------------------------------------------------------- */
diff --git a/src/MOLECULE/pair_lj_cut_tip4p_cut.h b/src/MOLECULE/pair_lj_cut_tip4p_cut.h
index 79da7bcb82..34ade5d271 100644
--- a/src/MOLECULE/pair_lj_cut_tip4p_cut.h
+++ b/src/MOLECULE/pair_lj_cut_tip4p_cut.h
@@ -39,6 +39,7 @@ class PairLJCutTIP4PCut : public Pair {
   void read_restart(FILE *);
   void write_data(FILE *);
   void write_data_all(FILE *);
+  void *extract(const char *, int &);
   double memory_usage();
 
  protected:
diff --git a/src/comm_tiled.cpp b/src/comm_tiled.cpp
index b80f5f0367..f9ad6901a1 100644
--- a/src/comm_tiled.cpp
+++ b/src/comm_tiled.cpp
@@ -331,6 +331,8 @@ void CommTiled::forward_comm_array(int n, double **array)
 
 int CommTiled::exchange_variable(int n, double *inbuf, double *&outbuf)
 {
+  int nrecv = n;
+  return nrecv;
 }
 
 /* ----------------------------------------------------------------------
diff --git a/src/fix_nh.cpp b/src/fix_nh.cpp
index f41af188cb..1abc05c739 100644
--- a/src/fix_nh.cpp
+++ b/src/fix_nh.cpp
@@ -1646,6 +1646,12 @@ void *FixNH::extract(const char *str, int &dim)
   dim=0;
   if (strcmp(str,"t_target") == 0) {
     return &t_target;
+  } else if (strcmp(str,"mtchain") == 0) {
+    return &mtchain;
+  }
+  dim=1;
+  if (strcmp(str,"eta") == 0) {
+    return &eta;
   }
   return NULL;
 }
diff --git a/src/pair_lj_cut_coul_cut.cpp b/src/pair_lj_cut_coul_cut.cpp
index a9a33af2d6..f3ee3d4a49 100644
--- a/src/pair_lj_cut_coul_cut.cpp
+++ b/src/pair_lj_cut_coul_cut.cpp
@@ -466,5 +466,6 @@ void *PairLJCutCoulCut::extract(const char *str, int &dim)
   if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul;
   dim = 2;
   if (strcmp(str,"epsilon") == 0) return (void *) epsilon;
+  if (strcmp(str,"sigma") == 0) return (void *) sigma;
   return NULL;
 }