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 typo, and then replace other ratio computations #28

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Fix typo, and then replace other ratio computations #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions glue-codes/openfast-cpp/src/OpenFAST.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ inline void check_nc_error(int code, std::string msg) {

int fast::OpenFAST::AbortErrLev = ErrID_Fatal; // abort error level; compare with NWTC Library

int time_step_ratio(double fastDt, double driverDt, double epsFactor=1e-6)
{
// ensure that the ratio is robust to integer conversion by making sure it will always truncate down
// provide an epsilon that is small relative to dtFast to help with integer conversion
const double eps = driverDt*epsFactor;
return static_cast<int>((driverDt*eps)/fastDt);
}

//Constructor
fast::fastInputs::fastInputs():
nTurbinesGlob(0),
Expand Down Expand Up @@ -1259,7 +1267,7 @@ void fast::OpenFAST::advance_to_next_driver_time_step(bool writeFiles) {

if (writeFiles) {
for (int iTurb=0; iTurb < nTurbinesProc; iTurb++) {
int tStepRatio = dtDriver/dtFAST;
int tStepRatio = time_step_ratio(dtFAST, dtDriver);
if ( (restartFreq_*tStepRatio > 0) && (((nt_global - ntStart) % (restartFreq_*tStepRatio)) == 0 ) && (nt_global != ntStart) ) {
turbineData[iTurb].FASTRestartFileName = " "; // if blank, it will use FAST convention <RootName>.nt_global
FAST_CreateCheckpoint(&iTurb, turbineData[iTurb].FASTRestartFileName.data(), &ErrStat, ErrMsg);
Expand Down Expand Up @@ -1419,11 +1427,8 @@ void fast::OpenFAST::step(bool writeFiles) {
}

if (writeFiles) {
// provide an epsilon that is small relative to dtFast to help with integer conversion
const double eps = dtFast*1e-6;
int tStepRatio = time_step_ratio(dtFAST, dtFAST);
for (int iTurb=0; iTurb < nTurbinesProc; iTurb++) {
// ensure that the ratio is robust to integer conversion by making sure it will always truncate down
int tStepRatio = static_cast<int>((dtDriver+eps)/dtFAST);
if ( (((nt_global - ntStart) % (restartFreq_ * tStepRatio)) == 0 ) && (nt_global != ntStart) ) {
turbineData[iTurb].FASTRestartFileName = " "; // if blank, it will use FAST convention <RootName>.nt_global
FAST_CreateCheckpoint(&iTurb, turbineData[iTurb].FASTRestartFileName.data(), &ErrStat, ErrMsg);
Expand Down Expand Up @@ -1493,7 +1498,7 @@ int fast::OpenFAST::checkAndSetSubsteps() {
}
}
if (dtFAST > 0) {
int tStepRatio = dtDriver/dtFAST;
int tStepRatio = time_step_ratio(dtFAST, dtDriver);
if (std::abs(dtDriver - tStepRatio * dtFAST) < 0.001) {// TODO: Fix arbitrary number 0.001
nSubsteps_ = tStepRatio;
return 1;
Expand Down Expand Up @@ -2523,7 +2528,7 @@ void fast::OpenFAST::writeOutputFile(int iTurbLoc, int n_t_global) {
check_nc_error(ierr, "nc_open");

size_t count1=1;
int tStepRatio = dtDriver/dtFAST;
int tStepRatio = time_step_ratio(dtFAST, dtDriver);
size_t n_tsteps = n_t_global/tStepRatio/outputFreq_ - 1;
double curTime = n_t_global * dtFAST;
ierr = nc_put_vara_double(ncid, ncOutVarIDs_["time"], &n_tsteps, &count1, &curTime);
Expand Down Expand Up @@ -2818,7 +2823,7 @@ void fast::OpenFAST::writeRestartFile(int iTurbLoc, int n_t_global) {
check_nc_error(ierr, "nc_open");

size_t count1=1;
int tStepRatio = dtDriver/dtFAST;
int tStepRatio = time_step_ratio(dtFAST, dtDriver);
size_t n_tsteps = n_t_global/tStepRatio/restartFreq_ - 1;
double curTime = n_t_global * dtFAST;
ierr = nc_put_vara_double(ncid, ncRstVarIDs_["time"], &n_tsteps, &count1, &curTime);
Expand Down
Loading