zhyang-dev/LIGGGHTS-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/LIGGGHTS-PFM.git synced 2025-12-08 06:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean up comments

Browse Source
This commit is contained in:
danielque
2023-12-13 16:25:38 +01:00
parent 37064553f0
commit 4994a486a3
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/fix_move_mesh.cpp
View File

@ -337,7 +337,6 @@ void FixMoveMesh::add_reference_axis(double *axis)
if(mesh_->prop().getGlobalProperty<VectorContainer<double,3> >(refax_id))
error->fix_error(FLERR,this,"only one reference axis allowed");
/*NL*/ //if (screen) printVec3D(screen,"adding axis",axis);
vectorCopy3D(axis,reference_axis_);
mesh_->prop().addGlobalProperty<VectorContainer<double,3> >(refax_id,"comm_none","frame_scale_trans_invariant","restart_no");
@ -357,25 +356,24 @@ void FixMoveMesh::get_reference_axis(double *axis)
if(!refax)
error->fix_error(FLERR,this,"internal error");
//NP need to explicitly reset reference axis
//NP otherwise would be too late since reset is called in rotate()
//NP or move() only and first mesh mover needs resetted reference axis
//NP so only do this for first mesh mover
// need to explicitly reset reference axis
// otherwise would be too late since reset is called in rotate()
// or move() only and first mesh mover needs resetted reference axis
// so only do this for first mesh mover
if(move_->isFirst())
mesh_->prop().resetGlobalPropToOrig(refax_id);
refax->get(0,axis);
vectorCopy3D(axis,reference_axis_);
/*NL*/ //if (screen) printVec3D(screen,"getting axis",axis);
}
/* ---------------------------------------------------------------------- */
void FixMoveMesh::reset_reference_axis()
{
//NP need to re-set reference axis from local copy upon setup
//NP this ensures orig value of reference_axis for fix i has been
//NP handled by fixes i-1, i-2,... only (not by i, i+1,...)
// need to reset reference axis from local copy upon setup
// this ensures orig value of reference_axis for fix i has been
// handled by fixes i-1, i-2,... only (not by i, i+1,...)
VectorContainer<double,3> *refax;
char refax_id[200];
@ -392,6 +390,4 @@ void FixMoveMesh::reset_reference_axis()
// set orig value for property
mesh_->prop().storeGlobalPropOrig(refax_id);
/*NL*/ //if (screen) printVec3D(screen,"re-setting axis",reference_axis_);
}

11
src/mesh_mover.cpp
View File

@ -413,21 +413,18 @@ void MeshMoverRotateModified::initial_integrate(double dTAbs,double dTSetup,doub
const double totalPhi = omega_*dTSetup;
const double incrementalPhi = omega_*dt;
//NP get reference point which might have been
//NP manipulated (translated, rotated) by move
//NP commands which come before this move command
// get reference point and axis which might have been
// manipulated (translated, rotated) by move
// commands which come before this move command
get_reference_point(reference_point);
get_reference_axis(rotation_axis);
//NP size includes owned and ghost elements
// size includes owned and ghost elements
const int size = mesh_->size();
const int numNodes = mesh_->numNodes();
double *** const v_node = get_v();
double *** const nodes = get_nodes();
/*NL*/ //if (screen) fprintf(screen,"dTAbs %f dTSetup %f totalPhi %f incrementalPhi %f reference_point %f %f %f\n",
/*NL*/ // dTAbs,dTSetup,totalPhi,incrementalPhi,reference_point[0],reference_point[1],reference_point[2]);
// rotate the mesh
mesh_->rotate(incrementalPhi,rotation_axis,reference_point);