ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/applications/staticProps/StaticProps.cpp

Comparing trunk/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 1052 by gezelter, Tue Sep 26 01:30:32 2006 UTC vs.
Revision 1445 by chuckv, Tue Jun 8 20:26:50 2010 UTC

#	Line 6 | Line 6
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	+	* [4]  Vardeman & Gezelter, in progress (2009).
40		*/
41
42		#include <iostream>
#	Line 52 | Line 52
52		#include "applications/staticProps/StaticPropsCmd.h"
53		#include "applications/staticProps/StaticAnalyser.hpp"
54		#include "applications/staticProps/GofR.hpp"
55	+	#include "applications/staticProps/GofZ.hpp"
56	+	#include "applications/staticProps/GofRZ.hpp"
57		#include "applications/staticProps/GofRAngle.hpp"
58		#include "applications/staticProps/GofAngle2.hpp"
59		#include "applications/staticProps/GofXyz.hpp"
60		#include "applications/staticProps/P2OrderParameter.hpp"
61		#include "applications/staticProps/BondOrderParameter.hpp"
62	+	#include "applications/staticProps/BOPofR.hpp"
63		#include "applications/staticProps/RippleOP.hpp"
64		#include "applications/staticProps/SCDOrderParameter.hpp"
65		#include "applications/staticProps/DensityPlot.hpp"
66		#include "applications/staticProps/RhoZ.hpp"
67	+	#include "applications/staticProps/pAngle.hpp"
68	+	#include "applications/staticProps/BondAngleDistribution.hpp"
69	+	#include "applications/staticProps/NanoVolume.hpp"
70		#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
71		#include "applications/staticProps/Hxy.hpp"
72		#endif
73	+	#include "applications/staticProps/RhoR.hpp"
74
75	<	using namespace oopse;
75	>	using namespace OpenMD;
76
77		int main(int argc, char* argv[]){
78
79	<	//register force fields
80	<	registerForceFields();
79	>	//register force fields
80	>	registerForceFields();
81
82	<	gengetopt_args_info args_info;
82	>	gengetopt_args_info args_info;
83
84	<	//parse the command line option
85	<	if (cmdline_parser (argc, argv, &args_info) != 0) {
86	<	exit(1) ;
87	<	}
84	>	//parse the command line option
85	>	if (cmdline_parser (argc, argv, &args_info) != 0) {
86	>	exit(1) ;
87	>	}
88
89	<	//get the dumpfile name
90	<	std::string dumpFileName = args_info.input_arg;
91	<	std::string sele1;
92	<	std::string sele2;
93	<	bool userSpecifiedSelect1;
94	<	bool userSpecifiedSelect2;
89	>	//get the dumpfile name
90	>	std::string dumpFileName = args_info.input_arg;
91	>	std::string sele1;
92	>	std::string sele2;
93	>	bool userSpecifiedSelect1;
94	>	bool userSpecifiedSelect2;
95
96	<	// check the first selection argument, or set it to the environment
97	<	// variable, or failing that, set it to "select all"
96	>	// check the first selection argument, or set it to the environment
97	>	// variable, or failing that, set it to "select all"
98
99	<	if (args_info.sele1_given) {
100	<	sele1 = args_info.sele1_arg;
94	<	} else {
95	<	char*  sele1Env= getenv("OOPSE_SELE1");
96	<	if (sele1Env) {
97	<	sele1 = sele1Env;
99	>	if (args_info.sele1_given) {
100	>	sele1 = args_info.sele1_arg;
101		} else {
102	<	sele1 = "select all";
102	>	char*  sele1Env= getenv("SELECTION1");
103	>	if (sele1Env) {
104	>	sele1 = sele1Env;
105	>	} else {
106	>	sele1 = "select all";
107	>	}
108		}
101	–	}
109
110	<	// check the second selection argument, or set it to the environment
111	<	// variable, or failing that, set it to "select all"
110	>	// check the second selection argument, or set it to the environment
111	>	// variable, or failing that, set it to "select all"
112
113	<	if (args_info.sele2_given) {
114	<	sele2 = args_info.sele2_arg;
115	<	} else {
116	<	char* sele2Env = getenv("OOPSE_SELE2");
117	<	if (sele2Env) {
118	<	sele2 = sele2Env;
119	<	} else {
120	<	sele2 = "select all";
113	>	if (args_info.sele2_given) {
114	>	sele2 = args_info.sele2_arg;
115	>	} else {
116	>	char* sele2Env = getenv("SELECTION1");
117	>	if (sele2Env) {
118	>	sele2 = sele2Env;
119	>	} else {
120	>	sele2 = "select all";
121	>	}
122		}
115	–	}
123
124
125	<	// Problems if sele1 wasn't specified, but
125	>	// Problems if sele1 wasn't specified, but
126		// if (!args_info.scd_given) {
127		//       sprintf( painCave.errMsg,
128	<	//                "neither --sele1 option nor $OOPSE_SELE1 is set");
129	<	//       painCave.severity = OOPSE_ERROR;
128	>	//                "neither --sele1 option nor $SELECTION1 is set");
129	>	//       painCave.severity = OPENMD_ERROR;
130		//       painCave.isFatal = 1;
131		//       simError();
132		//     }
133		//   }
134
135	<	// Problems if sele1 wasn't specified
135	>	// Problems if sele1 wasn't specified
136
137		//     if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given)  {
138		//       sprintf( painCave.errMsg,
139	<	//                "neither --sele2 option nor $OOPSE_SELE2 is set");
140	<	//       painCave.severity = OOPSE_ERROR;
139	>	//                "neither --sele2 option nor $SELECTION1 is set");
140	>	//       painCave.severity = OPENMD_ERROR;
141		//       painCave.isFatal = 1;
142		//       simError();
143		//     }
144		//   }
145
146	<	bool batchMode;
147	<	if (args_info.scd_given){
148	<	if (args_info.sele1_given && args_info.sele2_given && args_info.sele3_given) {
149	<	batchMode = false;
150	<	} else if (args_info.molname_given && args_info.begin_given && args_info.end_given) {
151	<	if (args_info.begin_arg < 0 || args_info.end_arg < 0 || args_info.begin_arg > args_info.end_arg-2) {
152	<	sprintf( painCave.errMsg,
153	<	"below conditions are not satisfied:\n"
154	<	"0 <= begin && 0<= end && begin <= end-2\n");
155	<	painCave.severity = OOPSE_ERROR;
156	<	painCave.isFatal = 1;
157	<	simError();
158	<	}
159	<	batchMode = true;
160	<	} else{
161	<	sprintf( painCave.errMsg,
162	<	"either --sele1, --sele2, --sele3 are specified,"
163	<	" or --molname, --begin, --end are specified\n");
164	<	painCave.severity = OOPSE_ERROR;
165	<	painCave.isFatal = 1;
166	<	simError();
146	>	bool batchMode;
147	>	if (args_info.scd_given){
148	>	if (args_info.sele1_given && args_info.sele2_given && args_info.sele3_given) {
149	>	batchMode = false;
150	>	} else if (args_info.molname_given && args_info.begin_given && args_info.end_given) {
151	>	if (args_info.begin_arg < 0 || args_info.end_arg < 0 || args_info.begin_arg > args_info.end_arg-2) {
152	>	sprintf( painCave.errMsg,
153	>	"below conditions are not satisfied:\n"
154	>	"0 <= begin && 0<= end && begin <= end-2\n");
155	>	painCave.severity = OPENMD_ERROR;
156	>	painCave.isFatal = 1;
157	>	simError();
158	>	}
159	>	batchMode = true;
160	>	} else{
161	>	sprintf( painCave.errMsg,
162	>	"either --sele1, --sele2, --sele3 are specified,"
163	>	" or --molname, --begin, --end are specified\n");
164	>	painCave.severity = OPENMD_ERROR;
165	>	painCave.isFatal = 1;
166	>	simError();
167
168	+	}
169		}
162	–	}
170
171	<	//parse md file and set up the system
172	<	SimCreator creator;
173	<	std::cout << "dumpFile = " << dumpFileName << "\n";
174	<	SimInfo* info = creator.createSim(dumpFileName);
171	>	//parse md file and set up the system
172	>	SimCreator creator;
173	>	std::cout << "dumpFile = " << dumpFileName << "\n";
174	>	SimInfo* info = creator.createSim(dumpFileName);
175
176	<	RealType maxLen;
177	<	if (args_info.length_given) {
178	<	maxLen = args_info.length_arg;
179	<	} else {
180	<	Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
181	<	maxLen = std::min(std::min(hmat(0, 0), hmat(1, 1)), hmat(2, 2)) /2.0;
182	<	}
176	>	RealType maxLen;
177	>	RealType zmaxLen;
178	>	if (args_info.length_given) {
179	>	maxLen = args_info.length_arg;
180	>	if (args_info.zlength_given){
181	>	zmaxLen = args_info.zlength_arg;
182	>	}
183	>	} else {
184	>	Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
185	>	maxLen = std::min(std::min(hmat(0, 0), hmat(1, 1)), hmat(2, 2)) /2.0;
186	>	zmaxLen = hmat(2,2);
187	>	}
188
189	<	StaticAnalyser* analyser;
190	<	if (args_info.gofr_given){
191	<	analyser= new GofR(info, dumpFileName, sele1, sele2, maxLen,
192	<	args_info.nbins_arg);
193	<	} else if (args_info.r_theta_given) {
194	<	analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen,
195	<	args_info.nbins_arg, args_info.nanglebins_arg);
196	<	} else if (args_info.r_omega_given) {
197	<	analyser  = new GofROmega(info, dumpFileName, sele1, sele2, maxLen,
198	<	args_info.nbins_arg, args_info.nanglebins_arg);
199	<	} else if (args_info.theta_omega_given) {
200	<	analyser  = new GofAngle2(info, dumpFileName, sele1, sele2,
201	<	args_info.nanglebins_arg);
202	<	} else if (args_info.gxyz_given) {
203	<	if (args_info.refsele_given) {
204	<	analyser= new GofXyz(info, dumpFileName, sele1, sele2,args_info.refsele_arg,
205	<	maxLen, args_info.nbins_arg);
206	<	} else {
207	<	sprintf( painCave.errMsg,
208	<	"--refsele must set when --gxyz is used");
209	<	painCave.severity = OOPSE_ERROR;
210	<	painCave.isFatal = 1;
211	<	simError();
212	<	}
213	<	} else if (args_info.p2_given) {
214	<	analyser  = new P2OrderParameter(info, dumpFileName, sele1, sele2);
215	<	} else if (args_info.rp2_given){
216	<	analyser = new RippleOP(info, dumpFileName, sele1, sele2);
217	<	} else if (args_info.bo_given){
218	<	if (args_info.rcut_given) {
219	<	analyser = new BondOrderParameter(info, dumpFileName, sele1,
220	<	args_info.rcut_arg,
221	<	args_info.nbins_arg);
222	<	} else {
223	<	sprintf( painCave.errMsg,
224	<	"A cutoff radius (rcut) must be specified when calculating Bond Order Parameters");
225	<	painCave.severity = OOPSE_ERROR;
226	<	painCave.isFatal = 1;
227	<	simError();
228	<	}
229	<	} else if (args_info.scd_given) {
230	<	if (batchMode) {
231	<	analyser  = new SCDOrderParameter(info, dumpFileName, args_info.molname_arg,
232	<	args_info.begin_arg, args_info.end_arg);
233	<	} else{
234	<	std::string sele3 = args_info.sele3_arg;
235	<	analyser  = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3);
236	<	}
237	<	}else if (args_info.density_given) {
238	<	analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen,
239	<	args_info.nbins_arg);
240	<	} else if (args_info.slab_density_given) {
241	<	Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
242	<	analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nbins_arg);
189	>	StaticAnalyser* analyser;
190	>	if (args_info.gofr_given){
191	>	analyser= new GofR(info, dumpFileName, sele1, sele2, maxLen,
192	>	args_info.nbins_arg);
193	>	} else if (args_info.gofz_given) {
194	>	analyser= new GofZ(info, dumpFileName, sele1, sele2, maxLen,
195	>	args_info.nbins_arg);
196	>	} else if (args_info.r_z_given) {
197	>	analyser  = new GofRZ(info, dumpFileName, sele1, sele2, maxLen, zmaxLen,
198	>	args_info.nbins_arg, args_info.nbins_z_arg);
199	>	} else if (args_info.r_theta_given) {
200	>	analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen,
201	>	args_info.nbins_arg, args_info.nanglebins_arg);
202	>	} else if (args_info.r_omega_given) {
203	>	analyser  = new GofROmega(info, dumpFileName, sele1, sele2, maxLen,
204	>	args_info.nbins_arg, args_info.nanglebins_arg);
205	>	} else if (args_info.theta_omega_given) {
206	>	analyser  = new GofAngle2(info, dumpFileName, sele1, sele2,
207	>	args_info.nanglebins_arg);
208	>	} else if (args_info.gxyz_given) {
209	>	if (args_info.refsele_given) {
210	>	analyser= new GofXyz(info, dumpFileName, sele1, sele2,args_info.refsele_arg,
211	>	maxLen, args_info.nbins_arg);
212	>	} else {
213	>	sprintf( painCave.errMsg,
214	>	"--refsele must set when --gxyz is used");
215	>	painCave.severity = OPENMD_ERROR;
216	>	painCave.isFatal = 1;
217	>	simError();
218	>	}
219	>	} else if (args_info.p2_given) {
220	>	analyser  = new P2OrderParameter(info, dumpFileName, sele1, sele2);
221	>	} else if (args_info.rp2_given){
222	>	analyser = new RippleOP(info, dumpFileName, sele1, sele2);
223	>	} else if (args_info.bo_given){
224	>	if (args_info.rcut_given) {
225	>	analyser = new BondOrderParameter(info, dumpFileName, sele1,
226	>	args_info.rcut_arg,
227	>	args_info.nbins_arg);
228	>	} else {
229	>	sprintf( painCave.errMsg,
230	>	"A cutoff radius (rcut) must be specified when calculating Bond Order Parameters");
231	>	painCave.severity = OPENMD_ERROR;
232	>	painCave.isFatal = 1;
233	>	simError();
234	>	}
235	>	} else if (args_info.bor_given){
236	>	if (args_info.rcut_given) {
237	>	analyser = new BOPofR(info, dumpFileName, sele1, args_info.rcut_arg,
238	>	args_info.nbins_arg, maxLen);
239	>	} else {
240	>	sprintf( painCave.errMsg,
241	>	"A cutoff radius (rcut) must be specified when calculating Bond Order Parameters");
242	>	painCave.severity = OPENMD_ERROR;
243	>	painCave.isFatal = 1;
244	>	simError();
245	>	}
246	>	} else if (args_info.bad_given){
247	>	if (args_info.rcut_given) {
248	>	analyser = new BondAngleDistribution(info, dumpFileName, sele1, args_info.rcut_arg,
249	>	args_info.nbins_arg);
250	>	} else {
251	>	sprintf( painCave.errMsg,
252	>	"A cutoff radius (rcut) must be specified when calculating Bond Angle Distributions");
253	>	painCave.severity = OPENMD_ERROR;
254	>	painCave.isFatal = 1;
255	>	simError();
256	>	}
257	>	} else if (args_info.scd_given) {
258	>	if (batchMode) {
259	>	analyser  = new SCDOrderParameter(info, dumpFileName, args_info.molname_arg,
260	>	args_info.begin_arg, args_info.end_arg);
261	>	} else{
262	>	std::string sele3 = args_info.sele3_arg;
263	>	analyser  = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3);
264	>	}
265	>	}else if (args_info.density_given) {
266	>	analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen,
267	>	args_info.nbins_arg);
268	>	} else if (args_info.slab_density_given) {
269	>	analyser = new RhoZ(info, dumpFileName, sele1, args_info.nbins_arg);
270	>	} else if (args_info.p_angle_given) {
271	>	analyser = new pAngle(info, dumpFileName, sele1, args_info.nbins_arg);
272		#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
273	<	}else if (args_info.hxy_given) {
274	<	analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg,
275	<	args_info.nbins_y_arg, args_info.nbins_arg);
273	>	}else if (args_info.hxy_given) {
274	>	analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg,
275	>	args_info.nbins_y_arg, args_info.nbins_arg);
276		#endif
277	<	}
277	>	}else if (args_info.rho_r_given) {
278	>	if (args_info.radius_given){
279	>	analyser = new RhoR(info, dumpFileName, sele1, maxLen,args_info.nbins_arg,args_info.radius_arg);
280	>	}else{
281	>	sprintf( painCave.errMsg,
282	>	"A particle radius (radius) must be specified when calculating Rho(r)");
283	>	painCave.severity = OPENMD_ERROR;
284	>	painCave.isFatal = 1;
285	>	simError();
286	>	}
287	>	}else if (args_info.hullvol_given) {
288	>	analyser = new NanoVolume(info, dumpFileName, sele1);
289	>	}
290
291	<	if (args_info.output_given) {
292	<	analyser->setOutputName(args_info.output_arg);
293	<	}
294	<	if (args_info.step_given) {
295	<	analyser->setStep(args_info.step_arg);
296	<	}
291	>	if (args_info.output_given) {
292	>	analyser->setOutputName(args_info.output_arg);
293	>	}
294	>	if (args_info.step_given) {
295	>	analyser->setStep(args_info.step_arg);
296	>	}
297
298	<	analyser->process();
298	>	analyser->process();
299
300	<	delete analyser;
301	<	delete info;
300	>	delete analyser;
301	>	delete info;
302
303	<	return 0;
303	>	return 0;
304		}
305

Comparing trunk/src/applications/staticProps/StaticProps.cpp (property svn:keywords):
Revision 1052 by gezelter, Tue Sep 26 01:30:32 2006 UTC vs.
Revision 1445 by chuckv, Tue Jun 8 20:26:50 2010 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines