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

Precession and memory fixes in DistRot for ReadOrbitData use #275

Merged
merged 12 commits into from
Mar 2, 2024
Merged

Precession and memory fixes in DistRot for ReadOrbitData use #275

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
beb9b37
tmp fix of log issue in flare.c
deitrr Aug 18, 2023
2cb0242
resolved conflict in flare.c
deitrr Aug 18, 2023
cfe98d8
Merge branch 'main' of https://github.com/VirtualPlanetaryLaboratory/…
deitrr Aug 28, 2023
1d58447
Merge pull request #1 from VirtualPlanetaryLaboratory/main
deitrr Jan 2, 2024
03dc5db
Merge branch 'main' of github.com:VirtualPlanetaryLaboratory/vplanet …
Feb 14, 2024
afa0fb9
Merge branch 'main' of https://github.com/VirtualPlanetaryLaboratory/…
deitrr Feb 14, 2024
ed94e53
fixed distrot so that forced precession rate can be used with read in…
deitrr Feb 15, 2024
44d06e2
Merge branch 'main' of github.com:deitrr/vplanet
deitrr Feb 15, 2024
7c4a07f
fixed incorrect allocation of Zobl arrays in distrot for ReadOrbitDat…
Feb 15, 2024
e707373
Merge branch 'main' of github.com:deitrr/vplanet into main
Feb 15, 2024
cb96a57
fixed conflict with vplanet fork in flare.c, (super annoying but I ca…
deitrr Mar 1, 2024
69e6ab5
one more try
deitrr Mar 1, 2024
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
50 changes: 35 additions & 15 deletions src/distrot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,9 @@ void VerifyOrbitData(BODY *body, CONTROL *control, OPTIONS *options,
}
// Check file has exactly 7 columns
if (fgets(cLine, LINE, fileorb) == NULL) {
fprintf(stderr,"ERROR: Unable to read line from orbit data file.");
fprintf(stderr, "ERROR: Unable to read line from orbit data file.");
exit(EXIT_INPUT);
}
}
GetWords(cLine, cFoo, &iNumColsFound, &bFoo);
if (iNumCols != iNumColsFound) {
if (control->Io.iVerbose >= VERBERR) {
Expand Down Expand Up @@ -459,10 +459,10 @@ void VerifyOrbitData(BODY *body, CONTROL *control, OPTIONS *options,

iLine = 0;
while (feof(fileorb) == 0) {
if (fscanf(fileorb, "%lf %lf %lf %lf %lf %lf %lf\n", &dttmp, &datmp, &detmp,
&ditmp, &daptmp, &dlatmp, &dmatmp) != 7) {
fprintf(stderr,"ERROR: Incorrect number of columns in orbit file.");
exit(EXIT_INPUT);
if (fscanf(fileorb, "%lf %lf %lf %lf %lf %lf %lf\n", &dttmp, &datmp,
&detmp, &ditmp, &daptmp, &dlatmp, &dmatmp) != 7) {
fprintf(stderr, "ERROR: Incorrect number of columns in orbit file.");
exit(EXIT_INPUT);
}
body[iBody].daTimeSeries[iLine] =
dttmp * fdUnitsTime(control->Units[iBody + 1].iTime);
Expand Down Expand Up @@ -907,12 +907,20 @@ void FinalizeUpdateZoblDistRot(BODY *body, UPDATE *update, int *iEqn, int iVar,
int iBody, int iFoo) {
int iPert;

update[iBody].padDZoblDtDistRot =
malloc((body[iBody].iGravPerts) * sizeof(double *));
update[iBody].iaZoblDistRot = malloc((body[iBody].iGravPerts) * sizeof(int));
for (iPert = 0; iPert < body[iBody].iGravPerts; iPert++) {
if (body[iBody].bReadOrbitData) {
update[iBody].padDZoblDtDistRot = malloc(1 * sizeof(double *));
update[iBody].iaZoblDistRot = malloc(1 * sizeof(int));
update[iBody].iaModule[iVar][*iEqn] = DISTROT;
update[iBody].iaZoblDistRot[iPert] = (*iEqn)++;
update[iBody].iaZoblDistRot[0] = (*iEqn)++;
} else {
update[iBody].padDZoblDtDistRot =
malloc((body[iBody].iGravPerts) * sizeof(double *));
update[iBody].iaZoblDistRot =
malloc((body[iBody].iGravPerts) * sizeof(int));
for (iPert = 0; iPert < body[iBody].iGravPerts; iPert++) {
update[iBody].iaModule[iVar][*iEqn] = DISTROT;
update[iBody].iaZoblDistRot[iPert] = (*iEqn)++;
}
}
}

Expand Down Expand Up @@ -2110,13 +2118,19 @@ external model
@return Derivative dx/dt
*/
double fndDistRotExtDxDt(BODY *body, SYSTEM *system, int *iaBody) {
double y;
double y, dprec;
y = fabs(1.0 - (body[iaBody[0]].dXobl * body[iaBody[0]].dXobl) -
(body[iaBody[0]].dYobl * body[iaBody[0]].dYobl));

if (body[iaBody[0]].bForcePrecRate == 0) {
dprec = fndCentralTorqueR(body, iaBody[0]);
} else {
dprec = body[iaBody[0]].dPrecRate;
}

return fndObliquityAExt(body, system, iaBody) * sqrt(y) +
body[iaBody[0]].dYobl * 2. * fndObliquityCExt(body, system, iaBody) -
body[iaBody[0]].dYobl * fndCentralTorqueR(body, iaBody[0]);
body[iaBody[0]].dYobl * dprec;
}

/**
Expand All @@ -2128,13 +2142,19 @@ external model
@return Derivative dy/dt
*/
double fndDistRotExtDyDt(BODY *body, SYSTEM *system, int *iaBody) {
double y;
double y, dprec;
y = fabs(1.0 - (body[iaBody[0]].dXobl * body[iaBody[0]].dXobl) -
(body[iaBody[0]].dYobl * body[iaBody[0]].dYobl));

if (body[iaBody[0]].bForcePrecRate == 0) {
dprec = fndCentralTorqueR(body, iaBody[0]);
} else {
dprec = body[iaBody[0]].dPrecRate;
}

return -fndObliquityBExt(body, system, iaBody) * sqrt(y) -
body[iaBody[0]].dXobl * 2. * fndObliquityCExt(body, system, iaBody) +
body[iaBody[0]].dXobl * fndCentralTorqueR(body, iaBody[0]);
body[iaBody[0]].dXobl * dprec;
}

/**
Expand Down
Loading