Skip to content

Commit

Permalink
More updates to string formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rory Barnes committed Aug 3, 2024
1 parent e039aa0 commit 31e2e24
Show file tree
Hide file tree
Showing 31 changed files with 994 additions and 978 deletions.
142 changes: 71 additions & 71 deletions src/atmesc.c
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions src/atmesc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,29 +177,29 @@ void InitializeOutputFunctionAtmEsc(OUTPUT *, int, int);
void FinalizeOutputFunctionAtmEsc(OUTPUT *, int, int);

void WriteSurfaceWaterMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteOxygenMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteOxygenMantleMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteEnvelopeMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteRGLimit(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *, int,
double *, char[]);
double *, char**);
void WriteBondiRadius(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteRocheRadius(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteOxygenMixingRatio(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteOxygenEta(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteAtmXAbsEffH2O(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteRRCriticalFlux(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteHEscapeRegime(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);

/* Logging Functions */
void LogOptionsAtmEsc(CONTROL *, FILE *);
Expand Down
68 changes: 34 additions & 34 deletions src/binary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,20 +1018,20 @@ void VerifyHaltBinary(BODY *body, CONTROL *control, OPTIONS *options, int iBody,

void WriteFreeEccBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {
// Note: Only makes sense for planets (iBodyType == 0)
if (body[iBody].iBodyType == 0) {
*dTmp = body[iBody].dFreeEcc;
} else {
*dTmp = -1;
}

fvFormattedString(&cUnit, "");
fvFormattedString(cUnit, "");
}

void WriteFreeIncBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {
// Note: Only makes sense for planets (iBodyType == 0)
if (body[iBody].iBodyType == 0) {
*dTmp = body[iBody].dFreeInc;
Expand All @@ -1041,7 +1041,7 @@ void WriteFreeIncBinary(BODY *body, CONTROL *control, OUTPUT *output,

if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsAngle(units->iAngle);
fsUnitsAngle(units->iAngle, cUnit);
Expand All @@ -1051,7 +1051,7 @@ void WriteFreeIncBinary(BODY *body, CONTROL *control, OUTPUT *output,
/** Write the binary primary star radial position */
void WriteBinPriRBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {

// Compute current binary true anomaly
double meanAnomaly = body[1].dMeanMotion * body[0].dAge + body[1].dLL13PhiAB;
Expand All @@ -1069,7 +1069,7 @@ void WriteBinPriRBinary(BODY *body, CONTROL *control, OUTPUT *output,
*dTmp = body[1].dMass * radius * dInvMass;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsLength(units->iLength);
fsUnitsLength(units->iLength, cUnit);
Expand All @@ -1079,7 +1079,7 @@ void WriteBinPriRBinary(BODY *body, CONTROL *control, OUTPUT *output,
/** Write the binary secondary star radial position */
void WriteBinSecRBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {

// Compute current binary true anomaly
double meanAnomaly = body[1].dMeanMotion * body[1].dAge + body[1].dLL13PhiAB;
Expand All @@ -1097,7 +1097,7 @@ void WriteBinSecRBinary(BODY *body, CONTROL *control, OUTPUT *output,
*dTmp = body[0].dMass * radius * dInvMass;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsLength(units->iLength);
fsUnitsLength(units->iLength, cUnit);
Expand All @@ -1107,7 +1107,7 @@ void WriteBinSecRBinary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteBinPriPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update,
int iBody, double *dTmp, char cUnit[]) {
int iBody, double *dTmp, char **cUnit) {

// Compute current binary true anomaly
double meanAnomaly = body[1].dMeanMotion * body[0].dAge + body[1].dLL13PhiAB;
Expand All @@ -1117,7 +1117,7 @@ void WriteBinPriPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,
*dTmp = fndEccToTrue(eccAnomaly, body[1].dEcc);
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsAngle(units->iAngle);
fsUnitsAngle(units->iAngle, cUnit);
Expand All @@ -1127,7 +1127,7 @@ void WriteBinPriPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteBinSecPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update,
int iBody, double *dTmp, char cUnit[]) {
int iBody, double *dTmp, char **cUnit) {

// Compute current binary true anomaly
double meanAnomaly = body[1].dMeanMotion * body[1].dAge + body[1].dLL13PhiAB;
Expand All @@ -1138,7 +1138,7 @@ void WriteBinSecPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,
*dTmp = fndEccToTrue(eccAnomaly, body[1].dEcc) + PI;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsAngle(units->iAngle);
fsUnitsAngle(units->iAngle, cUnit);
Expand All @@ -1148,7 +1148,7 @@ void WriteBinSecPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteCBPPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {
if (body[iBody].iBodyType == 0) {
*dTmp = body[iBody].dCBPPhi;
} else {
Expand All @@ -1157,7 +1157,7 @@ void WriteCBPPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,

if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsAngle(units->iAngle);
fsUnitsAngle(units->iAngle, cUnit);
Expand All @@ -1166,12 +1166,12 @@ void WriteCBPPhiBinary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteCBPPhiDotBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update,
int iBody, double *dTmp, char cUnit[]) {
int iBody, double *dTmp, char **cUnit) {

*dTmp = body[iBody].dCBPPhiDot;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp *= fdUnitsTime(units->iTime);
fsUnitsRate(units->iTime, cUnit);
Expand All @@ -1180,7 +1180,7 @@ void WriteCBPPhiDotBinary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteLL13N0Binary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {
// Note: Only applies to planets (iBodyType == 0)
if (body[iBody].iBodyType == 0) {
*dTmp = body[iBody].dLL13N0;
Expand All @@ -1190,7 +1190,7 @@ void WriteLL13N0Binary(BODY *body, CONTROL *control, OUTPUT *output,

if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp *= fdUnitsTime(units->iTime);
fsUnitsTime(units->iTime, cUnit);
Expand All @@ -1200,7 +1200,7 @@ void WriteLL13N0Binary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteLL13K0Binary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {
// Note: Only applies to planets (iBodyType == 0)
if (body[iBody].iBodyType == 0) {
*dTmp = body[iBody].dLL13K0;
Expand All @@ -1210,7 +1210,7 @@ void WriteLL13K0Binary(BODY *body, CONTROL *control, OUTPUT *output,

if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp *= fdUnitsTime(units->iTime);
fsUnitsTime(units->iTime, cUnit);
Expand All @@ -1219,7 +1219,7 @@ void WriteLL13K0Binary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteLL13V0Binary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {
// Note: Only applies to planets (iBodyType == 0)
if (body[iBody].iBodyType == 0) {
*dTmp = body[iBody].dLL13V0;
Expand All @@ -1229,7 +1229,7 @@ void WriteLL13V0Binary(BODY *body, CONTROL *control, OUTPUT *output,

if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp *= fdUnitsTime(units->iTime);
fsUnitsTime(units->iTime, cUnit);
Expand All @@ -1239,12 +1239,12 @@ void WriteLL13V0Binary(BODY *body, CONTROL *control, OUTPUT *output,
/** Write the circumbinary planet orbital radius (CBPR) */
void WriteCBPRBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {

*dTmp = body[iBody].dCBPR;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsLength(units->iLength);
fsUnitsLength(units->iLength, cUnit);
Expand All @@ -1254,12 +1254,12 @@ void WriteCBPRBinary(BODY *body, CONTROL *control, OUTPUT *output,
/** Write the circumbinary planet guiding radius (CBPR0) */
void WriteCBPR0Binary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {

*dTmp = body[iBody].dR0;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsLength(units->iLength);
fsUnitsLength(units->iLength, cUnit);
Expand All @@ -1268,12 +1268,12 @@ void WriteCBPR0Binary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteCBPZBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {

*dTmp = body[iBody].dCBPZ;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp /= fdUnitsLength(units->iLength);
fsUnitsLength(units->iLength, cUnit);
Expand All @@ -1282,12 +1282,12 @@ void WriteCBPZBinary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteCBPRDotBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {

*dTmp = body[iBody].dCBPRDot;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp *= fdUnitsTime(units->iTime) / fdUnitsLength(units->iLength);
fsUnitsVel(units, cUnit);
Expand All @@ -1296,12 +1296,12 @@ void WriteCBPRDotBinary(BODY *body, CONTROL *control, OUTPUT *output,

void WriteCBPZDotBinary(BODY *body, CONTROL *control, OUTPUT *output,
SYSTEM *system, UNITS *units, UPDATE *update, int iBody,
double *dTmp, char cUnit[]) {
double *dTmp, char **cUnit) {

*dTmp = body[iBody].dCBPZDot;
if (output->bDoNeg[iBody]) {
*dTmp *= output->dNeg;
fvFormattedString(&cUnit, output->cNeg);
fvFormattedString(cUnit, output->cNeg);
} else {
*dTmp *= fdUnitsTime(units->iTime) / fdUnitsLength(units->iLength);
fsUnitsVel(units, cUnit);
Expand All @@ -1312,7 +1312,7 @@ void WriteCBPZDotBinary(BODY *body, CONTROL *control, OUTPUT *output,
orbit assuming P_bin << P_cbp */
void WriteCBPInsol(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system,
UNITS *units, UPDATE *update, int iBody, double *dTmp,
char cUnit[]) {
char **cUnit) {

// Make sure that this is a planet, if not, -1
if (iBody < 2 || body[iBody].iBodyType != 0) {
Expand All @@ -1322,7 +1322,7 @@ void WriteCBPInsol(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system,
}

// Always in units of insolation received by Earth
fvFormattedString(&cUnit, "F/F_Earth");
fvFormattedString(cUnit, "F/F_Earth");
}

void InitializeOutputBinary(OUTPUT *output, fnWriteOutput fnWrite[]) {
Expand Down
34 changes: 17 additions & 17 deletions src/binary.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,39 +122,39 @@ void InitializeOutputFunctionBinary(OUTPUT *, int, int);
void InitializeOutputBinary(OUTPUT *, fnWriteOutput[]);
void FinalizeOutputFunctionBinary(OUTPUT *, int, int);
void WriteFreeEccBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteFreeIncBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteLL13N0Binary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteLL13K0Binary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteLL13V0Binary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteCBPRBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteCBPR0Binary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteBinPriRBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteBinPriPhiBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteBinSecRBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteBinSecPhiBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteCBPZBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteCBPZDotBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteCBPPhiBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);
void WriteCBPRDotBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteCBPPhiDotBinary(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
UPDATE *, int, double *, char[]);
UPDATE *, int, double *, char**);
void WriteCBPInsol(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
int, double *, char[]);
int, double *, char**);

/* Logging Functions */
void LogOptionsBinary(CONTROL *, FILE *);
Expand Down
Loading

0 comments on commit 31e2e24

Please sign in to comment.