Skip to content

Commit 2e6f01f

Browse files
fixes for drr and membranefusion
1 parent 62ac32f commit 2e6f01f

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

src/drr/DynamicReferenceRestraining.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,24 +316,24 @@ void DynamicReferenceRestraining::registerKeywords(Keywords &keys) {
316316
"This option is effective only when textOutput is on.");
317317
keys.add("optional","FMT","specify format for outfiles files (useful for decrease the number of digits in regtests)");
318318
keys.addOutputComponent(
319-
"_fict", "default",
319+
"_fict", "default", "scalar",
320320
"one or multiple instances of this quantity can be referenced "
321321
"elsewhere in the input file. "
322322
"These quantities will named with the arguments of the bias followed by "
323323
"the character string _tilde. It is possible to add forces on these "
324324
"variable.");
325325
keys.addOutputComponent(
326-
"_vfict", "default",
326+
"_vfict", "default", "scalar",
327327
"one or multiple instances of this quantity can be referenced "
328328
"elsewhere in the input file. "
329329
"These quantities will named with the arguments of the bias followed by "
330330
"the character string _tilde. It is NOT possible to add forces on these "
331331
"variable.");
332332
keys.addOutputComponent(
333-
"_biasforce", "default",
333+
"_biasforce", "default", "scalar",
334334
"The bias force from eABF/DRR of the fictitious particle.");
335-
keys.addOutputComponent("_springforce", "default", "Spring force between real CVs and extended CVs");
336-
keys.addOutputComponent("_fictNoPBC", "default",
335+
keys.addOutputComponent("_springforce", "default", "scalar", "Spring force between real CVs and extended CVs");
336+
keys.addOutputComponent("_fictNoPBC", "default", "scalar",
337337
"the positions of fictitious particles (without PBC).");
338338
keys.addDOI("10.1063/1.2711185");
339339
keys.addDOI("10.1021/ct200726v");

src/membranefusion/FusionPoreExpansionP.cpp

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -436,23 +436,24 @@ void fusionPoreExpansionP::calculate() {
436436

437437
ZMemRMAX = ZMems;
438438

439-
// The curvature of large membranes (1024 lipids) makes the Z-center of the membranes not to be representative
440-
// in some sectors, particularly in the region of ​​the defect.
441-
//
442-
// To solve this, the center Z of the membranes in the defect sector is calculated and used to calculate
443-
// the number of polar atoms within the horizontal layer AND in the radious of the defect.
444-
//
445-
// ________ | | ________
446-
// ________ \_____| |______/ _______<-- Top membrane.
447-
// \______|P|_______/
448-
// |O|
449-
// | | <-- Z-center of the membranes in the region of the defect.
450-
// ______|R|_______ <-- Z-center of the membranes
451-
// / _____|E|______ \
452-
// / / | | \ \
453-
// ______/ / | | \ \______
454-
// _______/ \_______<-- Bottom membrane.
455-
439+
/*
440+
The curvature of large membranes (1024 lipids) makes the Z-center of the membranes not to be representative
441+
in some sectors, particularly in the region of ​​the defect.
442+
443+
To solve this, the center Z of the membranes in the defect sector is calculated and used to calculate
444+
the number of polar atoms within the horizontal layer AND in the radious of the defect.
445+
446+
________ | | ________
447+
________ \_____| |______/ _______<-- Top membrane.
448+
\______|P|_______/
449+
|O|
450+
| | <-- Z-center of the membranes in the region of the defect.
451+
______|R|_______ <-- Z-center of the membranes
452+
/ _____|E|______ \
453+
/ / | | \ \
454+
______/ / | | \ \______
455+
_______/ \_______<-- Bottom membrane.
456+
*/
456457
// Center of mass for systems with PBC: https://en.wikipedia.org/wiki/Center_of_mass#Systems_with_periodic_boundary_conditions
457458
Vector MemCylDistances, distCylinder;
458459
double angle, ri;

0 commit comments

Comments
 (0)