Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #165 Use Corrected CFL Criteria #371

Merged
merged 2 commits into from
Apr 28, 2014
Merged

Fix #165 Use Corrected CFL Criteria #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdf5346
Fix #165 Use Corrected CFL Criteria
ax3l Apr 25, 2014
e905bc9
Show Optimal CFL in InitialiserController
ax3l Apr 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 24 additions & 41 deletions src/picongpu/include/initialization/InitialiserController.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with PIConGPU.
* If not, see <http://www.gnu.org/licenses/>.
*/

*/

#pragma once

Expand Down Expand Up @@ -65,14 +64,14 @@ class InitialiserController : public IInitPlugin
{
// start simulation using default values
log<picLog::SIMULATION_STATE > ("Starting simulation from timestep 0");

SimStartInitialiser<PIC_Electrons, PIC_Ions> simStartInitialiser;
Environment<>::get().DataConnector().initialise(simStartInitialiser, 0);
__getTransactionEvent().waitForFinished();

log<picLog::SIMULATION_STATE > ("Loading from default values finished");
}

/**
* Load persistent simulation state from \p restartStep
*/
Expand All @@ -81,7 +80,7 @@ class InitialiserController : public IInitPlugin
// restart simulation by loading from persistent data
// the simulation will start after restartStep
log<picLog::SIMULATION_STATE > ("Restarting simulation from timestep %1%") % restartStep;

Environment<>::get().PluginConnector().restartPlugins(restartStep);
__getTransactionEvent().waitForFinished();

Expand All @@ -95,50 +94,34 @@ class InitialiserController : public IInitPlugin
{
if (Environment<simDim>::get().GridController().getGlobalRank() == 0)
{
std::cout << "max weighting " << NUM_EL_PER_PARTICLE << std::endl;

float_X shortestSide = cellSize.x();
for(uint32_t d=1;d<simDim;++d)
shortestSide=std::min(shortestSide, cellSize[d]);

std::cout << "courant=min(deltaCellSize)/dt/c > 1.77 ? "<<
shortestSide / SPEED_OF_LIGHT / DELTA_T << std::endl;
log<picLog::PHYSICS >("max weighting %1%") % NUM_EL_PER_PARTICLE;

log<picLog::PHYSICS >("Courant dt <= %1% ? %2% ") %
(SPEED_OF_LIGHT/math::sqrt(INV_CELL2_SUM)) %
(SPEED_OF_LIGHT * DELTA_T);

if (gasProfile::GAS_ENABLED)
std::cout << "omega_pe * dt <= 0.1 ? " << sqrt(GAS_DENSITY * Q_EL / M_EL * Q_EL / EPS0) * DELTA_T << std::endl;
log<picLog::PHYSICS >("omega_pe * dt <= 0.1 ? %1%") %
(sqrt(GAS_DENSITY * Q_EL / M_EL * Q_EL / EPS0) * DELTA_T);
if (laserProfile::INIT_TIME > float_X(0.0))
std::cout << "y-cells per wavelength: " << laserProfile::WAVE_LENGTH / CELL_HEIGHT << std::endl;
log<picLog::PHYSICS >("y-cells per wavelength: %1%") %
(laserProfile::WAVE_LENGTH / CELL_HEIGHT);
const int localNrOfCells = cellDescription->getGridLayout().getDataSpaceWithoutGuarding().productOfComponents();
std::cout << "macro particles per gpu: "
<< localNrOfCells * particleInit::NUM_PARTICLES_PER_CELL * (1 + 1 * ENABLE_IONS) << std::endl;
std::cout << "typical macro particle weighting: " << NUM_EL_PER_PARTICLE << std::endl;
log<picLog::PHYSICS >("macro particles per gpu: %1%") %
(localNrOfCells * particleInit::NUM_PARTICLES_PER_CELL * (1 + 1 * ENABLE_IONS));
log<picLog::PHYSICS >("typical macro particle weighting: %1%") % (NUM_EL_PER_PARTICLE);

//const float_X y_R = M_PI * laserProfile::W0 * laserProfile::W0 / laserProfile::WAVE_LENGTH; //rayleigh length (in y-direction)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible that you delete the dead code in this pull.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be quite cool to put this in depending on the selected laser profile (works only for gaussian beam). but I didn't think it fully through yet. can we leave it in for now?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we can^^

//std::cout << "focus/y_Rayleigh: " << laserProfile::FOCUS_POS / y_R << std::endl;

std::cout << "UNIT_SPEED" << " " << UNIT_SPEED << std::endl;
std::cout << "UNIT_TIME" << " " << UNIT_TIME << std::endl;
std::cout << "UNIT_LENGTH" << " " << UNIT_LENGTH << std::endl;
std::cout << "UNIT_MASS" << " " << UNIT_MASS << std::endl;
std::cout << "UNIT_CHARGE" << " " << UNIT_CHARGE << std::endl;
std::cout << "UNIT_EFIELD" << " " << UNIT_EFIELD << std::endl;
std::cout << "UNIT_BFIELD" << " " << UNIT_BFIELD << std::endl;
std::cout << "UNIT_ENERGY" << " " << UNIT_ENERGY << std::endl;

#if (ENABLE_HDF5==1)
// check for HDF5 restart capability
typedef typename boost::mpl::find<FileOutputFields, FieldE>::type itFindFieldE;
typedef typename boost::mpl::find<FileOutputFields, FieldB>::type itFindFieldB;
typedef typename boost::mpl::end< FileOutputFields>::type itEnd;
const bool restartImpossible = (boost::is_same<itFindFieldE, itEnd>::value)
|| (boost::is_same<itFindFieldB, itEnd>::value);
if( restartImpossible )
{
std::cout << "WARNING: HDF5 restart impossible! (dump at least "
<< "FieldE and FieldB in hdf5Output.unitless)"
<< std::endl;
}
#endif
log<picLog::PHYSICS >("UNIT_SPEED %1%") % UNIT_SPEED;
log<picLog::PHYSICS >("UNIT_TIME %1%") % UNIT_TIME;
log<picLog::PHYSICS >("UNIT_LENGTH %1%") % UNIT_LENGTH;
log<picLog::PHYSICS >("UNIT_MASS %1%") % UNIT_MASS;
log<picLog::PHYSICS >("UNIT_CHARGE %1%") % UNIT_CHARGE;
log<picLog::PHYSICS >("UNIT_EFIELD %1%") % UNIT_EFIELD;
log<picLog::PHYSICS >("UNIT_BFIELD %1%") % UNIT_BFIELD;
log<picLog::PHYSICS >("UNIT_ENERGY %1%") % UNIT_ENERGY;
}
}

Expand Down
21 changes: 13 additions & 8 deletions src/picongpu/include/simulation_defines/unitless/gridConfig.unitless
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,20 @@ namespace picongpu
CONST_VECTOR(float_X,simDim,cellSize,CELL_WIDTH,CELL_HEIGHT,CELL_DEPTH);

#if (SIMDIM==DIM3)
const float_X CELL_VOLUME = CELL_WIDTH * CELL_HEIGHT *CELL_DEPTH;
/* Courant-Friedrichs-Levy-Condition for Field Solver: */
PMACC_CASSERT_MSG(Courant_Friedrichs_Levy_condition_failure____check_your_gridConfig_param_file,
(PMACC_MIN(CELL_DEPTH,PMACC_MIN(CELL_WIDTH,CELL_HEIGHT))/SPEED_OF_LIGHT/DELTA_T)>1.77f);
const float_X CELL_VOLUME = CELL_WIDTH * CELL_HEIGHT * CELL_DEPTH;
const float_X INV_CELL2_SUM = 1.0 / ( CELL_WIDTH * CELL_WIDTH )
+ 1.0 / ( CELL_HEIGHT * CELL_HEIGHT )
+ 1.0 / ( CELL_DEPTH * CELL_DEPTH );
#elif(SIMDIM==DIM2)
const float_X CELL_VOLUME = CELL_WIDTH * CELL_HEIGHT ;
/* Courant-Friedrichs-Levy-Condition for Field Solver: */
PMACC_CASSERT_MSG(Courant_Friedrichs_Levy_condition_failure____check_your_gridConfig_param_file,
(PMACC_MIN(CELL_WIDTH,CELL_HEIGHT)/SPEED_OF_LIGHT/DELTA_T)>1.77f);
const float_X CELL_VOLUME = CELL_WIDTH * CELL_HEIGHT;
const float_X INV_CELL2_SUM = 1.0 / ( CELL_WIDTH * CELL_WIDTH )
+ 1.0 / ( CELL_HEIGHT * CELL_HEIGHT );
#else
const float_X INV_CELL2_SUM = 1.0 / ( CELL_WIDTH * CELL_WIDTH );
#endif

/* Courant-Friedrichs-Levy-Condition for Yee Field Solver: */
PMACC_CASSERT_MSG(Courant_Friedrichs_Levy_condition_failure____check_your_gridConfig_param_file,
(SPEED_OF_LIGHT*SPEED_OF_LIGHT*DELTA_T*DELTA_T*INV_CELL2_SUM)<=1.0);

}