diff --git a/src/atmesc.c b/src/atmesc.c index 62d8a66f1..04c687b55 100644 --- a/src/atmesc.c +++ b/src/atmesc.c @@ -1268,7 +1268,7 @@ void VerifyOxygenMass(BODY *body, OPTIONS *options, UPDATE *update, double dAge, update[iBody].iaType[update[iBody].iOxygenMass][0] = 1; update[iBody].iNumBodies[update[iBody].iOxygenMass][0] = 1; update[iBody].iaBody[update[iBody].iOxygenMass][0] = malloc( - update[iBody].iNumBodies[update[iBody].iOxygenMass][0] * sizeof(int)); + update[iBody].iNumBodies[update[iBody].iOxygenMass][0] * sizeof(int)); update[iBody].iaBody[update[iBody].iOxygenMass][0][0] = iBody; update[iBody].pdDOxygenMassDtAtmesc = @@ -1313,7 +1313,7 @@ void VerifyEnvelopeMass(BODY *body, OPTIONS *options, UPDATE *update, update[iBody].iaType[update[iBody].iEnvelopeMass][0] = 1; update[iBody].iNumBodies[update[iBody].iEnvelopeMass][0] = 1; update[iBody].iaBody[update[iBody].iEnvelopeMass][0] = malloc( - update[iBody].iNumBodies[update[iBody].iEnvelopeMass][0] * sizeof(int)); + update[iBody].iNumBodies[update[iBody].iEnvelopeMass][0] * sizeof(int)); update[iBody].iaBody[update[iBody].iEnvelopeMass][0][0] = iBody; update[iBody].pdDEnvelopeMassDtAtmesc = @@ -1399,7 +1399,7 @@ void VerifyRadiusAtmEsc(BODY *body, CONTROL *control, OPTIONS *options, update[iBody].iaType[update[iBody].iRadius][0] = 0; update[iBody].iNumBodies[update[iBody].iRadius][0] = 1; update[iBody].iaBody[update[iBody].iRadius][0] = malloc( - update[iBody].iNumBodies[update[iBody].iRadius][0] * sizeof(int)); + update[iBody].iNumBodies[update[iBody].iRadius][0] * sizeof(int)); update[iBody].iaBody[update[iBody].iRadius][0][0] = iBody; update[iBody].pdRadiusAtmesc = @@ -1692,20 +1692,20 @@ void fnForceBehaviorAtmEsc(BODY *body, MODULE *module, EVOLVE *evolve, IO *io, } } -void AuxPropsLehmer17(BODY *body,int iBody) { +void AuxPropsLehmer17(BODY *body, int iBody) { if (body[iBody].bAutoThermTemp) { - body[iBody].dThermTemp = fdThermalTemp(body, iBody); - } - body[iBody].dGravAccel = BIGG * - (body[iBody].dMass - body[iBody].dEnvelopeMass) / - (body[iBody].dRadSolid * body[iBody].dRadSolid); - body[iBody].dScaleHeight = body[iBody].dAtmGasConst * - body[iBody].dThermTemp / body[iBody].dGravAccel; - body[iBody].dPresSurf = - fdLehmerPres(body[iBody].dEnvelopeMass, body[iBody].dGravAccel, - body[iBody].dRadSolid); - body[iBody].dRadXUV = fdLehmerRadius(body, iBody); - body[iBody].dRadius = body[iBody].dRadXUV / body[iBody].dXFrac; + body[iBody].dThermTemp = fdThermalTemp(body, iBody); + } + body[iBody].dGravAccel = BIGG * + (body[iBody].dMass - body[iBody].dEnvelopeMass) / + (body[iBody].dRadSolid * body[iBody].dRadSolid); + body[iBody].dScaleHeight = body[iBody].dAtmGasConst * body[iBody].dThermTemp / + body[iBody].dGravAccel; + body[iBody].dPresSurf = + fdLehmerPres(body[iBody].dEnvelopeMass, body[iBody].dGravAccel, + body[iBody].dRadSolid); + body[iBody].dRadXUV = fdLehmerRadius(body, iBody); + body[iBody].dRadius = body[iBody].dRadXUV / body[iBody].dXFrac; } @@ -1724,14 +1724,14 @@ void fnPropsAuxAtmEsc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, int iBody) { if (body[iBody].iPlanetRadiusModel == ATMESC_LEHMER17) { - AuxPropsLehmer17(body,iBody); + AuxPropsLehmer17(body, iBody); } // Compute various radii of interest body[iBody].dBondiRadius = fdBondiRadius(body, iBody); body[iBody].dRocheRadius = fdRocheRadius(body, iBody); - body[iBody].dAtmEscXi = fdAtmEscXi(body, iBody); - body[iBody].dKTide = fdKTide(body, io, iBody); + body[iBody].dAtmEscXi = fdAtmEscXi(body, iBody); + body[iBody].dKTide = fdKTide(body, io, iBody); // The XUV flux if (body[iBody].bCalcFXUV) { @@ -1744,21 +1744,23 @@ void fnPropsAuxAtmEsc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, } // Reference hydrogen flux for the water loss - // LS2016 uses reference equation 6 in paper. 1.00784 factor changes ATOMMASS to mass of H (MTG) + // LS2016 uses reference equation 6 in paper. 1.00784 factor changes ATOMMASS + // to mass of H (MTG) if (body[iBody].iWaterLossModel == ATMESC_LS2016) { - body[iBody].dFHRef = - (body[iBody].dAtmXAbsEffH2O * body[iBody].dFXUV * body[iBody].dRadius) / - (4 * BIGG * body[iBody].dMass * PROTONMASS); + body[iBody].dFHRef = (body[iBody].dAtmXAbsEffH2O * body[iBody].dFXUV * + body[iBody].dRadius) / + (4 * BIGG * body[iBody].dMass * PROTONMASS); // Use Below for LBEXACT with MGs diff limited treatment - //body[iBody].dFHRef = - // (body[iBody].dAtmXAbsEffH2O * body[iBody].dFXUV * body[iBody].dRadius) / - //(4 * BIGG * body[iBody].dMass * body[iBody].dKTide * ATOMMASS); + // body[iBody].dFHRef = + // (body[iBody].dAtmXAbsEffH2O * body[iBody].dFXUV * body[iBody].dRadius) / + //(4 * BIGG * body[iBody].dMass * body[iBody].dKTide * ATOMMASS); } else { body[iBody].dFHRef = - (body[iBody].dAtmXAbsEffH2O * body[iBody].dFXUV * body[iBody].dRadius) / - (4 * BIGG * body[iBody].dMass * body[iBody].dKTide * ATOMMASS); + (body[iBody].dAtmXAbsEffH2O * body[iBody].dFXUV * + body[iBody].dRadius) / + (4 * BIGG * body[iBody].dMass * body[iBody].dKTide * ATOMMASS); } - + // Surface gravity double g = (BIGG * body[iBody].dMass) / @@ -1767,13 +1769,25 @@ void fnPropsAuxAtmEsc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, // Oxygen mixing ratio double XO = fdAtomicOxygenMixingRatio(body[iBody].dSurfaceWaterMass, body[iBody].dOxygenMass); - - // Calculate the free oxygen mixing ratio (not in water molecules) and water mixing for switch to diffusion later on (MTG) - double NFreeO = body[iBody].dOxygenMass / (32 * ATOMMASS); - double Nh2o = body[iBody].dSurfaceWaterMass / (18 * ATOMMASS); - double XFreeO = (2 * NFreeO) / ((2 * NFreeO) + (Nh2o)); - double Xh2o = Nh2o / ((2 * NFreeO) + (Nh2o)); - double Xcompare = Xh2o; // the mixing ratio XFreeO must be equal to or greater than for diffusion lim esc + + // Calculate the free oxygen mixing ratio (not in water molecules) and water + // mixing for switch to diffusion later on (MTG) + // XXX Hack until this function can be refactored! + double NFreeO, Nh2o, XFreeO, Xh2o, Xcompare; + if (body[iBody].dSurfaceWaterMass > 0) { + NFreeO = body[iBody].dOxygenMass / (32 * ATOMMASS); + Nh2o = body[iBody].dSurfaceWaterMass / (18 * ATOMMASS); + XFreeO = (2 * NFreeO) / ((2 * NFreeO) + (Nh2o)); + Xh2o = Nh2o / ((2 * NFreeO) + (Nh2o)); + Xcompare = Xh2o; // the mixing ratio XFreeO must be equal to or greater than + // for diffusion lim esc + } else { + NFreeO = 0; + Nh2o = 0; + XFreeO = 0; + Xh2o = 0; + Xcompare = 0; + } // Diffusion-limited H escape rate double BDIFF = 4.8e19 * pow(body[iBody].dFlowTemp, 0.75); @@ -1878,12 +1892,14 @@ void fnPropsAuxAtmEsc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, ((1 + XO * (QOH - 1)) * BDIFF * g); } - double GPotential = (BIGG * body[iBody].dMass * PROTONMASS)/(body[iBody].dRadius); + double GPotential = + (BIGG * body[iBody].dMass * PROTONMASS) / (body[iBody].dRadius); + + double FXUVCritDrag = ((4 * BDIFF * pow(GPotential, 2)) / + (body[iBody].dAtmXAbsEffH2O * KBOLTZ * + body[iBody].dFlowTemp * body[iBody].dRadius)) * + (QOH - 1) * (1 - XO); - double FXUVCritDrag = ((4 * BDIFF * pow(GPotential, 2)) / - (body[iBody].dAtmXAbsEffH2O * KBOLTZ * body[iBody].dFlowTemp * body[iBody].dRadius)) * - (QOH - 1) * (1 - XO); - if ((body[iBody].dCrossoverMass >= OXYMASS) && (body[iBody].dFXUV >= FXUVCritDrag)) { rat = (body[iBody].dCrossoverMass / ATOMMASS - QOH) / @@ -1895,26 +1911,28 @@ void fnPropsAuxAtmEsc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, rat = ((body[iBody].dCrossoverMass / ATOMMASS) - QOH) / ((body[iBody].dCrossoverMass / ATOMMASS) - 1.); body[iBody].dOxygenEta = 0; - } - + } + // Eq 5 Schaefer 2016 - // body[iBody].dCrossoverMass = - // ATOMMASS + ((KBOLTZ * body[iBody].dFlowTemp * body[iBody].dFHRef) / (BDIFF * g * (1-XO))); - // Critical FXUV for drag to occur: (drag now requires u2 < uc and FXUV >= FXUVCritDrag) - /**double FXUVCritDrag = ((4 * BDIFF * pow(HPOT2, 2)) / - (body[iBody].dAtmXAbsEffH2O * KBOLTZ * body[iBody].dFlowTemp * body[iBody].dRadius)) * - (QOH - 1) * (1 - XO); - + // body[iBody].dCrossoverMass = + // ATOMMASS + ((KBOLTZ * body[iBody].dFlowTemp * body[iBody].dFHRef) + // / (BDIFF * g * (1-XO))); + // Critical FXUV for drag to occur: (drag now requires u2 < uc and FXUV >= + // FXUVCritDrag) + /**double FXUVCritDrag = ((4 * BDIFF * pow(HPOT2, 2)) / + (body[iBody].dAtmXAbsEffH2O * KBOLTZ * body[iBody].dFlowTemp * + body[iBody].dRadius)) * (QOH - 1) * (1 - XO); + if ((body[iBody].dCrossoverMass >= OXYMASS) && (body[iBody].dFXUV >= FXUVCritDrag)) { //double aa = KBOLTZ * body[iBody].dFlowTemp * body[iBody].dFHRef; //double bb = (15*ATOMMASS) * BDIFF * g * XO * (1 - XO); - //body[iBody].dOxygenEta = (((aa * XO) - bb) / ((aa * (1-XO)) + (QOH*bb))); - double bigY = (KBOLTZ * body[iBody].dFlowTemp * body[iBody].dFHRef) / + //body[iBody].dOxygenEta = (((aa * XO) - bb) / ((aa * (1-XO)) + + (QOH*bb))); double bigY = (KBOLTZ * body[iBody].dFlowTemp * + body[iBody].dFHRef) / ((QOH - 1) * BDIFF * g * (1-XO) * ATOMMASS); - body[iBody].dOxygenEta = ((bigY - 1) / ((bigY * ((1 - XO) / XO)) + QOH)); - if (body[iBody].dOxygenEta > 0.5){ - body[iBody].dOxygenEta = 0.5; + body[iBody].dOxygenEta = ((bigY - 1) / ((bigY * ((1 - XO) / XO)) + + QOH)); if (body[iBody].dOxygenEta > 0.5){ body[iBody].dOxygenEta = 0.5; } FH = body[iBody].dFHRef / (1 + (QOH * (body[iBody].dOxygenEta))); body[iBody].dOxygenEta = body[iBody].dOxygenEta*2; @@ -1922,10 +1940,9 @@ void fnPropsAuxAtmEsc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, body[iBody].dOxygenEta = 0; FH = body[iBody].dFHRef; }*/ - } - //if ((XO > 0.6) && (body[iBody].iWaterLossModel == ATMESC_LBEXACT)) { + // if ((XO > 0.6) && (body[iBody].iWaterLossModel == ATMESC_LBEXACT)) { if ((body[iBody].dOxygenEta > 1) && (body[iBody].iWaterLossModel == ATMESC_LBEXACT)) { // Schaefer et al. (2016) prescription, section 2.2 @@ -1937,29 +1954,30 @@ void fnPropsAuxAtmEsc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, body[iBody].dFHDiffLim * (4 * ATOMMASS * PI * body[iBody].dRadius * body[iBody].dRadius * body[iBody].dXFrac * body[iBody].dXFrac); - //} else if ((XO <= 0.6) && (body[iBody].iWaterLossModel == ATMESC_LBEXACT)) { + //} else if ((XO <= 0.6) && (body[iBody].iWaterLossModel == + // ATMESC_LBEXACT)) { } else if ((body[iBody].dOxygenEta <= 1) && (body[iBody].iWaterLossModel == ATMESC_LBEXACT)) { // In the Tian model, oxygen escapes when it's the dominant species. I // think this is wrong... body[iBody].iWaterEscapeRegime = ATMESC_ELIM; - body[iBody].dMDotWater = - FH * - (4 * ATOMMASS * PI * body[iBody].dRadius * body[iBody].dRadius * - body[iBody].dXFrac * body[iBody].dXFrac); - } else if ((XFreeO >= Xcompare) && (body[iBody].iWaterLossModel == ATMESC_LS2016)) { + body[iBody].dMDotWater = FH * (4 * ATOMMASS * PI * body[iBody].dRadius * + body[iBody].dRadius * body[iBody].dXFrac * + body[iBody].dXFrac); + } else if ((XFreeO >= Xcompare) && + (body[iBody].iWaterLossModel == ATMESC_LS2016)) { body[iBody].iWaterEscapeRegime = ATMESC_DIFFLIM; - body[iBody].dOxygenEta = 0; + body[iBody].dOxygenEta = 0; body[iBody].dMDotWater = body[iBody].dFHDiffLim * (4 * ATOMMASS * PI * body[iBody].dRadius * body[iBody].dRadius * body[iBody].dXFrac * body[iBody].dXFrac); - } else if ((XFreeO < Xcompare) && (body[iBody].iWaterLossModel == ATMESC_LS2016)) { + } else if ((XFreeO < Xcompare) && + (body[iBody].iWaterLossModel == ATMESC_LS2016)) { body[iBody].iWaterEscapeRegime = ATMESC_ELIM; - body[iBody].dMDotWater = - FH * - (4 * ATOMMASS * PI * body[iBody].dRadius * body[iBody].dRadius * - body[iBody].dXFrac * body[iBody].dXFrac); + body[iBody].dMDotWater = FH * (4 * ATOMMASS * PI * body[iBody].dRadius * + body[iBody].dRadius * body[iBody].dXFrac * + body[iBody].dXFrac); } else { // In the Tian model, oxygen escapes when it's the dominant species. I // think this is wrong... @@ -2210,22 +2228,29 @@ void VerifyAtmEsc(BODY *body, CONTROL *control, FILES *files, OPTIONS *options, // If more than one is set, let the user know what's wrong and quit. if (iRegimeCounter > 1) { - fprintf(stderr, + if (control->Io.iVerbose >= VERBINPUT) { + fprintf( + stderr, "ERROR: Multiple H envelope atmospheric regimes are enabled for " "body %s!\n", body[iBody].cName); - fprintf(stderr, "\tbUseEnergyLimited = %d\n", - body[iBody].bUseEnergyLimited); - fprintf(stderr, "\tbUseRRLimited = %d\n", body[iBody].bUseRRLimited); - fprintf(stderr, "\tbUseBondiLimited = %d\n", - body[iBody].bUseBondiLimited); - fprintf(stderr, "\tbAtmEscAuto = %d\n", body[iBody].bAtmEscAuto); + fprintf(stderr, "\tbUseEnergyLimited = %d\n", + body[iBody].bUseEnergyLimited); + fprintf(stderr, "\tbUseRRLimited = %d\n", body[iBody].bUseRRLimited); + fprintf(stderr, "\tbUseBondiLimited = %d\n", + body[iBody].bUseBondiLimited); + fprintf(stderr, "\tbAtmEscAuto = %d\n", body[iBody].bAtmEscAuto); + } exit(EXIT_INPUT); } else if (iRegimeCounter == 0) { - fprintf(stderr, "WARNING: No H envelope escape regime set for body %s!\n", - body[iBody].cName); - fprintf(stderr, + if (control->Io.iVerbose >= VERBINPUT) { + fprintf(stderr, + "WARNING: No H envelope escape regime set for body %s!\n", + body[iBody].cName); + fprintf( + stderr, "Defaulting to energy-limited escape: bUseEnergyLimited = 1.\n"); + } body[iBody].bUseEnergyLimited = 1; } @@ -3275,8 +3300,8 @@ Logs the crossover mass. @param cUnit The unit for this variable */ void WriteCrossoverMass(BODY *body, CONTROL *control, OUTPUT *output, - SYSTEM *system, UNITS *units, UPDATE *update, int iBody, - double *dTmp, char cUnit[]) { + SYSTEM *system, UNITS *units, UPDATE *update, int iBody, + double *dTmp, char cUnit[]) { *dTmp = body[iBody].dCrossoverMass; if (output->bDoNeg[iBody]) { @@ -3302,8 +3327,8 @@ Logs the Water escape regime @param cUnit The unit for this variable */ void WriteWaterEscapeRegime(BODY *body, CONTROL *control, OUTPUT *output, - SYSTEM *system, UNITS *units, UPDATE *update, int iBody, - double *dTmp, char cUnit[]) { + SYSTEM *system, UNITS *units, UPDATE *update, + int iBody, double *dTmp, char cUnit[]) { *dTmp = body[iBody].iWaterEscapeRegime; strcpy(cUnit, ""); } @@ -3322,17 +3347,19 @@ Logs the XUV flux received by the planet. @param dTmp Temporary variable used for unit conversions @param cUnit The unit for this variable */ -void WriteFXUVCRITDRAG(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, - UNITS *units, UPDATE *update, int iBody, double *dTmp, - char cUnit[]) { +void WriteFXUVCRITDRAG(BODY *body, CONTROL *control, OUTPUT *output, + SYSTEM *system, UNITS *units, UPDATE *update, int iBody, + double *dTmp, char cUnit[]) { double BDIFF = 4.8e19 * pow(body[iBody].dFlowTemp, 0.75); - double XO = fdAtomicOxygenMixingRatio(body[iBody].dSurfaceWaterMass, - body[iBody].dOxygenMass); - double GPotential = (BIGG * body[iBody].dMass * PROTONMASS)/(body[iBody].dRadius); - - *dTmp = ((4 * BDIFF * pow(GPotential, 2)) / - (body[iBody].dAtmXAbsEffH2O * KBOLTZ * body[iBody].dFlowTemp * body[iBody].dRadius)) * - (QOH - 1) * (1 - XO); + double XO = fdAtomicOxygenMixingRatio(body[iBody].dSurfaceWaterMass, + body[iBody].dOxygenMass); + double GPotential = + (BIGG * body[iBody].dMass * PROTONMASS) / (body[iBody].dRadius); + + *dTmp = ((4 * BDIFF * pow(GPotential, 2)) / + (body[iBody].dAtmXAbsEffH2O * KBOLTZ * body[iBody].dFlowTemp * + body[iBody].dRadius)) * + (QOH - 1) * (1 - XO); if (output->bDoNeg[iBody]) { *dTmp *= output->dNeg; strcpy(cUnit, output->cNeg); @@ -3354,15 +3381,16 @@ Logs the Hydrogen Reference Flux @param dTmp Temporary variable used for unit conversions @param cUnit The unit for this variable */ -void WriteHREFFLUX(BODY *body, CONTROL *control, OUTPUT *output, - SYSTEM *system, UNITS *units, UPDATE *update, int iBody, - double *dTmp, char cUnit[]) { +void WriteHREFFLUX(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, + UNITS *units, UPDATE *update, int iBody, double *dTmp, + char cUnit[]) { *dTmp = body[iBody].dFHRef; strcpy(cUnit, "m^-2 s^-1"); } /** -Logs the H flux if it was diffusion limited (or the true flux in the diffusion limited regime) +Logs the H flux if it was diffusion limited (or the true flux in the diffusion +limited regime) @param body A pointer to the current BODY instance @param control A pointer to the current CONTROL instance @@ -3375,8 +3403,8 @@ Logs the H flux if it was diffusion limited (or the true flux in the diffusion l @param cUnit The unit for this variable */ void WriteHDiffLimFlux(BODY *body, CONTROL *control, OUTPUT *output, - SYSTEM *system, UNITS *units, UPDATE *update, int iBody, - double *dTmp, char cUnit[]) { + SYSTEM *system, UNITS *units, UPDATE *update, int iBody, + double *dTmp, char cUnit[]) { *dTmp = body[iBody].dFHDiffLim; strcpy(cUnit, "m^-2 s^-1"); } @@ -3395,13 +3423,13 @@ Modifier for H Ref Flux to include oxygen drag at a snapshot in time @param cUnit The unit for this variable */ void WriteHRefODragMod(BODY *body, CONTROL *control, OUTPUT *output, - SYSTEM *system, UNITS *units, UPDATE *update, int iBody, - double *dTmp, char cUnit[]) { + SYSTEM *system, UNITS *units, UPDATE *update, int iBody, + double *dTmp, char cUnit[]) { double rat = (body[iBody].dCrossoverMass / ATOMMASS - QOH) / - (body[iBody].dCrossoverMass / ATOMMASS - 1.); + (body[iBody].dCrossoverMass / ATOMMASS - 1.); double XO = fdAtomicOxygenMixingRatio(body[iBody].dSurfaceWaterMass, body[iBody].dOxygenMass); - *dTmp = pow(1. + (XO / (1. - XO)) * QOH * rat, -1); + *dTmp = pow(1. + (XO / (1. - XO)) * QOH * rat, -1); strcpy(cUnit, ""); } @@ -3420,10 +3448,10 @@ Logs the molecular oxygen mixing ratio. @param cUnit The unit for this variable */ void WriteMolecOxygenMixingRatio(BODY *body, CONTROL *control, OUTPUT *output, - SYSTEM *system, UNITS *units, UPDATE *update, - int iBody, double *dTmp, char cUnit[]) { + SYSTEM *system, UNITS *units, UPDATE *update, + int iBody, double *dTmp, char cUnit[]) { *dTmp = fdMolecOxygenMixingRatio(body[iBody].dSurfaceWaterMass, - body[iBody].dOxygenMass); + body[iBody].dOxygenMass); strcpy(cUnit, ""); } @@ -3441,10 +3469,10 @@ Logs the water mixing ratio. @param cUnit The unit for this variable */ void WriteWaterAtmMixingRatio(BODY *body, CONTROL *control, OUTPUT *output, - SYSTEM *system, UNITS *units, UPDATE *update, - int iBody, double *dTmp, char cUnit[]) { + SYSTEM *system, UNITS *units, UPDATE *update, + int iBody, double *dTmp, char cUnit[]) { *dTmp = fdWaterAtmMixingRatio(body[iBody].dSurfaceWaterMass, - body[iBody].dOxygenMass); + body[iBody].dOxygenMass); strcpy(cUnit, ""); } @@ -3664,7 +3692,8 @@ void InitializeOutputAtmEsc(OUTPUT *output, fnWriteOutput fnWrite[]) { /** Megan addition: crossover mass */ sprintf(output[OUT_CROSSOVERMASS].cName, "CrossoverMass"); - sprintf(output[OUT_CROSSOVERMASS].cDescr, "Crossover mass, defines oxygen is escaping if mc > mo"); + sprintf(output[OUT_CROSSOVERMASS].cDescr, + "Crossover mass, defines oxygen is escaping if mc > mo"); sprintf(output[OUT_CROSSOVERMASS].cNeg, "amu"); output[OUT_CROSSOVERMASS].bNeg = 1; output[OUT_CROSSOVERMASS].dNeg = 1. / ATOMMASS; @@ -3674,7 +3703,8 @@ void InitializeOutputAtmEsc(OUTPUT *output, fnWriteOutput fnWrite[]) { /** Megan addition: water escape regime */ sprintf(output[OUT_WATERESCAPEREGIME].cName, "WaterEscapeRegime"); - sprintf(output[OUT_WATERESCAPEREGIME].cDescr, "What water escape regime the code is currently in"); + sprintf(output[OUT_WATERESCAPEREGIME].cDescr, + "What water escape regime the code is currently in"); output[OUT_WATERESCAPEREGIME].bNeg = 0; output[OUT_WATERESCAPEREGIME].iNum = 1; output[OUT_WATERESCAPEREGIME].iModuleBit = ATMESC; @@ -3682,7 +3712,8 @@ void InitializeOutputAtmEsc(OUTPUT *output, fnWriteOutput fnWrite[]) { /** Megan addition: modifier to H ref flux to include O drag */ sprintf(output[OUT_HREFODRAGMOD].cName, "HRefODragMod"); - sprintf(output[OUT_HREFODRAGMOD].cDescr, "Multiply by H ref flux to get flux with drag"); + sprintf(output[OUT_HREFODRAGMOD].cDescr, + "Multiply by H ref flux to get flux with drag"); output[OUT_HREFODRAGMOD].bNeg = 0; output[OUT_HREFODRAGMOD].iNum = 1; output[OUT_HREFODRAGMOD].iModuleBit = ATMESC; @@ -3700,7 +3731,8 @@ void InitializeOutputAtmEsc(OUTPUT *output, fnWriteOutput fnWrite[]) { /** Megan addition: Hydrogen Reference Flux */ sprintf(output[OUT_HREFFLUX].cName, "HREFFLUX"); - sprintf(output[OUT_HREFFLUX].cDescr, "The Hydrogen Reference Flux (m^-2 s^-1)"); + sprintf(output[OUT_HREFFLUX].cDescr, + "The Hydrogen Reference Flux (m^-2 s^-1)"); output[OUT_HREFFLUX].bNeg = 0; output[OUT_HREFFLUX].iNum = 1; output[OUT_HREFFLUX].iModuleBit = ATMESC; @@ -3708,7 +3740,8 @@ void InitializeOutputAtmEsc(OUTPUT *output, fnWriteOutput fnWrite[]) { /** Megan addition: Hydrogen Diffusion Flux */ sprintf(output[OUT_HDIFFFLUX].cName, "HDiffFlux"); - sprintf(output[OUT_HDIFFFLUX].cDescr, "The Hydrogen Diffusion Flux (m^-2 s^-1)"); + sprintf(output[OUT_HDIFFFLUX].cDescr, + "The Hydrogen Diffusion Flux (m^-2 s^-1)"); output[OUT_HDIFFFLUX].bNeg = 0; output[OUT_HDIFFFLUX].iNum = 1; output[OUT_HDIFFFLUX].iModuleBit = ATMESC; @@ -3725,14 +3758,11 @@ void InitializeOutputAtmEsc(OUTPUT *output, fnWriteOutput fnWrite[]) { /** Megan addition: Water Mixing Ratio in Atmosphere before condensation */ sprintf(output[OUT_XH2O].cName, "XH2O"); - sprintf(output[OUT_XH2O].cDescr, - "Water mixing ratio in upper atmosphere"); + sprintf(output[OUT_XH2O].cDescr, "Water mixing ratio in upper atmosphere"); output[OUT_XH2O].bNeg = 0; output[OUT_XH2O].iNum = 1; output[OUT_XH2O].iModuleBit = ATMESC; fnWrite[OUT_XH2O] = &WriteWaterAtmMixingRatio; - - } /************ ATMESC Logging Functions **************/ @@ -3890,19 +3920,22 @@ double fdDOxygenMassDt(BODY *body, SYSTEM *system, int *iaBody) { (1 + 8 * body[iaBody[0]].dOxygenEta) * body[iaBody[0]].dMDotWater; } -/** } else if (body[iaBody[0]].iWaterLossModel == ATMESC_LS2016) { - return (8 - 8 * (body[iaBody[0]].dOxygenEta)) / - (1 + 8 * (body[iaBody[0]].dOxygenEta)) * body[iaBody[0]].dMDotWater; - double BDIFF = 4.8e19 * pow(body[iaBody[0]].dFlowTemp, 0.75); - double g = (BIGG * body[iaBody[0]].dMass) / - (body[iaBody[0]].dRadius * body[iaBody[0]].dRadius); - double XO = fdAtomicOxygenMixingRatio(body[iaBody[0]].dSurfaceWaterMass, - body[iaBody[0]].dOxygenMass); - return ((BDIFF*PROTONMASS*g)/(KBOLTZ*body[iaBody[0]].dFlowTemp))*15*(1-XO); */ + /** } else if (body[iaBody[0]].iWaterLossModel == ATMESC_LS2016) { + return (8 - 8 * (body[iaBody[0]].dOxygenEta)) / + (1 + 8 * (body[iaBody[0]].dOxygenEta)) * + body[iaBody[0]].dMDotWater; double BDIFF = 4.8e19 * + pow(body[iaBody[0]].dFlowTemp, 0.75); double g = (BIGG * + body[iaBody[0]].dMass) / (body[iaBody[0]].dRadius * + body[iaBody[0]].dRadius); double XO = + fdAtomicOxygenMixingRatio(body[iaBody[0]].dSurfaceWaterMass, + body[iaBody[0]].dOxygenMass); + return + ((BDIFF*PROTONMASS*g)/(KBOLTZ*body[iaBody[0]].dFlowTemp))*15*(1-XO); */ } else if (body[iaBody[0]].iWaterLossModel == ATMESC_LS2016) { - //Add the 2s here meg + // Add the 2s here meg return (8 - 8 * (body[iaBody[0]].dOxygenEta)) / - (1 + 8 * (body[iaBody[0]].dOxygenEta)) * body[iaBody[0]].dMDotWater; + (1 + 8 * (body[iaBody[0]].dOxygenEta)) * + body[iaBody[0]].dMDotWater; } else { // Exact @@ -3941,9 +3974,10 @@ double fdDOxygenMantleMassDt(BODY *body, SYSTEM *system, int *iaBody) { body[iaBody[0]].dMDotWater; } } else if (body[iaBody[0]].iWaterLossModel == ATMESC_LS2016) { - //Add the 2s here meg + // Add the 2s here meg return (8 - 8 * (body[iaBody[0]].dOxygenEta)) / - (1 + 8 * (body[iaBody[0]].dOxygenEta)) * body[iaBody[0]].dMDotWater; + (1 + 8 * (body[iaBody[0]].dOxygenEta)) * + body[iaBody[0]].dMDotWater; } else { // Exact return (8 - 8 * body[iaBody[0]].dOxygenEta) / @@ -4153,7 +4187,8 @@ double fdAtomicOxygenMixingRatio(double dSurfaceWaterMass, double dOxygenMass) { } /** -Computes the molecular oxygen mixing ratio in atmosphere. ASSUMING PURE WATER/OXYGEN ATMOSPHERE +Computes the molecular oxygen mixing ratio in atmosphere. ASSUMING PURE +WATER/OXYGEN ATMOSPHERE @param dSurfaceWaterMass The amount of water in the atmosphere @param dOxygenMass The amount of oxygen in the atmosphere @@ -4161,13 +4196,19 @@ Computes the molecular oxygen mixing ratio in atmosphere. ASSUMING PURE WATER/OX double fdMolecOxygenMixingRatio(double dSurfaceWaterMass, double dOxygenMass) { // Mixing ratio X_O of atomic oxygen in the upper atmosphere // assuming atmosphere is well-mixed up to the photolysis layer - double NO2 = dOxygenMass / (32 * ATOMMASS); - double NH2O = dSurfaceWaterMass / (18 * ATOMMASS); - return NO2 / (NO2+NH2O); + // XXX Hack to make envelope losses behave + if (dSurfaceWaterMass > 0) { + double NO2 = dOxygenMass / (32 * ATOMMASS); + double NH2O = dSurfaceWaterMass / (18 * ATOMMASS); + return NO2 / (NO2 + NH2O); + } else { + return 0; + } } /** -Computes the water mixing ratio in atmosphere. ASSUMING PURE WATER/OXYGEN ATMOSPHERE +Computes the water mixing ratio in atmosphere. ASSUMING PURE WATER/OXYGEN +ATMOSPHERE @param dSurfaceWaterMass The amount of water in the atmosphere @param dOxygenMass The amount of oxygen in the atmosphere @@ -4175,9 +4216,14 @@ Computes the water mixing ratio in atmosphere. ASSUMING PURE WATER/OXYGEN ATMOSP double fdWaterAtmMixingRatio(double dSurfaceWaterMass, double dOxygenMass) { // Mixing ratio X_O of atomic oxygen in the upper atmosphere // assuming atmosphere is well-mixed up to the photolysis layer - double NO2 = dOxygenMass / (32 * ATOMMASS); - double NH2O = dSurfaceWaterMass / (18 * ATOMMASS); - return NH2O / (NO2+NH2O); + // XXX Hack to make envelope losses behave + if (dSurfaceWaterMass > 0) { + double NO2 = dOxygenMass / (32 * ATOMMASS); + double NH2O = dSurfaceWaterMass / (18 * ATOMMASS); + return NH2O / (NO2 + NH2O); + } else { + return 0; + } } /** diff --git a/src/eqtide.c b/src/eqtide.c index 9f9bf8e46..3bb3fdab4 100644 --- a/src/eqtide.c +++ b/src/eqtide.c @@ -1490,7 +1490,8 @@ void VerifyCPL(BODY *body, CONTROL *control, FILES *files, OPTIONS *options, /* Tidal Q was also set */ if (control->Io.iVerbose >= VERBINPUT) { fprintf(stderr, - "WARNING: Phase lag model selected, but both %s and %s set in file %s. " + "WARNING: Phase lag model selected, but both %s and %s set in " + "file %s. " "Using %s = %lf and ignoring %s.\n", options[OPT_TIDALTAU].cName, options[OPT_TIDALQ].cName, options[OPT_TIDALTAU].cFile[iBody + 1], @@ -1591,10 +1592,9 @@ void VerifyCPL(BODY *body, CONTROL *control, FILES *files, OPTIONS *options, void VerifyPerturbersEqtide(BODY *body, FILES *files, OPTIONS *options, UPDATE *update, int iNumBodies, int iBody) { int iPert, iBodyPert, iVar, ok; - int *bFound = malloc(iNumBodies*sizeof(int)); + int *bFound = malloc(iNumBodies * sizeof(int)); for (iBody = 0; iBody < iNumBodies; iBody++) { - fprintf(stderr,"Body: %s\n",body[iBody].cName); if (body[iBody].bEqtide) { if (body[iBody].iTidePerts > 0) { for (iPert = 0; iPert < body[iBody].iTidePerts; iPert++) { @@ -2665,8 +2665,8 @@ void WriteEqRotPer(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, UNITS *units, UPDATE *update, int iBody, double *dTmp, char cUnit[]) { - int iOrbiter = fiAssignTidalOrbiter(body,iBody); - *dTmp = fdFreqToPer(fdEqRotRate( + int iOrbiter = fiAssignTidalOrbiter(body, iBody); + *dTmp = fdFreqToPer(fdEqRotRate( body, iBody, body[iOrbiter].dMeanMotion, body[iOrbiter].dEccSq, control->Evolve.iEqtideModel, control->Evolve.bDiscreteRot)); @@ -2683,7 +2683,7 @@ void WriteEqRotPerCont(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, UNITS *units, UPDATE *update, int iBody, double *dTmp, char cUnit[]) { - int iOrbiter = fiAssignTidalOrbiter(body,iBody); + int iOrbiter = fiAssignTidalOrbiter(body, iBody); // To CPL, or to CTL? That is the question if (control->Evolve.iEqtideModel == CPL) { @@ -2708,7 +2708,7 @@ void WriteEqRotPerDiscrete(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, UNITS *units, UPDATE *update, int iBody, double *dTmp, char cUnit[]) { - int iOrbiter = fiAssignTidalOrbiter(body,iBody); + int iOrbiter = fiAssignTidalOrbiter(body, iBody); if (control->Evolve.iEqtideModel == CPL) { *dTmp = fdFreqToPer(fdCPLEqRotRateDiscrete(body[iOrbiter].dMeanMotion, body[iOrbiter].dEccSq)); @@ -2729,10 +2729,10 @@ void WriteEqRotRate(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, UNITS *units, UPDATE *update, int iBody, double *dTmp, char cUnit[]) { - int iOrbiter = fiAssignTidalOrbiter(body,iBody); - *dTmp = fdEqRotRate(body, iBody, body[iOrbiter].dMeanMotion, - body[iOrbiter].dEccSq, control->Evolve.iEqtideModel, - control->Evolve.bDiscreteRot); + int iOrbiter = fiAssignTidalOrbiter(body, iBody); + *dTmp = fdEqRotRate(body, iBody, body[iOrbiter].dMeanMotion, + body[iOrbiter].dEccSq, control->Evolve.iEqtideModel, + control->Evolve.bDiscreteRot); if (output->bDoNeg[iBody]) { *dTmp *= output->dNeg; @@ -2747,7 +2747,7 @@ void WriteEqRotRateCont(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, UNITS *units, UPDATE *update, int iBody, double *dTmp, char cUnit[]) { - int iOrbiter = fiAssignTidalOrbiter(body,iBody); + int iOrbiter = fiAssignTidalOrbiter(body, iBody); // To CPL, or to CTL? That is the question if (control->Evolve.iEqtideModel == CPL) { @@ -2770,7 +2770,7 @@ void WriteEqRotRateCont(BODY *body, CONTROL *control, OUTPUT *output, void WriteEqRotRateDiscrete(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, UNITS *units, UPDATE *update, int iBody, double *dTmp, char cUnit[]) { - int iOrbiter = fiAssignTidalOrbiter(body,iBody); + int iOrbiter = fiAssignTidalOrbiter(body, iBody); if (control->Evolve.iEqtideModel == CPL) { *dTmp = fdCPLEqRotRateDiscrete(body[iOrbiter].dMeanMotion, @@ -2792,7 +2792,7 @@ void WriteEqTidePower(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, UNITS *units, UPDATE *update, int iBody, double *dTmp, char cUnit[]) { - int iOrbiter = fiAssignTidalOrbiter(body,iBody); + int iOrbiter = fiAssignTidalOrbiter(body, iBody); // Why is this Eq??????? XXX if (control->Evolve.iEqtideModel == CPL) { *dTmp = fdCPLTidePowerEq(body[iBody].dTidalZ[iOrbiter], body[iBody].dEccSq, @@ -2932,13 +2932,13 @@ void WritePowerEqtide(BODY *body, CONTROL *control, OUTPUT *output, //*dTmp = body[iBody].dTidalPowMan; - int jBody=0; - if (iBody==0) + int jBody = 0; + if (iBody == 0) jBody++; - /* - fprintf(stderr,"\niBody: %d\n",iBody); - fprintf(stderr,"\njBody: %d\n",jBody); - fprintf(stderr,"TidalZ: %lf\n",body[iBody].dTidalZ[jBody]); + /* +fprintf(stderr,"\niBody: %d\n",iBody); +fprintf(stderr,"\njBody: %d\n",jBody); +fprintf(stderr,"TidalZ: %lf\n",body[iBody].dTidalZ[jBody]); */ if (output->bDoNeg[iBody]) { @@ -3433,7 +3433,7 @@ void LogBodyEqtide(BODY *body, CONTROL *control, OUTPUT *output, SYSTEM *system, fprintf(fp, "----- EQTIDE PARAMETERS (%s)------\n", body[iBody].cName); for (iOut = iStart; iOut < OUTENDEQTIDE; iOut++) { if (output[iOut].iNum > 0) { - //fprintf(stderr,"iOut = %d.\n",iOut); + // fprintf(stderr,"iOut = %d.\n",iOut); WriteLogEntry(body, control, &output[iOut], system, update, fnWrite[iOut], fp, iBody); } @@ -3906,11 +3906,11 @@ void ForceBehaviorEqtide(BODY *body, MODULE *module, EVOLVE *evolve, IO *io, /** * Identify and return the index for the perturbing body. - * - * -*/ + * + * + */ -int fiAssignTidalPerturber(BODY *body,int iBody) { +int fiAssignTidalPerturber(BODY *body, int iBody) { int iPerturber; if (!bPrimary(body, iBody)) { @@ -3925,7 +3925,7 @@ int fiAssignTidalPerturber(BODY *body,int iBody) { /* Non-central body contains the orbital parameters */ -int fiAssignTidalOrbiter(BODY *body,int iBody) { +int fiAssignTidalOrbiter(BODY *body, int iBody) { int iOrbiter; if (!bPrimary(body, iBody)) { @@ -3963,8 +3963,8 @@ double fdCPLTidePower(BODY *body, int iBody) { // Does this work with DF's changes to da/dt with the synchronous case? // See Fleming et al., 2018 - //fprintf(stderr,"\niBody: %d\n",iBody); - //fprintf(stderr,"TidalZ[%d]: %lf\n",iIndex,body[iBody].dTidalZ[iIndex]); + // fprintf(stderr,"\niBody: %d\n",iBody); + // fprintf(stderr,"TidalZ[%d]: %lf\n",iIndex,body[iBody].dTidalZ[iIndex]); dOrbPow += -body[iBody].dTidalZ[iIndex] / 8 * (4 * body[iBody].iTidalEpsilon[iIndex][0] + diff --git a/src/evolve.c b/src/evolve.c index ea0931ddf..d9ef4a245 100644 --- a/src/evolve.c +++ b/src/evolve.c @@ -423,7 +423,8 @@ void RungeKutta4Step(BODY *body, CONTROL *control, SYSTEM *system, iNumEqns = update[iBody].iNumEqns[iVar]; for (iEqn = 0; iEqn < iNumEqns; iEqn++) { daDerivVar += iDir * evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; - evolve->daDerivProc[0][iBody][iVar][iEqn] = evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; + evolve->daDerivProc[0][iBody][iVar][iEqn] = + evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; } evolve->daDeriv[0][iBody][iVar] = daDerivVar; } @@ -465,7 +466,8 @@ void RungeKutta4Step(BODY *body, CONTROL *control, SYSTEM *system, iNumEqns = update[iBody].iNumEqns[iVar]; for (iEqn = 0; iEqn < iNumEqns; iEqn++) { daDerivVar += iDir * evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; - evolve->daDerivProc[1][iBody][iVar][iEqn] = evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; + evolve->daDerivProc[1][iBody][iVar][iEqn] = + evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; } evolve->daDeriv[1][iBody][iVar] = daDerivVar; } @@ -508,7 +510,8 @@ void RungeKutta4Step(BODY *body, CONTROL *control, SYSTEM *system, iNumEqns = update[iBody].iNumEqns[iVar]; for (iEqn = 0; iEqn < iNumEqns; iEqn++) { daDerivVar += iDir * evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; - evolve->daDerivProc[2][iBody][iVar][iEqn] = evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; + evolve->daDerivProc[2][iBody][iVar][iEqn] = + evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; } evolve->daDeriv[2][iBody][iVar] = daDerivVar; } @@ -557,7 +560,8 @@ void RungeKutta4Step(BODY *body, CONTROL *control, SYSTEM *system, iNumEqns = update[iBody].iNumEqns[iVar]; for (iEqn = 0; iEqn < iNumEqns; iEqn++) { daDerivVar += iDir * evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; - evolve->daDerivProc[3][iBody][iVar][iEqn] = evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; + evolve->daDerivProc[3][iBody][iVar][iEqn] = + evolve->tmpUpdate[iBody].daDerivProc[iVar][iEqn]; } evolve->daDeriv[3][iBody][iVar] = daDerivVar; } @@ -574,11 +578,12 @@ void RungeKutta4Step(BODY *body, CONTROL *control, SYSTEM *system, 2 * evolve->daDeriv[2][iBody][iVar] + evolve->daDeriv[3][iBody][iVar]); for (iEqn = 0; iEqn < update[iBody].iNumEqns[iVar]; iEqn++) { - update[iBody].daDerivProc[iVar][iEqn] = 1. / 6 * - (evolve->daDerivProc[0][iBody][iVar][iEqn] + - 2 * evolve->daDerivProc[1][iBody][iVar][iEqn] + - 2 * evolve->daDerivProc[2][iBody][iVar][iEqn] + - evolve->daDerivProc[3][iBody][iVar][iEqn]); + update[iBody].daDerivProc[iVar][iEqn] = + 1. / 6 * + (evolve->daDerivProc[0][iBody][iVar][iEqn] + + 2 * evolve->daDerivProc[1][iBody][iVar][iEqn] + + 2 * evolve->daDerivProc[2][iBody][iVar][iEqn] + + evolve->daDerivProc[3][iBody][iVar][iEqn]); } if (update[iBody].iaType[iVar][0] == 0 || @@ -603,11 +608,9 @@ void Evolve(BODY *body, CONTROL *control, FILES *files, MODULE *module, fnUpdateVariable ***fnUpdate, fnWriteOutput *fnWrite, fnIntegrate fnOneStep) { /* Master evolution routine that controls the simulation integration. */ - int iDir, iBody, iModule, nSteps; // Dummy counting variables - double dDt, dFoo; // Next timestep, dummy variable - double dEqSpinRate; // Store the equilibrium spin rate - - nSteps = 0; + int iDir, iBody, iModule; // Dummy counting variables + double dDt, dFoo; // Next timestep, dummy variable + double dEqSpinRate; // Store the equilibrium spin rate if (control->Evolve.bDoForward) { iDir = 1; @@ -645,6 +648,8 @@ void Evolve(BODY *body, CONTROL *control, FILES *files, MODULE *module, * */ + control->Evolve.iStepsSinceLastOutput = 0; + control->Evolve.iTotalSteps = 0; while (control->Evolve.dTime < control->Evolve.dStopTime) { /* Take one step */ fnOneStep(body, control, system, update, fnUpdate, &dDt, iDir); @@ -678,17 +683,19 @@ void Evolve(BODY *body, CONTROL *control, FILES *files, MODULE *module, } control->Evolve.dTime += dDt; - nSteps++; + control->Evolve.iStepsSinceLastOutput++; /* Time for Output? */ if (control->Evolve.dTime >= control->Io.dNextOutput) { - control->Evolve.nSteps += nSteps; + control->Evolve.iTotalSteps += control->Evolve.iStepsSinceLastOutput; WriteOutput(body, control, files, output, system, update, fnWrite); // Timesteps are synchronized with the output time, so this statement is // sufficient control->Io.dNextOutput += control->Io.dOutputTime; - //printf("%d\n",nSteps); - nSteps = 0; + if (control->Evolve.dTime < control->Evolve.dStopTime) { + // Reset counter if we are not at the end of the simulation + control->Evolve.iStepsSinceLastOutput = 0; + } } /* Get auxiliary properties for next step -- first call diff --git a/src/magmoc.c b/src/magmoc.c index 562a8a3b1..b709939f4 100644 --- a/src/magmoc.c +++ b/src/magmoc.c @@ -1432,7 +1432,6 @@ void PropsAuxMagmOc(BODY *body, EVOLVE *evolve, IO *io, UPDATE *update, int iBody) { double dCurrentTime = evolve->dTime; double dCurrentTimeStep = evolve->dTimeStep; - double dCurrentStepNum = evolve->nSteps; double dAveMolarMassAtm; // body[iBody].dSurfTemp = body[iBody].dPotTemp; diff --git a/src/output.c b/src/output.c index 97e1009e5..7687ba866 100644 --- a/src/output.c +++ b/src/output.c @@ -92,7 +92,7 @@ void WriteDeltaTime(BODY *body, CONTROL *control, OUTPUT *output, if (control->Evolve.bVarDt) { if (control->Evolve.dTime > 0) { - *dTmp = control->Io.dOutputTime / control->Evolve.nSteps; + *dTmp = control->Io.dOutputTime / control->Evolve.iStepsSinceLastOutput; } else { if (control->Io.iVerbose >= VERBINPUT && !control->Io.bDeltaTimeMessage) { fprintf(stderr, "INFO: DeltaTime output for first step is defined to " @@ -2199,16 +2199,6 @@ void WriteLog(BODY *body, CONTROL *control, FILES *files, MODULE *module, /* Bodies' Properties */ LogBody(body, control, files, module, output, system, fnWrite, fp, update); - - /* Deprecated - if (iEnd) { - dTotTime = difftime(time(NULL),dStartTime); - fprintf(fp,"\nRuntime = %d s\n", (int)dTotTime); - fprintf(fp,"Total Number of Steps = %d\n",control->Evolve.nSteps); - if (control->Io.iVerbose >= VERBPROG) - printf("Runtime = %d s\n", (int)dTotTime); - } - */ fclose(fp); } diff --git a/src/verify.c b/src/verify.c index 13d7a9eb3..31270f0d9 100644 --- a/src/verify.c +++ b/src/verify.c @@ -1109,7 +1109,6 @@ void VerifyOptions(BODY *body, CONTROL *control, FILES *files, MODULE *module, int iBody, iModule; control->Evolve.dTime = 0; - control->Evolve.nSteps = 0; VerifyAge(body, control, options); VerifyNames(body, control, options); diff --git a/src/vplanet.h b/src/vplanet.h index d02d69eb0..ae005ace6 100644 --- a/src/vplanet.h +++ b/src/vplanet.h @@ -1734,7 +1734,8 @@ struct EVOLVE { double dStopTime; /**< Integration Stop Time */ double dTimeStep; /**< Integration Time step */ int bVarDt; /**< Use Variable Timestep? */ - int nSteps; /**< Total Number of Steps */ + int iTotalSteps; /**< Total Number of Steps */ + int iStepsSinceLastOutput; double dMinValue; /**< Minimum Value for Eccentricity and Obliquity to be Integrated */ int bFirstStep; /**< Has the First Dtep Been Taken? */ diff --git a/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkBolmont16/test_WaterELimNoXUVLB15NoO2SinkBolmont16.py b/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkBolmont16/test_WaterELimNoXUVLB15NoO2SinkBolmont16.py index 15bbf240f..531f47709 100644 --- a/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkBolmont16/test_WaterELimNoXUVLB15NoO2SinkBolmont16.py +++ b/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkBolmont16/test_WaterELimNoXUVLB15NoO2SinkBolmont16.py @@ -1,120 +1,137 @@ -from benchmark import Benchmark, benchmark -import astropy.units as u -import pytest - -@benchmark( - { - "log.initial.system.Age": {"value": 0.000000, "unit": u.sec}, - "log.initial.system.Time": {"value": 0.000000, "unit": u.sec}, - "log.initial.system.TotAngMom": {"value": 4.416946e+33, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.system.TotEnergy": {"value": -2.237790e+32, "unit": u.Joule}, - "log.initial.system.PotEnergy": {"value": -2.239397e+32, "unit": u.Joule}, - "log.initial.system.KinEnergy": {"value": 1.606047e+29, "unit": u.Joule}, - "log.initial.system.DeltaTime": {"value": 0.000000, "unit": u.sec}, - "log.initial.earth.Mass": {"value": 5.972186e+24, "unit": u.kg}, - "log.initial.earth.Radius": {"value": 6.378100e+06, "unit": u.m}, - "log.initial.earth.RadGyra": {"value": 0.500000}, - "log.initial.earth.BodyType": {"value": 0.000000}, - "log.initial.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m ** 3}, - "log.initial.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.HZLimRecVenus": {"value": -1.000000}, - "log.initial.earth.HZLimRunaway": {"value": -1.000000}, - "log.initial.earth.HZLimMoistGreenhouse": {"value": -1.000000}, - "log.initial.earth.HZLimMaxGreenhouse": {"value": -1.000000}, - "log.initial.earth.HZLimEarlyMars": {"value": -1.000000}, - "log.initial.earth.Instellation": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.initial.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, - "log.initial.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, - "log.initial.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.initial.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, - "log.initial.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, - "log.initial.earth.RGLimit": {"value": 0.000000, "unit": u.au}, - "log.initial.earth.XO": {"value": 0.333333}, - "log.initial.earth.EtaO": {"value": 0.000000}, - "log.initial.earth.PlanetRadius": {"value": 6.378100e+06, "unit": u.m}, - "log.initial.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.earth.RadXUV": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.RadSolid": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.PresXUV": {"value": 5.000000}, - "log.initial.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, - "log.initial.earth.AtmGasConst": {"value": 4124.000000}, - "log.initial.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, - "log.initial.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, - "log.initial.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m ** 2}, - "log.initial.earth.AtmXAbsEffH2O": {"value": 0.001000}, - "log.initial.earth.RocheRadius": {"value": 1.037254e+11, "unit": u.m}, - "log.initial.earth.BondiRadius": {"value": 1.249016e+08, "unit": u.m}, - "log.initial.earth.HEscapeRegime": {"value": 8.000000}, - "log.initial.earth.RRCriticalFlux": {"value": 53.697959, "unit": u.W / u.m ** 2}, - "log.initial.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.earth.WaterEscapeRegime": {"value": 8.000000}, - "log.initial.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m ** 2}, - "log.initial.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.earth.XO2": {"value": 0.000000}, - "log.initial.earth.XH2O": {"value": 1.000000}, - "log.initial.earth.HDiffFlux": {"value": 1.264874e+17, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.earth.HRefODragMod": {"value": 0.007752}, - "log.initial.earth.KTide": {"value": 0.999908}, - "log.initial.earth.RGDuration": {"value": 0.00000e+00, "unit": u.yr}, - "log.final.system.Age": {"value": 3.155760e+15, "unit": u.sec}, - "log.final.system.Time": {"value": 3.155760e+15, "unit": u.sec}, - "log.final.system.TotAngMom": {"value": 4.416946e+33, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.final.system.TotEnergy": {"value": -2.237790e+32, "unit": u.Joule}, - "log.final.system.PotEnergy": {"value": -2.239397e+32, "unit": u.Joule}, - "log.final.system.KinEnergy": {"value": 1.606047e+29, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 3.155760e+15, "unit": u.sec}, - "log.final.earth.Mass": {"value": 5.972186e+24, "unit": u.kg}, - "log.final.earth.Radius": {"value": 6.378100e+06, "unit": u.m}, - "log.final.earth.RadGyra": {"value": 0.500000}, - "log.final.earth.BodyType": {"value": 0.000000}, - "log.final.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m ** 3}, - "log.final.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, - "log.final.earth.HZLimRecVenus": {"value": -1.000000}, - "log.final.earth.HZLimRunaway": {"value": -1.000000}, - "log.final.earth.HZLimMoistGreenhouse": {"value": -1.000000}, - "log.final.earth.HZLimMaxGreenhouse": {"value": -1.000000}, - "log.final.earth.HZLimEarlyMars": {"value": -1.000000}, - "log.final.earth.Instellation": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.final.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, - "log.final.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, - "log.final.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.final.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.final.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, - "log.final.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, - "log.final.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, - "log.final.earth.RGLimit": {"value": 0.000000, "unit": u.au}, - "log.final.earth.XO": {"value": 0.333333}, - "log.final.earth.EtaO": {"value": 0.000000}, - "log.final.earth.PlanetRadius": {"value": 6.378100e+06, "unit": u.m}, - "log.final.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, - "log.final.earth.RadXUV": {"value": -1.000000, "unit": u.m}, - "log.final.earth.RadSolid": {"value": -1.000000, "unit": u.m}, - "log.final.earth.PresXUV": {"value": 5.000000}, - "log.final.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, - "log.final.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, - "log.final.earth.AtmGasConst": {"value": 4124.000000}, - "log.final.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, - "log.final.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, - "log.final.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m ** 2}, - "log.final.earth.AtmXAbsEffH2O": {"value": 0.001000}, - "log.final.earth.RocheRadius": {"value": 1.037254e+11, "unit": u.m}, - "log.final.earth.BondiRadius": {"value": 1.249016e+08, "unit": u.m}, - "log.final.earth.HEscapeRegime": {"value": 8.000000}, - "log.final.earth.RRCriticalFlux": {"value": 53.697959, "unit": u.W / u.m ** 2}, - "log.final.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, - "log.final.earth.WaterEscapeRegime": {"value": 8.000000}, - "log.final.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m ** 2}, - "log.final.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m ** 2 / u.sec}, - "log.final.earth.XO2": {"value": 0.000000}, - "log.final.earth.XH2O": {"value": 1.000000}, - "log.final.earth.HDiffFlux": {"value": 1.264874e+17, "unit": 1 / u.m ** 2 / u.sec}, - "log.final.earth.HRefODragMod": {"value": 0.007752}, - "log.final.earth.KTide": {"value": 0.999908}, - "log.final.earth.RGDuration": {"value": 1.00000e+08, "unit": u.yr}, - } +import astropy.units as u +from benchmark import Benchmark, benchmark + + +@benchmark( + { + "log.initial.system.Age": {"value": 0.000000, "unit": u.sec}, + "log.initial.system.Time": {"value": 0.000000, "unit": u.sec}, + "log.initial.system.TotAngMom": { + "value": 4.416946e33, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.system.TotEnergy": {"value": -2.237790e32, "unit": u.Joule}, + "log.initial.system.PotEnergy": {"value": -2.239397e32, "unit": u.Joule}, + "log.initial.system.KinEnergy": {"value": 1.606047e29, "unit": u.Joule}, + "log.initial.system.DeltaTime": {"value": 0.000000, "unit": u.sec}, + "log.initial.earth.Mass": {"value": 5.972186e24, "unit": u.kg}, + "log.initial.earth.Radius": {"value": 6.378100e06, "unit": u.m}, + "log.initial.earth.RadGyra": {"value": 0.500000}, + "log.initial.earth.BodyType": {"value": 0.000000}, + "log.initial.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m**3}, + "log.initial.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.HZLimRecVenus": {"value": -1.000000}, + "log.initial.earth.HZLimRunaway": {"value": -1.000000}, + "log.initial.earth.HZLimMoistGreenhouse": {"value": -1.000000}, + "log.initial.earth.HZLimMaxGreenhouse": {"value": -1.000000}, + "log.initial.earth.HZLimEarlyMars": {"value": -1.000000}, + "log.initial.earth.Instellation": { + "value": -1.000000, + "unit": u.kg / u.sec**3, + }, + "log.initial.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, + "log.initial.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, + "log.initial.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.initial.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, + "log.initial.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, + "log.initial.earth.RGLimit": {"value": 0.000000, "unit": u.au}, + "log.initial.earth.XO": {"value": 0.333333}, + "log.initial.earth.EtaO": {"value": 0.000000}, + "log.initial.earth.PlanetRadius": {"value": 6.378100e06, "unit": u.m}, + "log.initial.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.earth.RadXUV": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.RadSolid": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.PresXUV": {"value": 5.000000}, + "log.initial.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, + "log.initial.earth.AtmGasConst": {"value": 4124.000000}, + "log.initial.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, + "log.initial.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, + "log.initial.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m**2}, + "log.initial.earth.AtmXAbsEffH2O": {"value": 0.001000}, + "log.initial.earth.RocheRadius": {"value": 1.037254e11, "unit": u.m}, + "log.initial.earth.BondiRadius": {"value": 1.249016e08, "unit": u.m}, + "log.initial.earth.HEscapeRegime": {"value": 8.000000}, + "log.initial.earth.RRCriticalFlux": { + "value": 53.697959, + "unit": u.W / u.m**2, + }, + "log.initial.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.earth.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m**2}, + "log.initial.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m**2 / u.sec}, + "log.initial.earth.XO2": {"value": 0.000000}, + "log.initial.earth.XH2O": {"value": 1.000000}, + "log.initial.earth.HDiffFlux": { + "value": 1.264874e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.earth.HRefODragMod": {"value": 0.007752}, + "log.initial.earth.KTide": {"value": 0.999908}, + "log.initial.earth.RGDuration": {"value": 0.00000e00, "unit": u.yr}, + "log.final.system.Age": {"value": 3.155760e15, "unit": u.sec}, + "log.final.system.Time": {"value": 3.155760e15, "unit": u.sec}, + "log.final.system.TotAngMom": { + "value": 4.416946e33, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.final.system.TotEnergy": {"value": -2.237790e32, "unit": u.Joule}, + "log.final.system.PotEnergy": {"value": -2.239397e32, "unit": u.Joule}, + "log.final.system.KinEnergy": {"value": 1.606047e29, "unit": u.Joule}, + "log.final.earth.Mass": {"value": 5.972186e24, "unit": u.kg}, + "log.final.earth.Radius": {"value": 6.378100e06, "unit": u.m}, + "log.final.earth.RadGyra": {"value": 0.500000}, + "log.final.earth.BodyType": {"value": 0.000000}, + "log.final.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m**3}, + "log.final.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, + "log.final.earth.HZLimRecVenus": {"value": -1.000000}, + "log.final.earth.HZLimRunaway": {"value": -1.000000}, + "log.final.earth.HZLimMoistGreenhouse": {"value": -1.000000}, + "log.final.earth.HZLimMaxGreenhouse": {"value": -1.000000}, + "log.final.earth.HZLimEarlyMars": {"value": -1.000000}, + "log.final.earth.Instellation": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.final.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, + "log.final.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, + "log.final.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, + "log.final.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.final.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, + "log.final.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, + "log.final.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, + "log.final.earth.RGLimit": {"value": 0.000000, "unit": u.au}, + "log.final.earth.XO": {"value": 0.333333}, + "log.final.earth.EtaO": {"value": 0.000000}, + "log.final.earth.PlanetRadius": {"value": 6.378100e06, "unit": u.m}, + "log.final.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, + "log.final.earth.RadXUV": {"value": -1.000000, "unit": u.m}, + "log.final.earth.RadSolid": {"value": -1.000000, "unit": u.m}, + "log.final.earth.PresXUV": {"value": 5.000000}, + "log.final.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, + "log.final.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, + "log.final.earth.AtmGasConst": {"value": 4124.000000}, + "log.final.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, + "log.final.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, + "log.final.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m**2}, + "log.final.earth.AtmXAbsEffH2O": {"value": 0.001000}, + "log.final.earth.RocheRadius": {"value": 1.037254e11, "unit": u.m}, + "log.final.earth.BondiRadius": {"value": 1.249016e08, "unit": u.m}, + "log.final.earth.HEscapeRegime": {"value": 8.000000}, + "log.final.earth.RRCriticalFlux": {"value": 53.697959, "unit": u.W / u.m**2}, + "log.final.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.final.earth.WaterEscapeRegime": {"value": 8.000000}, + "log.final.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m**2}, + "log.final.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m**2 / u.sec}, + "log.final.earth.XO2": {"value": 0.000000}, + "log.final.earth.XH2O": {"value": 1.000000}, + "log.final.earth.HDiffFlux": { + "value": 1.264874e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.final.earth.HRefODragMod": {"value": 0.007752}, + "log.final.earth.KTide": {"value": 0.999908}, + "log.final.earth.RGDuration": {"value": 1.00000e08, "unit": u.yr}, + } ) -class Test_WaterELimNoXUVLB15NoO2SinkBolmont16(Benchmark): - pass +class Test_WaterELimNoXUVLB15NoO2SinkBolmont16(Benchmark): + pass diff --git a/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O.py b/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O.py index 6a24eb0fc..6b35b18d1 100644 --- a/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O.py +++ b/tests/Atmesc/WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLB15NoO2SinkConstXAbsEffH2O.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -81,7 +80,6 @@ "log.final.system.TotEnergy": {"value": -2.237790e32, "unit": u.Joule}, "log.final.system.PotEnergy": {"value": -2.239397e32, "unit": u.Joule}, "log.final.system.KinEnergy": {"value": 1.606047e29, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 3.155760e15, "unit": u.sec}, "log.final.earth.Mass": {"value": 5.972186e24, "unit": u.kg}, "log.final.earth.Radius": {"value": 6.378100e06, "unit": u.m}, "log.final.earth.RadGyra": {"value": 0.500000}, diff --git a/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkBolmont16/test_WaterELimNoXUVLBExactNoO2SinkBolmont16.py b/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkBolmont16/test_WaterELimNoXUVLBExactNoO2SinkBolmont16.py index c6d4f040d..ee1074393 100644 --- a/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkBolmont16/test_WaterELimNoXUVLBExactNoO2SinkBolmont16.py +++ b/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkBolmont16/test_WaterELimNoXUVLBExactNoO2SinkBolmont16.py @@ -1,120 +1,137 @@ -from benchmark import Benchmark, benchmark -import astropy.units as u -import pytest - -@benchmark( - { - "log.initial.system.Age": {"value": 0.000000, "unit": u.sec}, - "log.initial.system.Time": {"value": 0.000000, "unit": u.sec}, - "log.initial.system.TotAngMom": {"value": 4.416946e+33, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.system.TotEnergy": {"value": -2.237790e+32, "unit": u.Joule}, - "log.initial.system.PotEnergy": {"value": -2.239397e+32, "unit": u.Joule}, - "log.initial.system.KinEnergy": {"value": 1.606047e+29, "unit": u.Joule}, - "log.initial.system.DeltaTime": {"value": 0.000000, "unit": u.sec}, - "log.initial.earth.Mass": {"value": 5.972186e+24, "unit": u.kg}, - "log.initial.earth.Radius": {"value": 6.378100e+06, "unit": u.m}, - "log.initial.earth.RadGyra": {"value": 0.500000}, - "log.initial.earth.BodyType": {"value": 0.000000}, - "log.initial.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m ** 3}, - "log.initial.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.HZLimRecVenus": {"value": -1.000000}, - "log.initial.earth.HZLimRunaway": {"value": -1.000000}, - "log.initial.earth.HZLimMoistGreenhouse": {"value": -1.000000}, - "log.initial.earth.HZLimMaxGreenhouse": {"value": -1.000000}, - "log.initial.earth.HZLimEarlyMars": {"value": -1.000000}, - "log.initial.earth.Instellation": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.initial.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, - "log.initial.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, - "log.initial.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.initial.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, - "log.initial.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, - "log.initial.earth.RGLimit": {"value": 0.000000, "unit": u.au}, - "log.initial.earth.XO": {"value": 0.333333}, - "log.initial.earth.EtaO": {"value": 0.000000}, - "log.initial.earth.PlanetRadius": {"value": 6.378100e+06, "unit": u.m}, - "log.initial.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.earth.RadXUV": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.RadSolid": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.PresXUV": {"value": 5.000000}, - "log.initial.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, - "log.initial.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, - "log.initial.earth.AtmGasConst": {"value": 4124.000000}, - "log.initial.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, - "log.initial.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, - "log.initial.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m ** 2}, - "log.initial.earth.AtmXAbsEffH2O": {"value": 0.001000}, - "log.initial.earth.RocheRadius": {"value": 1.037254e+11, "unit": u.m}, - "log.initial.earth.BondiRadius": {"value": 1.249016e+08, "unit": u.m}, - "log.initial.earth.HEscapeRegime": {"value": 8.000000}, - "log.initial.earth.RRCriticalFlux": {"value": 53.697959, "unit": u.W / u.m ** 2}, - "log.initial.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.earth.WaterEscapeRegime": {"value": 8.000000}, - "log.initial.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m ** 2}, - "log.initial.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.earth.XO2": {"value": 0.000000}, - "log.initial.earth.XH2O": {"value": 1.000000}, - "log.initial.earth.HDiffFlux": {"value": 1.264874e+17, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.earth.HRefODragMod": {"value": 0.007752}, - "log.initial.earth.KTide": {"value": 0.999908}, - "log.initial.earth.RGDuration": {"value": 0.00000e+00, "unit": u.yr}, - "log.final.system.Age": {"value": 3.155760e+15, "unit": u.sec}, - "log.final.system.Time": {"value": 3.155760e+15, "unit": u.sec}, - "log.final.system.TotAngMom": {"value": 4.416946e+33, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.final.system.TotEnergy": {"value": -2.237790e+32, "unit": u.Joule}, - "log.final.system.PotEnergy": {"value": -2.239397e+32, "unit": u.Joule}, - "log.final.system.KinEnergy": {"value": 1.606047e+29, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 3.155760e+15, "unit": u.sec}, - "log.final.earth.Mass": {"value": 5.972186e+24, "unit": u.kg}, - "log.final.earth.Radius": {"value": 6.378100e+06, "unit": u.m}, - "log.final.earth.RadGyra": {"value": 0.500000}, - "log.final.earth.BodyType": {"value": 0.000000}, - "log.final.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m ** 3}, - "log.final.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, - "log.final.earth.HZLimRecVenus": {"value": -1.000000}, - "log.final.earth.HZLimRunaway": {"value": -1.000000}, - "log.final.earth.HZLimMoistGreenhouse": {"value": -1.000000}, - "log.final.earth.HZLimMaxGreenhouse": {"value": -1.000000}, - "log.final.earth.HZLimEarlyMars": {"value": -1.000000}, - "log.final.earth.Instellation": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.final.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, - "log.final.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, - "log.final.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.final.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.final.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, - "log.final.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, - "log.final.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, - "log.final.earth.RGLimit": {"value": 0.000000, "unit": u.au}, - "log.final.earth.XO": {"value": 0.333333}, - "log.final.earth.EtaO": {"value": 0.000000}, - "log.final.earth.PlanetRadius": {"value": 6.378100e+06, "unit": u.m}, - "log.final.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, - "log.final.earth.RadXUV": {"value": -1.000000, "unit": u.m}, - "log.final.earth.RadSolid": {"value": -1.000000, "unit": u.m}, - "log.final.earth.PresXUV": {"value": 5.000000}, - "log.final.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, - "log.final.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, - "log.final.earth.AtmGasConst": {"value": 4124.000000}, - "log.final.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, - "log.final.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, - "log.final.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m ** 2}, - "log.final.earth.AtmXAbsEffH2O": {"value": 0.001000}, - "log.final.earth.RocheRadius": {"value": 1.037254e+11, "unit": u.m}, - "log.final.earth.BondiRadius": {"value": 1.249016e+08, "unit": u.m}, - "log.final.earth.HEscapeRegime": {"value": 8.000000}, - "log.final.earth.RRCriticalFlux": {"value": 53.697959, "unit": u.W / u.m ** 2}, - "log.final.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, - "log.final.earth.WaterEscapeRegime": {"value": 8.000000}, - "log.final.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m ** 2}, - "log.final.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m ** 2 / u.sec}, - "log.final.earth.XO2": {"value": 0.000000}, - "log.final.earth.XH2O": {"value": 1.000000}, - "log.final.earth.HDiffFlux": {"value": 1.264874e+17, "unit": 1 / u.m ** 2 / u.sec}, - "log.final.earth.HRefODragMod": {"value": 0.007752}, - "log.final.earth.KTide": {"value": 0.999908}, - "log.final.earth.RGDuration": {"value": 1.00000e+08, "unit": u.yr}, - } +import astropy.units as u +from benchmark import Benchmark, benchmark + + +@benchmark( + { + "log.initial.system.Age": {"value": 0.000000, "unit": u.sec}, + "log.initial.system.Time": {"value": 0.000000, "unit": u.sec}, + "log.initial.system.TotAngMom": { + "value": 4.416946e33, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.system.TotEnergy": {"value": -2.237790e32, "unit": u.Joule}, + "log.initial.system.PotEnergy": {"value": -2.239397e32, "unit": u.Joule}, + "log.initial.system.KinEnergy": {"value": 1.606047e29, "unit": u.Joule}, + "log.initial.system.DeltaTime": {"value": 0.000000, "unit": u.sec}, + "log.initial.earth.Mass": {"value": 5.972186e24, "unit": u.kg}, + "log.initial.earth.Radius": {"value": 6.378100e06, "unit": u.m}, + "log.initial.earth.RadGyra": {"value": 0.500000}, + "log.initial.earth.BodyType": {"value": 0.000000}, + "log.initial.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m**3}, + "log.initial.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.HZLimRecVenus": {"value": -1.000000}, + "log.initial.earth.HZLimRunaway": {"value": -1.000000}, + "log.initial.earth.HZLimMoistGreenhouse": {"value": -1.000000}, + "log.initial.earth.HZLimMaxGreenhouse": {"value": -1.000000}, + "log.initial.earth.HZLimEarlyMars": {"value": -1.000000}, + "log.initial.earth.Instellation": { + "value": -1.000000, + "unit": u.kg / u.sec**3, + }, + "log.initial.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, + "log.initial.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, + "log.initial.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.initial.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, + "log.initial.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, + "log.initial.earth.RGLimit": {"value": 0.000000, "unit": u.au}, + "log.initial.earth.XO": {"value": 0.333333}, + "log.initial.earth.EtaO": {"value": 0.000000}, + "log.initial.earth.PlanetRadius": {"value": 6.378100e06, "unit": u.m}, + "log.initial.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.earth.RadXUV": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.RadSolid": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.PresXUV": {"value": 5.000000}, + "log.initial.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, + "log.initial.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, + "log.initial.earth.AtmGasConst": {"value": 4124.000000}, + "log.initial.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, + "log.initial.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, + "log.initial.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m**2}, + "log.initial.earth.AtmXAbsEffH2O": {"value": 0.001000}, + "log.initial.earth.RocheRadius": {"value": 1.037254e11, "unit": u.m}, + "log.initial.earth.BondiRadius": {"value": 1.249016e08, "unit": u.m}, + "log.initial.earth.HEscapeRegime": {"value": 8.000000}, + "log.initial.earth.RRCriticalFlux": { + "value": 53.697959, + "unit": u.W / u.m**2, + }, + "log.initial.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.earth.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m**2}, + "log.initial.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m**2 / u.sec}, + "log.initial.earth.XO2": {"value": 0.000000}, + "log.initial.earth.XH2O": {"value": 1.000000}, + "log.initial.earth.HDiffFlux": { + "value": 1.264874e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.earth.HRefODragMod": {"value": 0.007752}, + "log.initial.earth.KTide": {"value": 0.999908}, + "log.initial.earth.RGDuration": {"value": 0.00000e00, "unit": u.yr}, + "log.final.system.Age": {"value": 3.155760e15, "unit": u.sec}, + "log.final.system.Time": {"value": 3.155760e15, "unit": u.sec}, + "log.final.system.TotAngMom": { + "value": 4.416946e33, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.final.system.TotEnergy": {"value": -2.237790e32, "unit": u.Joule}, + "log.final.system.PotEnergy": {"value": -2.239397e32, "unit": u.Joule}, + "log.final.system.KinEnergy": {"value": 1.606047e29, "unit": u.Joule}, + "log.final.earth.Mass": {"value": 5.972186e24, "unit": u.kg}, + "log.final.earth.Radius": {"value": 6.378100e06, "unit": u.m}, + "log.final.earth.RadGyra": {"value": 0.500000}, + "log.final.earth.BodyType": {"value": 0.000000}, + "log.final.earth.Density": {"value": 5495.038549, "unit": u.kg / u.m**3}, + "log.final.earth.HZLimitDryRunaway": {"value": -1.000000, "unit": u.m}, + "log.final.earth.HZLimRecVenus": {"value": -1.000000}, + "log.final.earth.HZLimRunaway": {"value": -1.000000}, + "log.final.earth.HZLimMoistGreenhouse": {"value": -1.000000}, + "log.final.earth.HZLimMaxGreenhouse": {"value": -1.000000}, + "log.final.earth.HZLimEarlyMars": {"value": -1.000000}, + "log.final.earth.Instellation": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.final.earth.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, + "log.final.earth.OrbPeriod": {"value": -1.000000, "unit": u.sec}, + "log.final.earth.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, + "log.final.earth.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.final.earth.SurfWaterMass": {"value": 3.000000, "unit": u.TO}, + "log.final.earth.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, + "log.final.earth.OxygenMass": {"value": 0.000000, "unit": u.bar}, + "log.final.earth.RGLimit": {"value": 0.000000, "unit": u.au}, + "log.final.earth.XO": {"value": 0.333333}, + "log.final.earth.EtaO": {"value": 0.000000}, + "log.final.earth.PlanetRadius": {"value": 6.378100e06, "unit": u.m}, + "log.final.earth.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, + "log.final.earth.RadXUV": {"value": -1.000000, "unit": u.m}, + "log.final.earth.RadSolid": {"value": -1.000000, "unit": u.m}, + "log.final.earth.PresXUV": {"value": 5.000000}, + "log.final.earth.ScaleHeight": {"value": -1.000000, "unit": u.m}, + "log.final.earth.ThermTemp": {"value": 400.000000, "unit": u.K}, + "log.final.earth.AtmGasConst": {"value": 4124.000000}, + "log.final.earth.PresSurf": {"value": -1.000000, "unit": u.Pa}, + "log.final.earth.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, + "log.final.earth.FXUV": {"value": 0.000000, "unit": u.W / u.m**2}, + "log.final.earth.AtmXAbsEffH2O": {"value": 0.001000}, + "log.final.earth.RocheRadius": {"value": 1.037254e11, "unit": u.m}, + "log.final.earth.BondiRadius": {"value": 1.249016e08, "unit": u.m}, + "log.final.earth.HEscapeRegime": {"value": 8.000000}, + "log.final.earth.RRCriticalFlux": {"value": 53.697959, "unit": u.W / u.m**2}, + "log.final.earth.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.final.earth.WaterEscapeRegime": {"value": 8.000000}, + "log.final.earth.FXUVCRITDRAG": {"value": 53.272144, "unit": u.W / u.m**2}, + "log.final.earth.HREFFLUX": {"value": 0.000000, "unit": 1 / u.m**2 / u.sec}, + "log.final.earth.XO2": {"value": 0.000000}, + "log.final.earth.XH2O": {"value": 1.000000}, + "log.final.earth.HDiffFlux": { + "value": 1.264874e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.final.earth.HRefODragMod": {"value": 0.007752}, + "log.final.earth.KTide": {"value": 0.999908}, + "log.final.earth.RGDuration": {"value": 1.00000e08, "unit": u.yr}, + } ) -class Test_WaterELimNoXUVLBExactNoO2SinkBolmont16(Benchmark): - pass +class Test_WaterELimNoXUVLBExactNoO2SinkBolmont16(Benchmark): + pass diff --git a/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O.py b/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O.py index a5115e620..696835511 100644 --- a/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O.py +++ b/tests/Atmesc/WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O/test_WaterELimNoXUVLBExactNoO2SinkConstXAbsEffH2O.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -81,7 +80,6 @@ "log.final.system.TotEnergy": {"value": -2.237790e32, "unit": u.Joule}, "log.final.system.PotEnergy": {"value": -2.239397e32, "unit": u.Joule}, "log.final.system.KinEnergy": {"value": 1.606047e29, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 3.155760e15, "unit": u.sec}, "log.final.earth.Mass": {"value": 5.972186e24, "unit": u.kg}, "log.final.earth.Radius": {"value": 6.378100e06, "unit": u.m}, "log.final.earth.RadGyra": {"value": 0.500000}, diff --git a/tests/AtmescEqtideMagmocRadheatStellar/MagmOc_Trappist1g/test_MagmOc_Trappist1g.py b/tests/AtmescEqtideMagmocRadheatStellar/MagmOc_Trappist1g/test_MagmOc_Trappist1g.py index cf074905b..f5e392949 100644 --- a/tests/AtmescEqtideMagmocRadheatStellar/MagmOc_Trappist1g/test_MagmOc_Trappist1g.py +++ b/tests/AtmescEqtideMagmocRadheatStellar/MagmOc_Trappist1g/test_MagmOc_Trappist1g.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -258,6 +257,14 @@ "log.initial.g.BondiRadius": {"value": 1.669199e08, "unit": u.m}, "log.initial.g.HEscapeRegime": {"value": 8.000000}, "log.initial.g.RRCriticalFlux": {"value": 40.154478, "unit": u.W / u.m**2}, + "log.initial.g.CrossoverMass": {"value": 2.737080e-25, "unit": u.kg}, + "log.initial.g.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.g.FXUVCRITDRAG": {"value": 0.151738, "unit": u.W / u.m**2}, + "log.initial.g.HREFFLUX": {"value": 9.845479e18, "unit": 1 / u.m**2 / u.sec}, + "log.initial.g.XO2": {"value": 0.000000}, + "log.initial.g.XH2O": {"value": 1.000000}, + "log.initial.g.HDiffFlux": {"value": 1.090326e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.g.HRefODragMod": {"value": 0.120955}, "log.initial.g.KTide": {"value": 0.935384}, "log.initial.g.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.g.WaterMassMOAtm": {"value": 2.000000, "unit": u.TO}, @@ -282,269 +289,611 @@ "log.initial.g.CO2MassSol": {"value": 0.000000, "unit": u.kg}, "log.initial.g.PressCO2Atm": {"value": 0.000000}, "log.initial.g.CO2FracMelt": {"value": 0.000000}, - "log.final.system.Age": {"value": 1.581036e14, "unit": u.sec}, - "log.final.system.Time": {"value": 3.155760e11, "unit": u.sec}, + "log.final.system.Age": {"value": 1.581036e14, "unit": u.sec, "rtol": 1e-4}, + "log.final.system.Time": {"value": 3.155760e11, "unit": u.sec, "rtol": 1e-4}, "log.final.system.TotAngMom": { "value": 3.489314e41, "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, }, - "log.final.system.TotEnergy": {"value": -2.672379e39, "unit": u.Joule}, - "log.final.system.PotEnergy": {"value": -2.688114e39, "unit": u.Joule}, - "log.final.system.KinEnergy": {"value": 1.260909e37, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 1.824983e06, "unit": u.sec}, - "log.final.Trappist1.Mass": {"value": 1.590733e29, "unit": u.kg}, - "log.final.Trappist1.Obliquity": {"value": 0.000000, "unit": u.rad}, - "log.final.Trappist1.PrecA": {"value": 0.000000, "unit": u.rad}, - "log.final.Trappist1.Xobl": {"value": 0.000000}, - "log.final.Trappist1.Yobl": {"value": 0.000000}, - "log.final.Trappist1.Zobl": {"value": 1.000000}, - "log.final.Trappist1.Radius": {"value": 59.103227, "unit": u.Rearth}, - "log.final.Trappist1.RadGyra": {"value": 0.458983}, + "log.final.system.TotEnergy": { + "value": -2.672379e39, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.PotEnergy": { + "value": -2.688114e39, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.KinEnergy": { + "value": 1.260909e37, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.Trappist1.Mass": {"value": 1.590733e29, "unit": u.kg, "rtol": 1e-4}, + "log.final.Trappist1.Obliquity": { + "value": 0.000000, + "unit": u.rad, + "rtol": 1e-4, + }, + "log.final.Trappist1.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, + "log.final.Trappist1.Xobl": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Trappist1.Yobl": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Trappist1.Zobl": {"value": 1.000000, "rtol": 1e-4}, + "log.final.Trappist1.Radius": { + "value": 59.103227, + "unit": u.Rearth, + "rtol": 1e-4, + }, + "log.final.Trappist1.RadGyra": {"value": 0.458983, "rtol": 1e-4}, "log.final.Trappist1.RotAngMom": { "value": 3.465407e41, "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.RotKinEnergy": { + "value": 1.260909e37, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.Trappist1.RotVel": { + "value": 2.743230e04, + "unit": u.m / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.BodyType": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Trappist1.RotRate": { + "value": 7.277122e-05, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.RotPer": { + "value": 8.634162e04, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.Density": { + "value": 708.926273, + "unit": u.kg / u.m**3, + "rtol": 1e-4, }, - "log.final.Trappist1.RotKinEnergy": {"value": 1.260909e37, "unit": u.Joule}, - "log.final.Trappist1.RotVel": {"value": 2.743230e04, "unit": u.m / u.sec}, - "log.final.Trappist1.BodyType": {"value": 0.000000}, - "log.final.Trappist1.RotRate": {"value": 7.277122e-05, "unit": 1 / u.sec}, - "log.final.Trappist1.RotPer": {"value": 8.634162e04, "unit": u.sec}, - "log.final.Trappist1.Density": {"value": 708.926273, "unit": u.kg / u.m**3}, "log.final.Trappist1.SurfEnFluxTotal": { "value": 0.055745, "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.Trappist1.TidalQ": {"value": 100.000000, "rtol": 1e-4}, + "log.final.Trappist1.ImK2": {"value": -0.005000, "rtol": 1e-4}, + "log.final.Trappist1.K2": {"value": 0.500000, "rtol": 1e-4}, + "log.final.Trappist1.K2Man": {"value": 0.010000, "rtol": 1e-4}, + "log.final.Trappist1.Imk2Man": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Trappist1.TidalQMantle": {"value": 100.000000, "rtol": 1e-4}, + "log.final.Trappist1.HEcc": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Trappist1.HZLimitDryRunaway": { + "value": 1.933388e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.Trappist1.HZLimRecVenus": { + "value": 1.739978e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.Trappist1.HZLimRunaway": { + "value": 2.289979e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.Trappist1.HZLimMoistGreenhouse": { + "value": 2.302279e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.Trappist1.HZLimMaxGreenhouse": { + "value": 4.417286e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.Trappist1.HZLimEarlyMars": { + "value": 4.817504e10, + "unit": u.m, + "rtol": 1e-4, }, - "log.final.Trappist1.TidalQ": {"value": 100.000000}, - "log.final.Trappist1.ImK2": {"value": -0.005000}, - "log.final.Trappist1.K2": {"value": 0.500000}, - "log.final.Trappist1.K2Man": {"value": 0.010000}, - "log.final.Trappist1.Imk2Man": {"value": 0.000000}, - "log.final.Trappist1.TidalQMantle": {"value": 100.000000}, - "log.final.Trappist1.HEcc": {"value": 0.000000}, - "log.final.Trappist1.HZLimitDryRunaway": {"value": 1.933388e10, "unit": u.m}, - "log.final.Trappist1.HZLimRecVenus": {"value": 1.739978e10, "unit": u.m}, - "log.final.Trappist1.HZLimRunaway": {"value": 2.289979e10, "unit": u.m}, - "log.final.Trappist1.HZLimMoistGreenhouse": {"value": 2.302279e10, "unit": u.m}, - "log.final.Trappist1.HZLimMaxGreenhouse": {"value": 4.417286e10, "unit": u.m}, - "log.final.Trappist1.HZLimEarlyMars": {"value": 4.817504e10, "unit": u.m}, "log.final.Trappist1.Instellation": { "value": -1.000000, "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.Trappist1.KEcc": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Trappist1.Eccentricity": {"value": -1.000000, "rtol": 1e-4}, + "log.final.Trappist1.OrbEnergy": { + "value": 0.000000, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.Trappist1.MeanMotion": { + "value": -1.000000, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.OrbPeriod": { + "value": -1.000000, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.SemiMajorAxis": { + "value": -1.000000, + "unit": u.m, + "rtol": 1e-4, }, - "log.final.Trappist1.KEcc": {"value": 0.000000}, - "log.final.Trappist1.Eccentricity": {"value": -1.000000}, - "log.final.Trappist1.OrbEnergy": {"value": 0.000000, "unit": u.Joule}, - "log.final.Trappist1.MeanMotion": {"value": -1.000000, "unit": 1 / u.sec}, - "log.final.Trappist1.OrbPeriod": {"value": -1.000000, "unit": u.sec}, - "log.final.Trappist1.SemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.final.Trappist1.CriticalSemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.final.Trappist1.COPP": {"value": 0.000000}, + "log.final.Trappist1.CriticalSemiMajorAxis": { + "value": -1.000000, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.Trappist1.COPP": {"value": 0.000000, "rtol": 1e-4}, "log.final.Trappist1.OrbAngMom": { "value": 0.000000, "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, }, - "log.final.Trappist1.LongP": {"value": 0.000000, "unit": u.rad}, + "log.final.Trappist1.LongP": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.Trappist1.LXUVTot": { "value": 7.797515e21, "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.Trappist1.TotOrbEnergy": { + "value": -5.151238e33, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.Trappist1.OrbPotEnergy": { + "value": -1.000000, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.Trappist1.LostEnergy": { + "value": 3.131169e36, + "unit": u.Joule, + "rtol": 1e-4, }, - "log.final.Trappist1.TotOrbEnergy": {"value": -5.151238e33, "unit": u.Joule}, - "log.final.Trappist1.OrbPotEnergy": {"value": -1.000000, "unit": u.Joule}, - "log.final.Trappist1.LostEnergy": {"value": 3.131169e36, "unit": u.Joule}, "log.final.Trappist1.LostAngMom": { "value": 5.325474e38, "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.LockTime": { + "value": -1.000000, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.BodyDsemiDtEqtide": {"value": -1.000000, "rtol": 1e-4}, + "log.final.Trappist1.BodyDeccDt": {"value": -1.000000, "rtol": 1e-4}, + "log.final.Trappist1.DOblDtEqtide": { + "value": 0.000000, + "unit": u.rad / u.sec, + "rtol": 1e-4, }, - "log.final.Trappist1.LockTime": {"value": -1.000000, "unit": u.sec}, - "log.final.Trappist1.BodyDsemiDtEqtide": {"value": -1.000000}, - "log.final.Trappist1.BodyDeccDt": {"value": -1.000000}, - "log.final.Trappist1.DOblDtEqtide": {"value": 0.000000, "unit": u.rad / u.sec}, - "log.final.Trappist1.DRotPerDtEqtide": {"value": 3.689301e-16}, + "log.final.Trappist1.DRotPerDtEqtide": {"value": 3.689301e-16, "rtol": 1e-4}, "log.final.Trappist1.DRotRateDtEqtide": { "value": -3.109450e-25, "unit": 1 / u.sec**2, + "rtol": 1e-4, }, "log.final.Trappist1.EqRotRateDiscrete": { "value": 5.544505e-06, "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.EqRotPerDiscrete": { + "value": 1.133228e06, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.EqRotRateCont": { + "value": 5.544715e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.EqRotPerCont": { + "value": 1.133184e06, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.EqRotPer": { + "value": 1.133228e06, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.EqTidePower": { + "value": 0.000000, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.GammaRot": { + "value": -1.000000, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.GammaOrb": { + "value": -1.000000, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.OceanK2": {"value": 0.010000, "rtol": 1e-4}, + "log.final.Trappist1.EnvTidalQ": {"value": -1.000000, "rtol": 1e-4}, + "log.final.Trappist1.OceanTidalQ": {"value": -1.000000, "rtol": 1e-4}, + "log.final.Trappist1.TideLock": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Trappist1.RotTimeEqtide": { + "value": 2.340324e20, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.Trappist1.EnvK2": {"value": 0.010000, "rtol": 1e-4}, + "log.final.Trappist1.OblTimeEqtide": {"value": -1.000000, "rtol": 1e-4}, + "log.final.Trappist1.PowerEqtide": { + "value": 9.954496e16, + "unit": u.W, + "rtol": 1e-4, }, - "log.final.Trappist1.EqRotPerDiscrete": {"value": 1.133228e06, "unit": u.sec}, - "log.final.Trappist1.EqRotRateCont": {"value": 5.544715e-06, "unit": 1 / u.sec}, - "log.final.Trappist1.EqRotPerCont": {"value": 1.133184e06, "unit": u.sec}, - "log.final.Trappist1.EqRotPer": {"value": 1.133228e06, "unit": u.sec}, - "log.final.Trappist1.EqTidePower": {"value": 0.000000, "unit": 1 / u.sec}, - "log.final.Trappist1.GammaRot": {"value": -1.000000, "unit": u.sec}, - "log.final.Trappist1.GammaOrb": {"value": -1.000000, "unit": u.sec}, - "log.final.Trappist1.OceanK2": {"value": 0.010000}, - "log.final.Trappist1.EnvTidalQ": {"value": -1.000000}, - "log.final.Trappist1.OceanTidalQ": {"value": -1.000000}, - "log.final.Trappist1.TideLock": {"value": 0.000000}, - "log.final.Trappist1.RotTimeEqtide": {"value": 2.340324e20, "unit": u.sec}, - "log.final.Trappist1.EnvK2": {"value": 0.010000}, - "log.final.Trappist1.OblTimeEqtide": {"value": -1.000000}, - "log.final.Trappist1.PowerEqtide": {"value": 9.954496e16, "unit": u.W}, "log.final.Trappist1.SurfEnFluxEqtide": { "value": 0.055745, "unit": u.kg / u.sec**3, - }, - "log.final.Trappist1.Luminosity": {"value": 0.020274, "unit": u.LSUN}, - "log.final.Trappist1.LXUVStellar": {"value": 2.027435e-05, "unit": u.LSUN}, - "log.final.Trappist1.Temperature": {"value": 2958.826369, "unit": u.K}, - "log.final.Trappist1.LXUVFrac": {"value": 0.001000}, - "log.final.Trappist1.RossbyNumber": {"value": 0.014473}, - "log.final.Trappist1.DRotPerDtStellar": {"value": -1.829957e-10}, - "log.final.g.Mass": {"value": 6.808292e24, "unit": u.kg}, - "log.final.g.Obliquity": {"value": 0.000000, "unit": u.rad}, - "log.final.g.PrecA": {"value": 0.000000, "unit": u.rad}, - "log.final.g.Xobl": {"value": 0.000000}, - "log.final.g.Yobl": {"value": 0.000000}, - "log.final.g.Zobl": {"value": 1.000000}, - "log.final.g.Radius": {"value": 7.334815e06, "unit": u.m}, - "log.final.g.RadGyra": {"value": 0.500000}, + "rtol": 1e-4, + }, + "log.final.Trappist1.Luminosity": { + "value": 0.020274, + "unit": u.LSUN, + "rtol": 1e-4, + }, + "log.final.Trappist1.LXUVStellar": { + "value": 2.027435e-05, + "unit": u.LSUN, + "rtol": 1e-4, + }, + "log.final.Trappist1.Temperature": { + "value": 2958.826369, + "unit": u.K, + "rtol": 1e-4, + }, + "log.final.Trappist1.LXUVFrac": {"value": 0.001000, "rtol": 1e-4}, + "log.final.Trappist1.RossbyNumber": {"value": 0.014473, "rtol": 1e-4}, + "log.final.Trappist1.DRotPerDtStellar": {"value": -1.829957e-10, "rtol": 1e-4}, + "log.final.g.Mass": {"value": 6.808292e24, "unit": u.kg, "rtol": 1e-4}, + "log.final.g.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, + "log.final.g.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, + "log.final.g.Xobl": {"value": 0.000000, "rtol": 1e-4}, + "log.final.g.Yobl": {"value": 0.000000, "rtol": 1e-4}, + "log.final.g.Zobl": {"value": 1.000000, "rtol": 1e-4}, + "log.final.g.Radius": {"value": 7.334815e06, "unit": u.m, "rtol": 1e-4}, + "log.final.g.RadGyra": {"value": 0.500000, "rtol": 1e-4}, "log.final.g.RotAngMom": { "value": 5.077141e32, "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.g.RotKinEnergy": { + "value": 1.407512e27, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.g.RotVel": {"value": 40.667915, "unit": u.m / u.sec, "rtol": 1e-4}, + "log.final.g.BodyType": {"value": 0.000000, "rtol": 1e-4}, + "log.final.g.RotRate": {"value": 5.544505e-06, "unit": 1 / u.sec, "rtol": 1e-4}, + "log.final.g.RotPer": {"value": 1.133228e06, "unit": u.sec, "rtol": 1e-4}, + "log.final.g.Density": { + "value": 4118.907830, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.g.SurfEnFluxTotal": { + "value": 0.126295, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.g.TidalQ": {"value": 100.000000, "rtol": 1e-4}, + "log.final.g.ImK2": {"value": -0.005000, "rtol": 1e-4}, + "log.final.g.K2": {"value": 0.500000, "rtol": 1e-4}, + "log.final.g.K2Man": {"value": 0.010000, "rtol": 1e-4}, + "log.final.g.Imk2Man": {"value": 0.000000, "rtol": 1e-4}, + "log.final.g.TidalQMantle": {"value": 100.000000, "rtol": 1e-4}, + "log.final.g.HEcc": {"value": 1.755450e-297, "rtol": 1e-4}, + "log.final.g.HZLimitDryRunaway": { + "value": 1.933392e10, + "unit": u.m, + "rtol": 1e-4, }, - "log.final.g.RotKinEnergy": {"value": 1.407512e27, "unit": u.Joule}, - "log.final.g.RotVel": {"value": 40.667915, "unit": u.m / u.sec}, - "log.final.g.BodyType": {"value": 0.000000}, - "log.final.g.RotRate": {"value": 5.544505e-06, "unit": 1 / u.sec}, - "log.final.g.RotPer": {"value": 1.133228e06, "unit": u.sec}, - "log.final.g.Density": {"value": 4118.907830, "unit": u.kg / u.m**3}, - "log.final.g.SurfEnFluxTotal": {"value": 0.126295, "unit": u.kg / u.sec**3}, - "log.final.g.TidalQ": {"value": 100.000000}, - "log.final.g.ImK2": {"value": -0.005000}, - "log.final.g.K2": {"value": 0.500000}, - "log.final.g.K2Man": {"value": 0.010000}, - "log.final.g.Imk2Man": {"value": 0.000000}, - "log.final.g.TidalQMantle": {"value": 100.000000}, - "log.final.g.HEcc": {"value": 1.755450e-297}, - "log.final.g.HZLimitDryRunaway": {"value": 1.933392e10, "unit": u.m}, - "log.final.g.HZLimRecVenus": {"value": 1.739978e10, "unit": u.m}, - "log.final.g.HZLimRunaway": {"value": 2.289979e10, "unit": u.m}, - "log.final.g.HZLimMoistGreenhouse": {"value": 2.302279e10, "unit": u.m}, - "log.final.g.HZLimMaxGreenhouse": {"value": 4.417286e10, "unit": u.m}, - "log.final.g.HZLimEarlyMars": {"value": 4.817504e10, "unit": u.m}, - "log.final.g.Instellation": {"value": 1.260523e04, "unit": u.kg / u.sec**3}, - "log.final.g.KEcc": {"value": 0.002000}, - "log.final.g.Eccentricity": {"value": 0.002000}, - "log.final.g.OrbEnergy": {"value": -5.151238e33, "unit": u.Joule}, - "log.final.g.MeanMotion": {"value": 5.544505e-06, "unit": 1 / u.sec}, - "log.final.g.OrbPeriod": {"value": 1.133228e06, "unit": u.sec}, - "log.final.g.SemiMajorAxis": {"value": 7.016140e09, "unit": u.m}, - "log.final.g.CriticalSemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.final.g.COPP": {"value": 0.000000}, + "log.final.g.HZLimRecVenus": {"value": 1.739978e10, "unit": u.m, "rtol": 1e-4}, + "log.final.g.HZLimRunaway": {"value": 2.289979e10, "unit": u.m, "rtol": 1e-4}, + "log.final.g.HZLimMoistGreenhouse": { + "value": 2.302279e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.g.HZLimMaxGreenhouse": { + "value": 4.417286e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.g.HZLimEarlyMars": {"value": 4.817504e10, "unit": u.m, "rtol": 1e-4}, + "log.final.g.Instellation": { + "value": 1.260523e04, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.g.KEcc": {"value": 0.002000, "rtol": 1e-4}, + "log.final.g.Eccentricity": {"value": 0.002000, "rtol": 1e-4}, + "log.final.g.OrbEnergy": {"value": -5.151238e33, "unit": u.Joule, "rtol": 1e-4}, + "log.final.g.MeanMotion": { + "value": 5.544505e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.OrbPeriod": {"value": 1.133228e06, "unit": u.sec, "rtol": 1e-4}, + "log.final.g.SemiMajorAxis": {"value": 7.016140e09, "unit": u.m, "rtol": 1e-4}, + "log.final.g.CriticalSemiMajorAxis": { + "value": -1.000000, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.g.COPP": {"value": 0.000000, "rtol": 1e-4}, "log.final.g.OrbAngMom": { "value": 1.858138e39, "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.g.LongP": {"value": 8.777249e-295, "unit": u.rad, "rtol": 1e-4}, + "log.final.g.LXUVTot": { + "value": -1.000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.g.TotOrbEnergy": { + "value": -5.151238e33, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.g.OrbPotEnergy": { + "value": -1.030248e34, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.g.LostEnergy": {"value": 1.104438e23, "unit": u.Joule, "rtol": 1e-4}, + "log.final.g.TidalRadius": {"value": 7.334815e06, "unit": u.m, "rtol": 1e-4}, + "log.final.g.DsemiDtEqtide": { + "value": 5.562685e-309, + "unit": u.m / u.sec, + "rtol": 1e-4, + }, + "log.final.g.DeccDtEqtide": { + "value": -9.414760e-21, + "unit": 1 / u.sec, + "rtol": 1e-4, }, - "log.final.g.LongP": {"value": 8.777249e-295, "unit": u.rad}, - "log.final.g.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec**3}, - "log.final.g.TotOrbEnergy": {"value": -5.151238e33, "unit": u.Joule}, - "log.final.g.OrbPotEnergy": {"value": -1.030248e34, "unit": u.Joule}, - "log.final.g.LostEnergy": {"value": 1.104438e23, "unit": u.Joule}, - "log.final.g.TidalRadius": {"value": 7.334815e06, "unit": u.m}, - "log.final.g.DsemiDtEqtide": {"value": 5.562685e-309, "unit": u.m / u.sec}, - "log.final.g.DeccDtEqtide": {"value": -9.414760e-21, "unit": 1 / u.sec}, "log.final.g.DMeanMotionDtEqtide": { "value": -4.940656e-324, "unit": 1 / u.sec**2, + "rtol": 1e-4, + }, + "log.final.g.DOrbPerDtEqtide": {"value": 1.347704e-312, "rtol": 1e-4}, + "log.final.g.EccTimeEqtide": { + "value": 3.155760e11, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.g.DHEccDtEqtide": { + "value": 5.562685e-309, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.DKEccDtEqtide": { + "value": 5.562685e-309, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.DXoblDtEqtide": { + "value": 0.000000, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.DYoblDtEqtide": { + "value": 0.000000, + "unit": 1 / u.sec, + "rtol": 1e-4, }, - "log.final.g.DOrbPerDtEqtide": {"value": 1.347704e-312}, - "log.final.g.EccTimeEqtide": {"value": 3.155760e11, "unit": u.sec}, - "log.final.g.DHEccDtEqtide": {"value": 5.562685e-309, "unit": 1 / u.sec}, - "log.final.g.DKEccDtEqtide": {"value": 5.562685e-309, "unit": 1 / u.sec}, - "log.final.g.DXoblDtEqtide": {"value": 0.000000, "unit": 1 / u.sec}, - "log.final.g.DYoblDtEqtide": {"value": 0.000000, "unit": 1 / u.sec}, - "log.final.g.DZoblDtEqtide": {"value": 0.000000, "unit": 1 / u.sec}, - "log.final.g.LockTime": {"value": 0.000000, "unit": u.sec}, - "log.final.g.BodyDsemiDtEqtide": {"value": -1.000000}, - "log.final.g.BodyDeccDt": {"value": -1.000000}, - "log.final.g.DOblDtEqtide": {"value": 0.000000, "unit": u.rad / u.sec}, - "log.final.g.DRotPerDtEqtide": {"value": -1.136943e-297}, + "log.final.g.DZoblDtEqtide": { + "value": 0.000000, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.LockTime": {"value": 0.000000, "unit": u.sec, "rtol": 1e-4}, + "log.final.g.BodyDsemiDtEqtide": {"value": -1.000000, "rtol": 1e-4}, + "log.final.g.BodyDeccDt": {"value": -1.000000, "rtol": 1e-4}, + "log.final.g.DOblDtEqtide": { + "value": 0.000000, + "unit": u.rad / u.sec, + "rtol": 1e-4, + }, + "log.final.g.DRotPerDtEqtide": {"value": -1.136943e-297, "rtol": 1e-4}, "log.final.g.DRotRateDtEqtide": { "value": 5.562685e-309, "unit": 1 / u.sec**2, + "rtol": 1e-4, + }, + "log.final.g.EqRotRateDiscrete": { + "value": 5.544505e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.EqRotPerDiscrete": { + "value": 1.133228e06, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.g.EqRotRateCont": { + "value": 5.544715e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.EqRotPerCont": {"value": 1.133184e06, "unit": u.sec, "rtol": 1e-4}, + "log.final.g.EqRotPer": {"value": 1.133228e06, "unit": u.sec, "rtol": 1e-4}, + "log.final.g.EqTidePower": { + "value": -0.000000, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.GammaRot": {"value": -1.000000, "unit": u.sec, "rtol": 1e-4}, + "log.final.g.GammaOrb": {"value": -1.000000, "unit": u.sec, "rtol": 1e-4}, + "log.final.g.OceanK2": {"value": 0.010000, "rtol": 1e-4}, + "log.final.g.EnvTidalQ": {"value": -1.000000, "rtol": 1e-4}, + "log.final.g.OceanTidalQ": {"value": -1.000000, "rtol": 1e-4}, + "log.final.g.TideLock": {"value": 1.000000, "rtol": 1e-4}, + "log.final.g.RotTimeEqtide": { + "value": 9.967318e302, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.g.EnvK2": {"value": 0.010000, "rtol": 1e-4}, + "log.final.g.OblTimeEqtide": {"value": -1.000000, "rtol": 1e-4}, + "log.final.g.PowerEqtide": {"value": 3.499752e11, "unit": u.W, "rtol": 1e-4}, + "log.final.g.SurfEnFluxEqtide": { + "value": 0.000518, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.g.D26AlPowerDt": {"value": -1.000000, "rtol": 1e-4}, + "log.final.g.D26AlNumManDt": { + "value": 0.000000, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.D40KPowerDt": {"value": -1.000000, "rtol": 1e-4}, + "log.final.g.D40KNumManDt": { + "value": -1.931830e26, + "unit": 1 / u.sec, + "rtol": 1e-4, }, - "log.final.g.EqRotRateDiscrete": {"value": 5.544505e-06, "unit": 1 / u.sec}, - "log.final.g.EqRotPerDiscrete": {"value": 1.133228e06, "unit": u.sec}, - "log.final.g.EqRotRateCont": {"value": 5.544715e-06, "unit": 1 / u.sec}, - "log.final.g.EqRotPerCont": {"value": 1.133184e06, "unit": u.sec}, - "log.final.g.EqRotPer": {"value": 1.133228e06, "unit": u.sec}, - "log.final.g.EqTidePower": {"value": -0.000000, "unit": 1 / u.sec}, - "log.final.g.GammaRot": {"value": -1.000000, "unit": u.sec}, - "log.final.g.GammaOrb": {"value": -1.000000, "unit": u.sec}, - "log.final.g.OceanK2": {"value": 0.010000}, - "log.final.g.EnvTidalQ": {"value": -1.000000}, - "log.final.g.OceanTidalQ": {"value": -1.000000}, - "log.final.g.TideLock": {"value": 1.000000}, - "log.final.g.RotTimeEqtide": {"value": 9.967318e302, "unit": u.sec}, - "log.final.g.EnvK2": {"value": 0.010000}, - "log.final.g.OblTimeEqtide": {"value": -1.000000}, - "log.final.g.PowerEqtide": {"value": 3.499752e11, "unit": u.W}, - "log.final.g.SurfEnFluxEqtide": {"value": 0.000518, "unit": u.kg / u.sec**3}, - "log.final.g.D26AlPowerDt": {"value": -1.000000}, - "log.final.g.D26AlNumManDt": {"value": 0.000000, "unit": 1 / u.sec}, - "log.final.g.D40KPowerDt": {"value": -1.000000}, - "log.final.g.D40KNumManDt": {"value": -1.931830e26, "unit": 1 / u.sec}, - "log.final.g.D232ThNumManDt": {"value": -1.086973e24, "unit": 1 / u.sec}, - "log.final.g.D238UNumManDt": {"value": -1.606035e24, "unit": 1 / u.sec}, - "log.final.g.D235UNumManDt": {"value": -3.521439e24, "unit": 1 / u.sec}, - "log.final.g.RadPowerMan": {"value": 8.503391e13, "unit": u.W}, - "log.final.g.RadPowerCore": {"value": -0.000000, "unit": u.W}, - "log.final.g.RadPowerCrust": {"value": -0.000000, "unit": u.W}, - "log.final.g.RadPowerTotal": {"value": 8.503391e13, "unit": u.W}, + "log.final.g.D232ThNumManDt": { + "value": -1.086973e24, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.D238UNumManDt": { + "value": -1.606035e24, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.D235UNumManDt": { + "value": -3.521439e24, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.RadPowerMan": {"value": 8.503391e13, "unit": u.W, "rtol": 1e-4}, + "log.final.g.RadPowerCore": {"value": -0.000000, "unit": u.W, "rtol": 1e-4}, + "log.final.g.RadPowerCrust": {"value": -0.000000, "unit": u.W, "rtol": 1e-4}, + "log.final.g.RadPowerTotal": {"value": 8.503391e13, "unit": u.W, "rtol": 1e-4}, "log.final.g.SurfEnFluxRadTotal": { "value": 0.125778, "unit": u.kg / u.sec**3, - }, - "log.final.g.SurfWaterMass": {"value": 2.780000e21, "unit": u.kg}, - "log.final.g.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, - "log.final.g.OxygenMass": {"value": 0.000000, "unit": u.kg}, - "log.final.g.RGLimit": {"value": 2.214290e10, "unit": u.m}, - "log.final.g.XO": {"value": 0.333333}, - "log.final.g.EtaO": {"value": 0.908264}, - "log.final.g.PlanetRadius": {"value": 7.334815e06, "unit": u.m}, - "log.final.g.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, - "log.final.g.RadXUV": {"value": -1.000000, "unit": u.m}, - "log.final.g.RadSolid": {"value": -1.000000, "unit": u.m}, - "log.final.g.PresXUV": {"value": 5.000000}, - "log.final.g.ScaleHeight": {"value": -1.000000, "unit": u.m}, - "log.final.g.ThermTemp": {"value": 288.700256, "unit": u.K}, - "log.final.g.AtmGasConst": {"value": 4124.000000}, - "log.final.g.PresSurf": {"value": -1.000000, "unit": u.Pa}, - "log.final.g.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, - "log.final.g.FXUV": {"value": 12.605228, "unit": u.W / u.m**2}, - "log.final.g.AtmXAbsEffH2O": {"value": 0.300000}, - "log.final.g.RocheRadius": {"value": 1.701655e08, "unit": u.m}, - "log.final.g.BondiRadius": {"value": 1.670086e08, "unit": u.m}, - "log.final.g.HEscapeRegime": {"value": 8.000000}, - "log.final.g.RRCriticalFlux": {"value": 40.154478, "unit": u.W / u.m**2}, - "log.final.g.KTide": {"value": 0.935384}, - "log.final.g.RGDuration": {"value": 0.00000e00, "unit": u.yr}, - "log.final.g.WaterMassMOAtm": {"value": 1.970140, "unit": u.TO}, - "log.final.g.PotTemp": {"value": 2341.642524, "unit": u.K}, - "log.final.g.SurfTemp": {"value": 4000.000000, "unit": u.K}, - "log.final.g.WaterMassSol": {"value": 0.027131, "unit": u.TO}, - "log.final.g.SolidRadius": {"value": 1.007041, "unit": u.Rearth}, - "log.final.g.OxygenMassMOAtm": {"value": 2.229468e17, "unit": u.kg}, - "log.final.g.OxygenMassSol": {"value": 8.607391e16, "unit": u.kg}, - "log.final.g.PressWaterAtm": {"value": 3.436476e06}, - "log.final.g.PressOxygenAtm": {"value": 0.000000}, - "log.final.g.HydrogenMassSpace": {"value": 4.244704e17, "unit": u.kg}, - "log.final.g.OxygenMassSpace": {"value": 3.059782e18, "unit": u.kg}, - "log.final.g.FracFe2O3Man": {"value": 1.024552e-06}, - "log.final.g.NetFluxAtmo": {"value": 1.052877e04}, - "log.final.g.WaterFracMelt": {"value": 0.002362}, - "log.final.g.RadioPower": {"value": 8.503391e13, "unit": u.W}, - "log.final.g.TidalPower": {"value": 3.499752e11, "unit": u.W}, - "log.final.g.HZInnerEdge": {"value": 2.214290e10, "unit": u.m}, - "log.final.g.MeltFraction": {"value": 0.474952}, - "log.final.g.CO2MassMOAtm": {"value": 1.755002e-297, "unit": u.kg}, - "log.final.g.CO2MassSol": {"value": 1.755002e-297, "unit": u.kg}, - "log.final.g.PressCO2Atm": {"value": 0.000000}, - "log.final.g.CO2FracMelt": {"value": 0.000000}, + "rtol": 1e-4, + }, + "log.final.g.SurfWaterMass": {"value": 2.780000e21, "unit": u.kg, "rtol": 1e-4}, + "log.final.g.EnvelopeMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.g.OxygenMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.g.RGLimit": {"value": 2.214290e10, "unit": u.m, "rtol": 1e-4}, + "log.final.g.XO": {"value": 0.333333, "rtol": 1e-4}, + "log.final.g.EtaO": {"value": 0.908264, "rtol": 1e-4}, + "log.final.g.PlanetRadius": {"value": 7.334815e06, "unit": u.m, "rtol": 1e-4}, + "log.final.g.OxygenMantleMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.g.RadXUV": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.g.RadSolid": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.g.PresXUV": {"value": 5.000000, "rtol": 1e-4}, + "log.final.g.ScaleHeight": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.g.ThermTemp": {"value": 288.700256, "unit": u.K, "rtol": 1e-4}, + "log.final.g.AtmGasConst": {"value": 4124.000000, "rtol": 1e-4}, + "log.final.g.PresSurf": {"value": -1.000000, "unit": u.Pa, "rtol": 1e-4}, + "log.final.g.DEnvMassDt": { + "value": 0.000000, + "unit": u.kg / u.sec, + "rtol": 1e-4, + }, + "log.final.g.FXUV": {"value": 12.605228, "unit": u.W / u.m**2, "rtol": 1e-4}, + "log.final.g.AtmXAbsEffH2O": {"value": 0.300000, "rtol": 1e-4}, + "log.final.g.RocheRadius": {"value": 1.701655e08, "unit": u.m, "rtol": 1e-4}, + "log.final.g.BondiRadius": {"value": 1.670086e08, "unit": u.m, "rtol": 1e-4}, + "log.final.g.HEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.g.RRCriticalFlux": { + "value": 40.154478, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.g.CrossoverMass": { + "value": 2.731806e-25, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.g.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.g.FXUVCRITDRAG": { + "value": 0.151738, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.g.HREFFLUX": { + "value": 9.824705e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.g.XH2O": {"value": 1.000000, "rtol": 1e-4}, + "log.final.g.HDiffFlux": { + "value": 1.090326e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.g.HRefODragMod": {"value": 0.120976, "rtol": 1e-4}, + "log.final.g.KTide": {"value": 0.935384, "rtol": 1e-4}, + "log.final.g.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, + "log.final.g.WaterMassMOAtm": {"value": 1.970140, "unit": u.TO, "rtol": 1e-4}, + "log.final.g.PotTemp": {"value": 2341.642524, "unit": u.K, "rtol": 1e-4}, + "log.final.g.SurfTemp": {"value": 4000.000000, "unit": u.K, "rtol": 1e-4}, + "log.final.g.WaterMassSol": {"value": 0.027131, "unit": u.TO, "rtol": 1e-4}, + "log.final.g.SolidRadius": {"value": 1.007041, "unit": u.Rearth, "rtol": 1e-4}, + "log.final.g.OxygenMassMOAtm": { + "value": 2.229468e17, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.g.OxygenMassSol": {"value": 8.607391e16, "unit": u.kg, "rtol": 1e-4}, + "log.final.g.PressWaterAtm": {"value": 3.436476e06, "rtol": 1e-4}, + "log.final.g.PressOxygenAtm": {"value": 0.000000, "rtol": 1e-4}, + "log.final.g.HydrogenMassSpace": { + "value": 4.244704e17, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.g.OxygenMassSpace": { + "value": 3.059782e18, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.g.FracFe2O3Man": {"value": 1.024552e-06, "rtol": 1e-4}, + "log.final.g.NetFluxAtmo": {"value": 1.052877e04, "rtol": 1e-4}, + "log.final.g.WaterFracMelt": {"value": 0.002362, "rtol": 1e-4}, + "log.final.g.RadioPower": {"value": 8.503391e13, "unit": u.W, "rtol": 1e-4}, + "log.final.g.TidalPower": {"value": 3.499752e11, "unit": u.W, "rtol": 1e-4}, + "log.final.g.HZInnerEdge": {"value": 2.214290e10, "unit": u.m, "rtol": 1e-4}, + "log.final.g.MeltFraction": {"value": 0.474952, "rtol": 1e-4}, + "log.final.g.CO2MassMOAtm": { + "value": 1.755002e-297, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.g.CO2MassSol": {"value": 1.755002e-297, "unit": u.kg, "rtol": 1e-4}, + "log.final.g.PressCO2Atm": {"value": 0.000000, "rtol": 1e-4}, + "log.final.g.CO2FracMelt": {"value": 0.000000, "rtol": 1e-4}, } ) -class TestMagmOc_Trappist1g(Benchmark): +class Test_MagmOc_Trappist1g(Benchmark): pass diff --git a/tests/AtmescEqtideStellar/Lopez12CPL/test_Lopez12CPL.py b/tests/AtmescEqtideStellar/Lopez12CPL/test_Lopez12CPL.py index 424aa037e..eca8bb3b0 100644 --- a/tests/AtmescEqtideStellar/Lopez12CPL/test_Lopez12CPL.py +++ b/tests/AtmescEqtideStellar/Lopez12CPL/test_Lopez12CPL.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -238,6 +237,23 @@ "log.initial.auto.BondiRadius": {"value": 7.899468e08, "unit": u.m}, "log.initial.auto.HEscapeRegime": {"value": 3.000000}, "log.initial.auto.RRCriticalFlux": {"value": 0.000139, "unit": u.W / u.m**2}, + "log.initial.auto.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.auto.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.auto.FXUVCRITDRAG": { + "value": 3.000221e-05, + "unit": u.W / u.m**2, + }, + "log.initial.auto.HREFFLUX": { + "value": 8.289171e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.auto.XO2": {"value": 0.000000}, + "log.initial.auto.XH2O": {"value": 0.000000}, + "log.initial.auto.HDiffFlux": { + "value": 3.512237e14, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.auto.HRefODragMod": {"value": 1.000000}, "log.initial.auto.KTide": {"value": 1.000000}, "log.initial.auto.RGDuration": {"value": 1.00000e06, "unit": u.yr}, "log.initial.bondi.Mass": {"value": 2.000000, "unit": u.Mearth}, @@ -368,6 +384,23 @@ "log.initial.bondi.BondiRadius": {"value": 7.899468e08, "unit": u.m}, "log.initial.bondi.HEscapeRegime": {"value": 5.000000}, "log.initial.bondi.RRCriticalFlux": {"value": 0.000139, "unit": u.W / u.m**2}, + "log.initial.bondi.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.bondi.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.bondi.FXUVCRITDRAG": { + "value": 3.000221e-05, + "unit": u.W / u.m**2, + }, + "log.initial.bondi.HREFFLUX": { + "value": 8.289171e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.bondi.XO2": {"value": 0.000000}, + "log.initial.bondi.XH2O": {"value": 0.000000}, + "log.initial.bondi.HDiffFlux": { + "value": 3.512237e14, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.bondi.HRefODragMod": {"value": 1.000000}, "log.initial.bondi.KTide": {"value": 1.000000}, "log.initial.bondi.RGDuration": {"value": 1.00000e06, "unit": u.yr}, "log.initial.el.Mass": {"value": 2.000000, "unit": u.Mearth}, @@ -489,6 +522,17 @@ "log.initial.el.BondiRadius": {"value": 7.899468e08, "unit": u.m}, "log.initial.el.HEscapeRegime": {"value": 3.000000}, "log.initial.el.RRCriticalFlux": {"value": 0.000139, "unit": u.W / u.m**2}, + "log.initial.el.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.el.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.el.FXUVCRITDRAG": {"value": 3.000221e-05, "unit": u.W / u.m**2}, + "log.initial.el.HREFFLUX": {"value": 8.289171e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.el.XO2": {"value": 0.000000}, + "log.initial.el.XH2O": {"value": 0.000000}, + "log.initial.el.HDiffFlux": { + "value": 3.512237e14, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.el.HRefODragMod": {"value": 1.000000}, "log.initial.el.KTide": {"value": 1.000000}, "log.initial.el.RGDuration": {"value": 1.00000e06, "unit": u.yr}, "log.initial.rr.Mass": {"value": 2.000000, "unit": u.Mearth}, @@ -610,6 +654,17 @@ "log.initial.rr.BondiRadius": {"value": 7.899468e08, "unit": u.m}, "log.initial.rr.HEscapeRegime": {"value": 6.000000}, "log.initial.rr.RRCriticalFlux": {"value": 0.000139, "unit": u.W / u.m**2}, + "log.initial.rr.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.rr.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.rr.FXUVCRITDRAG": {"value": 3.000221e-05, "unit": u.W / u.m**2}, + "log.initial.rr.HREFFLUX": {"value": 8.289171e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.rr.XO2": {"value": 0.000000}, + "log.initial.rr.XH2O": {"value": 0.000000}, + "log.initial.rr.HDiffFlux": { + "value": 3.512237e14, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.rr.HRefODragMod": {"value": 1.000000}, "log.initial.rr.KTide": {"value": 1.000000}, "log.initial.rr.RGDuration": {"value": 1.00000e06, "unit": u.yr}, "log.final.system.Age": {"value": 6.311520e13, "unit": u.sec, "rtol": 1e-4}, @@ -634,11 +689,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 4.863245e08, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.star.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -1118,6 +1168,26 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.auto.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.auto.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.auto.FXUVCRITDRAG": { + "value": 3.177121e-05, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.auto.HREFFLUX": { + "value": 9.438997e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.auto.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.auto.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.auto.HDiffFlux": { + "value": 4.098596e14, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.auto.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.auto.KTide": {"value": 0.100000, "rtol": 1e-4}, "log.final.auto.RGDuration": {"value": 1.00000e06, "unit": u.yr, "rtol": 1e-4}, "log.final.bondi.Mass": {"value": 1.000000, "unit": u.Mearth, "rtol": 1e-4}, @@ -1437,6 +1507,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.bondi.CrossoverMass": { + "value": 0.000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.bondi.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.bondi.FXUVCRITDRAG": { + "value": 0.266361, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.bondi.HREFFLUX": { + "value": 5.387538e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.bondi.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.bondi.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.bondi.HDiffFlux": { + "value": 1.897311e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.bondi.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.bondi.KTide": {"value": 0.936113, "rtol": 1e-4}, "log.final.bondi.RGDuration": {"value": 1.00000e06, "unit": u.yr, "rtol": 1e-4}, "log.final.el.Mass": {"value": 1.986370, "unit": u.Mearth, "rtol": 1e-4}, @@ -1712,6 +1806,26 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.el.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.el.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.el.FXUVCRITDRAG": { + "value": 3.010328e-05, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.el.HREFFLUX": { + "value": 8.735740e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.el.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.el.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.el.HDiffFlux": { + "value": 3.528154e14, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.el.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.el.KTide": {"value": 1.000000, "rtol": 1e-4}, "log.final.el.RGDuration": {"value": 1.00000e06, "unit": u.yr, "rtol": 1e-4}, "log.final.rr.Mass": {"value": 1.999399, "unit": u.Mearth, "rtol": 1e-4}, @@ -1987,9 +2101,29 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.rr.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.rr.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.rr.FXUVCRITDRAG": { + "value": 3.000650e-05, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.rr.HREFFLUX": { + "value": 8.716219e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.rr.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.rr.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.rr.HDiffFlux": { + "value": 3.512924e14, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.rr.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.rr.KTide": {"value": 1.000000, "rtol": 1e-4}, "log.final.rr.RGDuration": {"value": 1.00000e06, "unit": u.yr, "rtol": 1e-4}, } ) -class TestLopez12CPL(Benchmark): +class Test_Lopez12CPL(Benchmark): pass diff --git a/tests/AtmescEqtideStellar/WaterLossCPL/test_WaterLossCPL.py b/tests/AtmescEqtideStellar/WaterLossCPL/test_WaterLossCPL.py index a46627727..91b0f2076 100644 --- a/tests/AtmescEqtideStellar/WaterLossCPL/test_WaterLossCPL.py +++ b/tests/AtmescEqtideStellar/WaterLossCPL/test_WaterLossCPL.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -232,6 +231,14 @@ "log.initial.b.BondiRadius": {"value": 7.899468e08, "unit": u.m}, "log.initial.b.HEscapeRegime": {"value": 8.000000}, "log.initial.b.RRCriticalFlux": {"value": 41.738709, "unit": u.W / u.m**2}, + "log.initial.b.CrossoverMass": {"value": 3.134896e-26, "unit": u.kg}, + "log.initial.b.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.b.FXUVCRITDRAG": {"value": 0.928046, "unit": u.W / u.m**2}, + "log.initial.b.HREFFLUX": {"value": 3.449656e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.XO2": {"value": 0.000000}, + "log.initial.b.XH2O": {"value": 1.000000}, + "log.initial.b.HDiffFlux": {"value": 1.264874e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.HRefODragMod": {"value": 0.437037}, "log.initial.b.KTide": {"value": 0.881557}, "log.initial.b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 6.311520e13, "unit": u.sec, "rtol": 1e-4}, @@ -256,11 +263,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 8.395211e09, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.988416e29, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.star.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -684,9 +686,33 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.b.CrossoverMass": { + "value": 3.134643e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.b.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.b.FXUVCRITDRAG": { + "value": 0.927427, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.HREFFLUX": { + "value": 3.450240e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.XO2": {"value": 0.001098, "rtol": 1e-4}, + "log.final.b.XH2O": {"value": 0.998902, "rtol": 1e-4}, + "log.final.b.HDiffFlux": { + "value": 1.263948e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.HRefODragMod": {"value": 0.436606, "rtol": 1e-4}, "log.final.b.KTide": {"value": 0.881540, "rtol": 1e-4}, "log.final.b.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, } ) -class TestWaterLossCPL(Benchmark): +class Test_WaterLossCPL(Benchmark): pass diff --git a/tests/AtmescEqtideStellar/WaterLossCTL/test_WaterLossCTL.py b/tests/AtmescEqtideStellar/WaterLossCTL/test_WaterLossCTL.py index 0d91726d0..ebb805ff6 100644 --- a/tests/AtmescEqtideStellar/WaterLossCTL/test_WaterLossCTL.py +++ b/tests/AtmescEqtideStellar/WaterLossCTL/test_WaterLossCTL.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -217,6 +216,14 @@ "log.initial.b.BondiRadius": {"value": 7.899468e08, "unit": u.m}, "log.initial.b.HEscapeRegime": {"value": 8.000000}, "log.initial.b.RRCriticalFlux": {"value": 41.738709, "unit": u.W / u.m**2}, + "log.initial.b.CrossoverMass": {"value": 3.134896e-26, "unit": u.kg}, + "log.initial.b.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.b.FXUVCRITDRAG": {"value": 0.928046, "unit": u.W / u.m**2}, + "log.initial.b.HREFFLUX": {"value": 3.449656e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.XO2": {"value": 0.000000}, + "log.initial.b.XH2O": {"value": 1.000000}, + "log.initial.b.HDiffFlux": {"value": 1.264874e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.HRefODragMod": {"value": 0.437037}, "log.initial.b.KTide": {"value": 0.881557}, "log.initial.b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 6.311520e13, "unit": u.sec, "rtol": 1e-4}, @@ -241,11 +248,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 1.939619e10, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.988416e29, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.star.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -633,9 +635,33 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.b.CrossoverMass": { + "value": 3.134483e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.b.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.b.FXUVCRITDRAG": { + "value": 0.927295, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.HREFFLUX": { + "value": 3.449698e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.XO2": {"value": 0.001220, "rtol": 1e-4}, + "log.final.b.XH2O": {"value": 0.998780, "rtol": 1e-4}, + "log.final.b.HDiffFlux": { + "value": 1.263845e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.HRefODragMod": {"value": 0.436615, "rtol": 1e-4}, "log.final.b.KTide": {"value": 0.881556, "rtol": 1e-4}, "log.final.b.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, } ) -class TestWaterLossCTL(Benchmark): +class Test_WaterLossCTL(Benchmark): pass diff --git a/tests/AtmescFlareStellar/AtmEscFlareDavenport/test_AtmEscFlareDavenport.py b/tests/AtmescFlareStellar/AtmEscFlareDavenport/test_AtmEscFlareDavenport.py index 7a19a3521..a56b429f3 100644 --- a/tests/AtmescFlareStellar/AtmEscFlareDavenport/test_AtmEscFlareDavenport.py +++ b/tests/AtmescFlareStellar/AtmEscFlareDavenport/test_AtmEscFlareDavenport.py @@ -1,201 +1,487 @@ -from benchmark import Benchmark, benchmark -import astropy.units as u -import pytest - -@benchmark( - { - "log.initial.system.Age": {"value": 3.1557600000e+14, "unit": u.sec}, - "log.initial.system.Time": {"value": 0.0000000000, "unit": u.sec}, - "log.initial.system.TotAngMom": {"value": 3.7230704732e+41, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.system.TotEnergy": {"value": -7.1876127212e+39, "unit": u.Joule}, - "log.initial.system.PotEnergy": {"value": -7.2010481575e+39, "unit": u.Joule}, - "log.initial.system.KinEnergy": {"value": 1.3444021724e+37, "unit": u.Joule}, - "log.initial.system.DeltaTime": {"value": 0.0000000000, "unit": u.sec}, - "log.initial.star.Mass": {"value": 2.3860992000e+29, "unit": u.kg}, - "log.initial.star.Radius": {"value": 3.1661898155e+08, "unit": u.m}, - "log.initial.star.RadGyra": {"value": 0.4610332834}, - "log.initial.star.RotAngMom": {"value": 3.6973713815e+41, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.star.RotVel": {"value": 2.3025182093e+04, "unit": u.m / u.sec}, - "log.initial.star.BodyType": {"value": 0.0000000000}, - "log.initial.star.RotRate": {"value": 7.2722052166e-05, "unit": 1 / u.sec}, - "log.initial.star.RotPer": {"value": 8.6400000000e+04, "unit": u.sec}, - "log.initial.star.Density": {"value": 1794.6883475331, "unit": u.kg / u.m ** 3}, - "log.initial.star.HZLimitDryRunaway": {"value": 1.7757648517e+10, "unit": u.m}, - "log.initial.star.HZLimRecVenus": {"value": 1.5942915196e+10, "unit": u.m}, - "log.initial.star.HZLimRunaway": {"value": 2.1005311219e+10, "unit": u.m}, - "log.initial.star.HZLimMoistGreenhouse": {"value": 2.1095107199e+10, "unit": u.m}, - "log.initial.star.HZLimMaxGreenhouse": {"value": 4.0266652294e+10, "unit": u.m}, - "log.initial.star.HZLimEarlyMars": {"value": 4.3914925610e+10, "unit": u.m}, - "log.initial.star.Instellation": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3}, - "log.initial.star.CriticalSemiMajorAxis": {"value": -1.0000000000, "unit": u.m}, - "log.initial.star.LXUVTot": {"value": 7.4586842042e+21, "unit": u.kg / u.sec ** 3}, - "log.initial.star.LostEnergy": {"value": 5.5626846463e-309, "unit": u.Joule}, - "log.initial.star.LostAngMom": {"value": 5.5626846463e-309, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.star.Luminosity": {"value": 6.5779241790e+24, "unit": u.W}, - "log.initial.star.LXUVStellar": {"value": 1.7103286997e-05, "unit": u.LSUN}, - "log.initial.star.Temperature": {"value": 3095.3300004448, "unit": u.K}, - "log.initial.star.LXUVFrac": {"value": 0.0010000000}, - "log.initial.star.RossbyNumber": {"value": 0.0155317554}, - "log.initial.star.DRotPerDtStellar": {"value": -1.1359491987e-10}, - "log.initial.star.LXUVFlare": {"value": 2.2900676680e-06, "unit": u.LSUN}, - "log.initial.star.FlareFreq1": {"value": 7.6539612209e-07, "unit": 1 / u.sec}, - "log.initial.star.FlareFreq2": {"value": 7.1257446845e-07, "unit": 1 / u.sec}, - "log.initial.star.FlareFreq3": {"value": 6.6339815220e-07, "unit": 1 / u.sec}, - "log.initial.star.FlareFreq4": {"value": 6.1761560065e-07, "unit": 1 / u.sec}, - "log.initial.star.FlareFreqMin": {"value": 7.6539612209e-07, "unit": 1 / u.sec}, - "log.initial.star.FlareFreqMid": {"value": 2.1433162542e-08, "unit": 1 / u.sec}, - "log.initial.star.FlareFreqMax": {"value": 6.0018654825e-10, "unit": 1 / u.sec}, - "log.initial.star.FlareEnergy1": {"value": 1.0000000000e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergy2": {"value": 1.0715193052e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergy3": {"value": 1.1481536215e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergy4": {"value": 1.2302687708e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergyMin": {"value": 1.0000000000e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergyMid": {"value": 3.1622776602e+27, "unit": u.Joule}, - "log.initial.star.FlareEnergyMax": {"value": 1.0000000000e+29, "unit": u.Joule}, - "log.initial.b.Mass": {"value": 7.5846762200e+24, "unit": u.kg}, - "log.initial.b.Radius": {"value": 8.8005344212e+06, "unit": u.m}, - "log.initial.b.RadGyra": {"value": 0.5000000000}, - "log.initial.b.BodyType": {"value": 0.0000000000}, - "log.initial.b.Density": {"value": 2656.5702144167, "unit": u.kg / u.m ** 3}, - "log.initial.b.HZLimitDryRunaway": {"value": 1.7814747212e+10, "unit": u.m}, - "log.initial.b.HZLimRecVenus": {"value": 1.5942915196e+10, "unit": u.m}, - "log.initial.b.HZLimRunaway": {"value": 2.1005311219e+10, "unit": u.m}, - "log.initial.b.HZLimMoistGreenhouse": {"value": 2.1095107199e+10, "unit": u.m}, - "log.initial.b.HZLimMaxGreenhouse": {"value": 4.0266652294e+10, "unit": u.m}, - "log.initial.b.HZLimEarlyMars": {"value": 4.3914925610e+10, "unit": u.m}, - "log.initial.b.Instellation": {"value": 9975.5972427825, "unit": u.kg / u.sec ** 3}, - "log.initial.b.MeanMotion": {"value": 6.4573248494e-06, "unit": 1 / u.sec}, - "log.initial.b.OrbPeriod": {"value": 9.7303224691e+05, "unit": u.sec}, - "log.initial.b.SemiMajorAxis": {"value": 7.2554967289e+09, "unit": u.m}, - "log.initial.b.LXUVTot": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3}, - "log.initial.b.SurfWaterMass": {"value": 1.5000000000, "unit": u.TO}, - "log.initial.b.EnvelopeMass": {"value": 0.0010000000, "unit": u.Mearth}, - "log.initial.b.OxygenMass": {"value": 0.0000000000, "unit": u.bar}, - "log.initial.b.RGLimit": {"value": 2.0225735532e+10, "unit": u.m}, - "log.initial.b.XO": {"value": 0.3333333333}, - "log.initial.b.EtaO": {"value": 0.0000000000}, - "log.initial.b.PlanetRadius": {"value": 1.3798050236, "unit": u.Rearth}, - "log.initial.b.OxygenMantleMass": {"value": 0.0000000000, "unit": u.kg}, - "log.initial.b.RadXUV": {"value": -1.0000000000, "unit": u.m}, - "log.initial.b.RadSolid": {"value": -1.0000000000, "unit": u.m}, - "log.initial.b.PresXUV": {"value": 5.0000000000}, - "log.initial.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m}, - "log.initial.b.ThermTemp": {"value": 400.0000000000, "unit": u.K}, - "log.initial.b.AtmGasConst": {"value": 4124.0000000000}, - "log.initial.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa}, - "log.initial.b.DEnvMassDt": {"value": -7.8244286870e+06, "unit": u.kg / u.sec}, - "log.initial.b.FXUV": {"value": 11.3112932829, "unit": u.W / u.m ** 2}, - "log.initial.b.AtmXAbsEffH2O": {"value": 0.3000000000}, - "log.initial.b.RocheRadius": {"value": 1.5935887288e+08, "unit": u.m}, - "log.initial.b.BondiRadius": {"value": 1.9083081091e+08, "unit": u.m}, - "log.initial.b.HEscapeRegime": {"value": 3.0000000000}, - "log.initial.b.RRCriticalFlux": {"value": 27.7437416693, "unit": u.W / u.m ** 2}, - "log.initial.b.CrossoverMass": {"value": 0.0000000000, "unit": u.kg}, - "log.initial.b.WaterEscapeRegime": {"value": 8.0000000000}, - "log.initial.b.FXUVCRITDRAG": {"value": 0.1090267838, "unit": u.W / u.m ** 2}, - "log.initial.b.HREFFLUX": {"value": 9.6829037992e+18, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.b.XO2": {"value": 0.0000000000}, - "log.initial.b.XH2O": {"value": 1.0000000000}, - "log.initial.b.HDiffFlux": {"value": 8.4375341524e+16, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.b.HRefODragMod": {"value": 0.0077519380}, - "log.initial.b.KTide": {"value": 0.9172472694}, - "log.initial.b.RGDuration": {"value": 0.00000e+00, "unit": u.yr}, - "log.final.system.Age": {"value": 3.4713360000e+15, "unit": u.sec, "rtol": 1e-4}, - "log.final.system.Time": {"value": 3.1557600000e+15, "unit": u.sec, "rtol": 1e-4}, - "log.final.system.TotAngMom": {"value": 3.7341579011e+41, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.system.TotEnergy": {"value": -7.1773447078e+39, "unit": u.Joule, "rtol": 1e-4}, - "log.final.system.PotEnergy": {"value": -1.6690355074e+40, "unit": u.Joule, "rtol": 1e-4}, - "log.final.system.KinEnergy": {"value": 1.4205267538e+37, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.Mass": {"value": 2.3860992000e+29, "unit": u.kg, "rtol": 1e-4}, - "log.final.star.Radius": {"value": 1.3660515451e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.star.RadGyra": {"value": 0.4634687441, "rtol": 1e-4}, - "log.final.star.RotAngMom": {"value": 1.6484337287e+41, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.star.RotVel": {"value": 2.3543715870e+04, "unit": u.m / u.sec, "rtol": 1e-4}, - "log.final.star.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, - "log.final.star.RotRate": {"value": 0.0001723487, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.RotPer": {"value": 3.6456246094e+04, "unit": u.sec, "rtol": 1e-4}, - "log.final.star.Density": {"value": 2.2345939842e+04, "unit": u.kg / u.m ** 3, "rtol": 1e-4}, - "log.final.star.HZLimitDryRunaway": {"value": 7.5299891659e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimRecVenus": {"value": 6.7635458270e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimRunaway": {"value": 8.9093065315e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimMoistGreenhouse": {"value": 8.9492880013e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimMaxGreenhouse": {"value": 1.7098800924e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimEarlyMars": {"value": 1.8647990862e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.star.Instellation": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.star.CriticalSemiMajorAxis": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.star.LXUVTot": {"value": 1.3924392185e+21, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.star.LostEnergy": {"value": 9.4988137536e+39, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.LostAngMom": {"value": 2.0600453589e+41, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.star.Luminosity": {"value": 1.1827873055e+24, "unit": u.W, "rtol": 1e-4}, - "log.final.star.LXUVStellar": {"value": 2.7351703006e-06, "unit": u.LSUN, "rtol": 1e-4}, - "log.final.star.Temperature": {"value": 3070.0998661274, "unit": u.K, "rtol": 1e-4}, - "log.final.star.LXUVFrac": {"value": 0.0008893793, "rtol": 1e-4}, - "log.final.star.RossbyNumber": {"value": 0.0064694415, "rtol": 1e-4}, - "log.final.star.DRotPerDtStellar": {"value": -2.9636773892e-12, "rtol": 1e-4}, - "log.final.star.LXUVFlare": {"value": 8.8531477149e-07, "unit": u.LSUN, "rtol": 1e-4}, - "log.final.star.FlareFreq1": {"value": 3.7279360348e-07, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreq2": {"value": 3.4532301760e-07, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreq3": {"value": 3.1987669684e-07, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreq4": {"value": 2.9630547623e-07, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreqMin": {"value": 3.7279360348e-07, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreqMid": {"value": 8.1156296479e-09, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreqMax": {"value": 1.7667536129e-10, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareEnergy1": {"value": 1.0000000000e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergy2": {"value": 1.0715193052e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergy3": {"value": 1.1481536215e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergy4": {"value": 1.2302687708e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergyMin": {"value": 1.0000000000e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergyMid": {"value": 3.1622776602e+27, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergyMax": {"value": 1.0000000000e+29, "unit": u.Joule, "rtol": 1e-4}, - "log.final.b.Mass": {"value": 7.5787040340e+24, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.Radius": {"value": 6.8050745192e+06, "unit": u.m, "rtol": 1e-4}, - "log.final.b.RadGyra": {"value": 0.5000000000, "rtol": 1e-4}, - "log.final.b.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, - "log.final.b.Density": {"value": 5741.2661742908, "unit": u.kg / u.m ** 3, "rtol": 1e-4}, - "log.final.b.HZLimitDryRunaway": {"value": 7.5542014122e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimRecVenus": {"value": 6.7635458270e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimRunaway": {"value": 8.9093065315e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimMoistGreenhouse": {"value": 8.9492880013e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimMaxGreenhouse": {"value": 1.7098800924e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimEarlyMars": {"value": 1.8647990862e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.b.Instellation": {"value": 1793.7284563913, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.b.MeanMotion": {"value": 6.4573247685e-06, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.b.OrbPeriod": {"value": 9.7303225908e+05, "unit": u.sec, "rtol": 1e-4}, - "log.final.b.SemiMajorAxis": {"value": 7.2554967289e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.LXUVTot": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.b.SurfWaterMass": {"value": 1.0402108220, "unit": u.TO, "rtol": 1e-4}, - "log.final.b.EnvelopeMass": {"value": 0.0000000000, "unit": u.Mearth, "rtol": 1e-4}, - "log.final.b.OxygenMass": {"value": 43.5932915978, "unit": u.bar, "rtol": 1e-4}, - "log.final.b.RGLimit": {"value": 8.5788654152e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.XO": {"value": 0.3712092327, "rtol": 1e-4}, - "log.final.b.EtaO": {"value": 0.5563641730, "rtol": 1e-4}, - "log.final.b.PlanetRadius": {"value": 1.0669438421, "unit": u.Rearth, "rtol": 1e-4}, - "log.final.b.OxygenMantleMass": {"value": 0.0000000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.RadXUV": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.RadSolid": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.PresXUV": {"value": 5.0000000000, "rtol": 1e-4}, - "log.final.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.ThermTemp": {"value": 400.0000000000, "unit": u.K, "rtol": 1e-4}, - "log.final.b.AtmGasConst": {"value": 4124.0000000000, "rtol": 1e-4}, - "log.final.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa, "rtol": 1e-4}, - "log.final.b.DEnvMassDt": {"value": 5.5626846463e-309, "unit": u.kg / u.sec, "rtol": 1e-4}, - "log.final.b.FXUV": {"value": 2.1116711671, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.AtmXAbsEffH2O": {"value": 0.3000000000, "rtol": 1e-4}, - "log.final.b.RocheRadius": {"value": 1.5931703542e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.b.BondiRadius": {"value": 2.9268184331e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HEscapeRegime": {"value": 8.0000000000, "rtol": 1e-4}, - "log.final.b.RRCriticalFlux": {"value": 62.3818675680, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.CrossoverMass": {"value": 4.8764660612e-26, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.WaterEscapeRegime": {"value": 3.0000000000, "rtol": 1e-4}, - "log.final.b.FXUVCRITDRAG": {"value": 0.2220623340, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.HREFFLUX": {"value": 1.3709166600e+18, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.b.XO2": {"value": 0.0828667832, "rtol": 1e-4}, - "log.final.b.XH2O": {"value": 0.9171332168, "rtol": 1e-4}, - "log.final.b.HDiffFlux": {"value": 1.3299128469e+17, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.b.HRefODragMod": {"value": 0.1834554926, "rtol": 1e-4}, - "log.final.b.KTide": {"value": 0.9359679029, "rtol": 1e-4}, - "log.final.b.RGDuration": {"value": 0.00000e+00, "unit": u.yr, "rtol": 1e-4}, - } +import astropy.units as u +from benchmark import Benchmark, benchmark + + +@benchmark( + { + "log.initial.system.Age": {"value": 3.1557600000e14, "unit": u.sec}, + "log.initial.system.Time": {"value": 0.0000000000, "unit": u.sec}, + "log.initial.system.TotAngMom": { + "value": 3.7230704732e41, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.system.TotEnergy": {"value": -7.1876127212e39, "unit": u.Joule}, + "log.initial.system.PotEnergy": {"value": -7.2010481575e39, "unit": u.Joule}, + "log.initial.system.KinEnergy": {"value": 1.3444021724e37, "unit": u.Joule}, + "log.initial.system.DeltaTime": {"value": 0.0000000000, "unit": u.sec}, + "log.initial.star.Mass": {"value": 2.3860992000e29, "unit": u.kg}, + "log.initial.star.Radius": {"value": 3.1661898155e08, "unit": u.m}, + "log.initial.star.RadGyra": {"value": 0.4610332834}, + "log.initial.star.RotAngMom": { + "value": 3.6973713815e41, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.star.RotVel": {"value": 2.3025182093e04, "unit": u.m / u.sec}, + "log.initial.star.BodyType": {"value": 0.0000000000}, + "log.initial.star.RotRate": {"value": 7.2722052166e-05, "unit": 1 / u.sec}, + "log.initial.star.RotPer": {"value": 8.6400000000e04, "unit": u.sec}, + "log.initial.star.Density": {"value": 1794.6883475331, "unit": u.kg / u.m**3}, + "log.initial.star.HZLimitDryRunaway": {"value": 1.7757648517e10, "unit": u.m}, + "log.initial.star.HZLimRecVenus": {"value": 1.5942915196e10, "unit": u.m}, + "log.initial.star.HZLimRunaway": {"value": 2.1005311219e10, "unit": u.m}, + "log.initial.star.HZLimMoistGreenhouse": { + "value": 2.1095107199e10, + "unit": u.m, + }, + "log.initial.star.HZLimMaxGreenhouse": {"value": 4.0266652294e10, "unit": u.m}, + "log.initial.star.HZLimEarlyMars": {"value": 4.3914925610e10, "unit": u.m}, + "log.initial.star.Instellation": { + "value": -1.0000000000, + "unit": u.kg / u.sec**3, + }, + "log.initial.star.CriticalSemiMajorAxis": {"value": -1.0000000000, "unit": u.m}, + "log.initial.star.LXUVTot": { + "value": 7.4586842042e21, + "unit": u.kg / u.sec**3, + }, + "log.initial.star.LostEnergy": {"value": 5.5626846463e-309, "unit": u.Joule}, + "log.initial.star.LostAngMom": { + "value": 5.5626846463e-309, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.star.Luminosity": {"value": 6.5779241790e24, "unit": u.W}, + "log.initial.star.LXUVStellar": {"value": 1.7103286997e-05, "unit": u.LSUN}, + "log.initial.star.Temperature": {"value": 3095.3300004448, "unit": u.K}, + "log.initial.star.LXUVFrac": {"value": 0.0010000000}, + "log.initial.star.RossbyNumber": {"value": 0.0155317554}, + "log.initial.star.DRotPerDtStellar": {"value": -1.1359491987e-10}, + "log.initial.star.LXUVFlare": {"value": 2.2900676680e-06, "unit": u.LSUN}, + "log.initial.star.FlareFreq1": {"value": 7.6539612209e-07, "unit": 1 / u.sec}, + "log.initial.star.FlareFreq2": {"value": 7.1257446845e-07, "unit": 1 / u.sec}, + "log.initial.star.FlareFreq3": {"value": 6.6339815220e-07, "unit": 1 / u.sec}, + "log.initial.star.FlareFreq4": {"value": 6.1761560065e-07, "unit": 1 / u.sec}, + "log.initial.star.FlareFreqMin": {"value": 7.6539612209e-07, "unit": 1 / u.sec}, + "log.initial.star.FlareFreqMid": {"value": 2.1433162542e-08, "unit": 1 / u.sec}, + "log.initial.star.FlareFreqMax": {"value": 6.0018654825e-10, "unit": 1 / u.sec}, + "log.initial.star.FlareEnergy1": {"value": 1.0000000000e26, "unit": u.Joule}, + "log.initial.star.FlareEnergy2": {"value": 1.0715193052e26, "unit": u.Joule}, + "log.initial.star.FlareEnergy3": {"value": 1.1481536215e26, "unit": u.Joule}, + "log.initial.star.FlareEnergy4": {"value": 1.2302687708e26, "unit": u.Joule}, + "log.initial.star.FlareEnergyMin": {"value": 1.0000000000e26, "unit": u.Joule}, + "log.initial.star.FlareEnergyMid": {"value": 3.1622776602e27, "unit": u.Joule}, + "log.initial.star.FlareEnergyMax": {"value": 1.0000000000e29, "unit": u.Joule}, + "log.initial.b.Mass": {"value": 7.5846762200e24, "unit": u.kg}, + "log.initial.b.Radius": {"value": 8.8005344212e06, "unit": u.m}, + "log.initial.b.RadGyra": {"value": 0.5000000000}, + "log.initial.b.BodyType": {"value": 0.0000000000}, + "log.initial.b.Density": {"value": 2656.5702144167, "unit": u.kg / u.m**3}, + "log.initial.b.HZLimitDryRunaway": {"value": 1.7814747212e10, "unit": u.m}, + "log.initial.b.HZLimRecVenus": {"value": 1.5942915196e10, "unit": u.m}, + "log.initial.b.HZLimRunaway": {"value": 2.1005311219e10, "unit": u.m}, + "log.initial.b.HZLimMoistGreenhouse": {"value": 2.1095107199e10, "unit": u.m}, + "log.initial.b.HZLimMaxGreenhouse": {"value": 4.0266652294e10, "unit": u.m}, + "log.initial.b.HZLimEarlyMars": {"value": 4.3914925610e10, "unit": u.m}, + "log.initial.b.Instellation": { + "value": 9975.5972427825, + "unit": u.kg / u.sec**3, + }, + "log.initial.b.MeanMotion": {"value": 6.4573248494e-06, "unit": 1 / u.sec}, + "log.initial.b.OrbPeriod": {"value": 9.7303224691e05, "unit": u.sec}, + "log.initial.b.SemiMajorAxis": {"value": 7.2554967289e09, "unit": u.m}, + "log.initial.b.LXUVTot": {"value": -1.0000000000, "unit": u.kg / u.sec**3}, + "log.initial.b.SurfWaterMass": {"value": 1.5000000000, "unit": u.TO}, + "log.initial.b.EnvelopeMass": {"value": 0.0010000000, "unit": u.Mearth}, + "log.initial.b.OxygenMass": {"value": 0.0000000000, "unit": u.bar}, + "log.initial.b.RGLimit": {"value": 2.0225735532e10, "unit": u.m}, + "log.initial.b.XO": {"value": 0.3333333333}, + "log.initial.b.EtaO": {"value": 0.0000000000}, + "log.initial.b.PlanetRadius": {"value": 1.3798050236, "unit": u.Rearth}, + "log.initial.b.OxygenMantleMass": {"value": 0.0000000000, "unit": u.kg}, + "log.initial.b.RadXUV": {"value": -1.0000000000, "unit": u.m}, + "log.initial.b.RadSolid": {"value": -1.0000000000, "unit": u.m}, + "log.initial.b.PresXUV": {"value": 5.0000000000}, + "log.initial.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m}, + "log.initial.b.ThermTemp": {"value": 400.0000000000, "unit": u.K}, + "log.initial.b.AtmGasConst": {"value": 4124.0000000000}, + "log.initial.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa}, + "log.initial.b.DEnvMassDt": {"value": -7.8244286870e06, "unit": u.kg / u.sec}, + "log.initial.b.FXUV": {"value": 11.3112932829, "unit": u.W / u.m**2}, + "log.initial.b.AtmXAbsEffH2O": {"value": 0.3000000000}, + "log.initial.b.RocheRadius": {"value": 1.5935887288e08, "unit": u.m}, + "log.initial.b.BondiRadius": {"value": 1.9083081091e08, "unit": u.m}, + "log.initial.b.HEscapeRegime": {"value": 3.0000000000}, + "log.initial.b.RRCriticalFlux": { + "value": 27.7437416693, + "unit": u.W / u.m**2, + }, + "log.initial.b.CrossoverMass": {"value": 0.0000000000, "unit": u.kg}, + "log.initial.b.WaterEscapeRegime": {"value": 8.0000000000}, + "log.initial.b.FXUVCRITDRAG": {"value": 0.1090267838, "unit": u.W / u.m**2}, + "log.initial.b.HREFFLUX": { + "value": 9.6829037992e18, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.b.XO2": {"value": 0.0000000000}, + "log.initial.b.XH2O": {"value": 1.0000000000}, + "log.initial.b.HDiffFlux": { + "value": 8.4375341524e16, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.b.HRefODragMod": {"value": 0.0077519380}, + "log.initial.b.KTide": {"value": 0.9172472694}, + "log.initial.b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, + "log.final.system.Age": {"value": 3.4713360000e15, "unit": u.sec, "rtol": 1e-4}, + "log.final.system.Time": { + "value": 3.1557600000e15, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.system.TotAngMom": { + "value": 3.7341539796e41, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.system.TotEnergy": { + "value": -7.1773654349e39, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.PotEnergy": { + "value": -1.6690365135e40, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.KinEnergy": { + "value": 1.4205186695e37, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.Mass": {"value": 2.3860992000e29, "unit": u.kg, "rtol": 1e-4}, + "log.final.star.Radius": {"value": 1.3660507216e08, "unit": u.m, "rtol": 1e-4}, + "log.final.star.RadGyra": {"value": 0.4634687457, "rtol": 1e-4}, + "log.final.star.RotAngMom": { + "value": 1.6484280499e41, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.star.RotVel": { + "value": 2.3543648795e04, + "unit": u.m / u.sec, + "rtol": 1e-4, + }, + "log.final.star.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, + "log.final.star.RotRate": { + "value": 0.0001723483, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.RotPer": { + "value": 3.6456327979e04, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.star.Density": { + "value": 2.2345980255e04, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.star.HZLimitDryRunaway": { + "value": 7.5299836822e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimRecVenus": { + "value": 6.7635409130e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimRunaway": { + "value": 8.9093000516e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimMoistGreenhouse": { + "value": 8.9492814994e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimMaxGreenhouse": { + "value": 1.7098788562e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimEarlyMars": { + "value": 1.8647977381e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.Instellation": { + "value": -1.0000000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.star.CriticalSemiMajorAxis": { + "value": -1.0000000000, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.LXUVTot": { + "value": 1.3924374044e21, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.star.LostEnergy": { + "value": 9.4988031689e39, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.LostAngMom": { + "value": 2.0600471160e41, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.star.Luminosity": { + "value": 1.1827855828e24, + "unit": u.W, + "rtol": 1e-4, + }, + "log.final.star.LXUVStellar": { + "value": 2.7351663169e-06, + "unit": u.LSUN, + "rtol": 1e-4, + }, + "log.final.star.Temperature": { + "value": 3070.0997711696, + "unit": u.K, + "rtol": 1e-4, + }, + "log.final.star.LXUVFrac": {"value": 0.0008893793, "rtol": 1e-4}, + "log.final.star.RossbyNumber": {"value": 0.0064694557, "rtol": 1e-4}, + "log.final.star.DRotPerDtStellar": {"value": -2.9636936777e-12, "rtol": 1e-4}, + "log.final.star.LXUVFlare": { + "value": 8.8531477149e-07, + "unit": u.LSUN, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq1": { + "value": 3.7279360348e-07, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq2": { + "value": 3.4532301760e-07, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq3": { + "value": 3.1987669684e-07, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq4": { + "value": 2.9630547623e-07, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreqMin": { + "value": 3.7279360348e-07, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreqMid": { + "value": 8.1156296479e-09, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreqMax": { + "value": 1.7667536129e-10, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy1": { + "value": 1.0000000000e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy2": { + "value": 1.0715193052e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy3": { + "value": 1.1481536215e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy4": { + "value": 1.2302687708e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergyMin": { + "value": 1.0000000000e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergyMid": { + "value": 3.1622776602e27, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergyMax": { + "value": 1.0000000000e29, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.b.Mass": {"value": 7.5787040340e24, "unit": u.kg, "rtol": 1e-4}, + "log.final.b.Radius": {"value": 6.8050745192e06, "unit": u.m, "rtol": 1e-4}, + "log.final.b.RadGyra": {"value": 0.5000000000, "rtol": 1e-4}, + "log.final.b.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, + "log.final.b.Density": { + "value": 5741.2661742908, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.b.HZLimitDryRunaway": { + "value": 7.5541959109e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimRecVenus": { + "value": 6.7635409130e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimRunaway": { + "value": 8.9093000516e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimMoistGreenhouse": { + "value": 8.9492814994e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimMaxGreenhouse": { + "value": 1.7098788562e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimEarlyMars": { + "value": 1.8647977381e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.Instellation": { + "value": 1793.7258438631, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.b.MeanMotion": { + "value": 6.4573247685e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.OrbPeriod": { + "value": 9.7303225908e05, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.b.SemiMajorAxis": { + "value": 7.2554967289e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.LXUVTot": { + "value": -1.0000000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.b.SurfWaterMass": { + "value": 1.0402347664, + "unit": u.TO, + "rtol": 1e-4, + }, + "log.final.b.EnvelopeMass": { + "value": 0.0000000000, + "unit": u.Mearth, + "rtol": 1e-4, + }, + "log.final.b.OxygenMass": {"value": 43.5915204566, "unit": u.bar, "rtol": 1e-4}, + "log.final.b.RGLimit": {"value": 8.5788591758e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.XO": {"value": 0.3712069590, "rtol": 1e-4}, + "log.final.b.EtaO": {"value": 0.5563597423, "rtol": 1e-4}, + "log.final.b.PlanetRadius": { + "value": 1.0669438421, + "unit": u.Rearth, + "rtol": 1e-4, + }, + "log.final.b.OxygenMantleMass": { + "value": 0.0000000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.b.RadXUV": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.RadSolid": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.PresXUV": {"value": 5.0000000000, "rtol": 1e-4}, + "log.final.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.ThermTemp": {"value": 400.0000000000, "unit": u.K, "rtol": 1e-4}, + "log.final.b.AtmGasConst": {"value": 4124.0000000000, "rtol": 1e-4}, + "log.final.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa, "rtol": 1e-4}, + "log.final.b.DEnvMassDt": { + "value": 5.5626846463e-309, + "unit": u.kg / u.sec, + "rtol": 1e-4, + }, + "log.final.b.FXUV": { + "value": 2.1116684160, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.AtmXAbsEffH2O": {"value": 0.3000000000, "rtol": 1e-4}, + "log.final.b.RocheRadius": { + "value": 1.5931703542e08, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.BondiRadius": { + "value": 2.9268194058e08, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HEscapeRegime": {"value": 8.0000000000, "rtol": 1e-4}, + "log.final.b.RRCriticalFlux": { + "value": 62.3818675680, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.CrossoverMass": { + "value": 4.8764735221e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.b.WaterEscapeRegime": {"value": 3.0000000000, "rtol": 1e-4}, + "log.final.b.FXUVCRITDRAG": { + "value": 0.2220631370, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.HREFFLUX": { + "value": 1.3709148740e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.XO2": {"value": 0.0828619461, "rtol": 1e-4}, + "log.final.b.XH2O": {"value": 0.9171380539, "rtol": 1e-4}, + "log.final.b.HDiffFlux": { + "value": 1.3299176558e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.HRefODragMod": {"value": 0.1834566856, "rtol": 1e-4}, + "log.final.b.KTide": {"value": 0.9359679029, "rtol": 1e-4}, + "log.final.b.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, + } ) -class Test_AtmEscFlareDavenport(Benchmark): - pass +class Test_AtmEscFlareDavenport(Benchmark): + pass diff --git a/tests/AtmescFlareStellar/AtmEscFlareLacy/test_AtmEscFlareLacy.py b/tests/AtmescFlareStellar/AtmEscFlareLacy/test_AtmEscFlareLacy.py index 645ffe2e0..e9a60932c 100644 --- a/tests/AtmescFlareStellar/AtmEscFlareLacy/test_AtmEscFlareLacy.py +++ b/tests/AtmescFlareStellar/AtmEscFlareLacy/test_AtmEscFlareLacy.py @@ -1,201 +1,487 @@ -from benchmark import Benchmark, benchmark -import astropy.units as u -import pytest - -@benchmark( - { - "log.initial.system.Age": {"value": 3.1557600000e+14, "unit": u.sec}, - "log.initial.system.Time": {"value": 0.0000000000, "unit": u.sec}, - "log.initial.system.TotAngMom": {"value": 3.7230704732e+41, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.system.TotEnergy": {"value": -7.1876127212e+39, "unit": u.Joule}, - "log.initial.system.PotEnergy": {"value": -7.2010481575e+39, "unit": u.Joule}, - "log.initial.system.KinEnergy": {"value": 1.3444021724e+37, "unit": u.Joule}, - "log.initial.system.DeltaTime": {"value": 0.0000000000, "unit": u.sec}, - "log.initial.star.Mass": {"value": 2.3860992000e+29, "unit": u.kg}, - "log.initial.star.Radius": {"value": 3.1661898155e+08, "unit": u.m}, - "log.initial.star.RadGyra": {"value": 0.4610332834}, - "log.initial.star.RotAngMom": {"value": 3.6973713815e+41, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.star.RotVel": {"value": 2.3025182093e+04, "unit": u.m / u.sec}, - "log.initial.star.BodyType": {"value": 0.0000000000}, - "log.initial.star.RotRate": {"value": 7.2722052166e-05, "unit": 1 / u.sec}, - "log.initial.star.RotPer": {"value": 8.6400000000e+04, "unit": u.sec}, - "log.initial.star.Density": {"value": 1794.6883475331, "unit": u.kg / u.m ** 3}, - "log.initial.star.HZLimitDryRunaway": {"value": 1.7757648517e+10, "unit": u.m}, - "log.initial.star.HZLimRecVenus": {"value": 1.5942915196e+10, "unit": u.m}, - "log.initial.star.HZLimRunaway": {"value": 2.1005311219e+10, "unit": u.m}, - "log.initial.star.HZLimMoistGreenhouse": {"value": 2.1095107199e+10, "unit": u.m}, - "log.initial.star.HZLimMaxGreenhouse": {"value": 4.0266652294e+10, "unit": u.m}, - "log.initial.star.HZLimEarlyMars": {"value": 4.3914925610e+10, "unit": u.m}, - "log.initial.star.Instellation": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3}, - "log.initial.star.CriticalSemiMajorAxis": {"value": -1.0000000000, "unit": u.m}, - "log.initial.star.LXUVTot": {"value": 9.4027677015e+21, "unit": u.kg / u.sec ** 3}, - "log.initial.star.LostEnergy": {"value": 5.5626846463e-309, "unit": u.Joule}, - "log.initial.star.LostAngMom": {"value": 5.5626846463e-309, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.star.Luminosity": {"value": 6.5779241790e+24, "unit": u.W}, - "log.initial.star.LXUVStellar": {"value": 1.7103286997e-05, "unit": u.LSUN}, - "log.initial.star.Temperature": {"value": 3095.3300004448, "unit": u.K}, - "log.initial.star.LXUVFrac": {"value": 0.0010000000}, - "log.initial.star.RossbyNumber": {"value": 0.0155317554}, - "log.initial.star.DRotPerDtStellar": {"value": -1.1359491987e-10}, - "log.initial.star.LXUVFlare": {"value": 7.3448869539e-06, "unit": u.LSUN}, - "log.initial.star.FlareFreq1": {"value": 1.9829469531e-06, "unit": 1 / u.sec}, - "log.initial.star.FlareFreq2": {"value": 1.8540389414e-06, "unit": 1 / u.sec}, - "log.initial.star.FlareFreq3": {"value": 1.7335110204e-06, "unit": 1 / u.sec}, - "log.initial.star.FlareFreq4": {"value": 1.6208184147e-06, "unit": 1 / u.sec}, - "log.initial.star.FlareFreqMin": {"value": 1.9829469531e-06, "unit": 1 / u.sec}, - "log.initial.star.FlareFreqMid": {"value": 6.8817495244e-08, "unit": 1 / u.sec}, - "log.initial.star.FlareFreqMax": {"value": 2.3882876161e-09, "unit": 1 / u.sec}, - "log.initial.star.FlareEnergy1": {"value": 1.0000000000e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergy2": {"value": 1.0715193052e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergy3": {"value": 1.1481536215e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergy4": {"value": 1.2302687708e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergyMin": {"value": 1.0000000000e+26, "unit": u.Joule}, - "log.initial.star.FlareEnergyMid": {"value": 3.1622776602e+27, "unit": u.Joule}, - "log.initial.star.FlareEnergyMax": {"value": 1.0000000000e+29, "unit": u.Joule}, - "log.initial.b.Mass": {"value": 7.5846762200e+24, "unit": u.kg}, - "log.initial.b.Radius": {"value": 8.8005344212e+06, "unit": u.m}, - "log.initial.b.RadGyra": {"value": 0.5000000000}, - "log.initial.b.BodyType": {"value": 0.0000000000}, - "log.initial.b.Density": {"value": 2656.5702144167, "unit": u.kg / u.m ** 3}, - "log.initial.b.HZLimitDryRunaway": {"value": 1.7814747212e+10, "unit": u.m}, - "log.initial.b.HZLimRecVenus": {"value": 1.5942915196e+10, "unit": u.m}, - "log.initial.b.HZLimRunaway": {"value": 2.1005311219e+10, "unit": u.m}, - "log.initial.b.HZLimMoistGreenhouse": {"value": 2.1095107199e+10, "unit": u.m}, - "log.initial.b.HZLimMaxGreenhouse": {"value": 4.0266652294e+10, "unit": u.m}, - "log.initial.b.HZLimEarlyMars": {"value": 4.3914925610e+10, "unit": u.m}, - "log.initial.b.Instellation": {"value": 9975.5972427825, "unit": u.kg / u.sec ** 3}, - "log.initial.b.MeanMotion": {"value": 6.4573248494e-06, "unit": 1 / u.sec}, - "log.initial.b.OrbPeriod": {"value": 9.7303224691e+05, "unit": u.sec}, - "log.initial.b.SemiMajorAxis": {"value": 7.2554967289e+09, "unit": u.m}, - "log.initial.b.LXUVTot": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3}, - "log.initial.b.SurfWaterMass": {"value": 1.5000000000, "unit": u.TO}, - "log.initial.b.EnvelopeMass": {"value": 0.0010000000, "unit": u.Mearth}, - "log.initial.b.OxygenMass": {"value": 0.0000000000, "unit": u.bar}, - "log.initial.b.RGLimit": {"value": 2.0225735532e+10, "unit": u.m}, - "log.initial.b.XO": {"value": 0.3333333333}, - "log.initial.b.EtaO": {"value": 0.0000000000}, - "log.initial.b.PlanetRadius": {"value": 1.3798050236, "unit": u.Rearth}, - "log.initial.b.OxygenMantleMass": {"value": 0.0000000000, "unit": u.kg}, - "log.initial.b.RadXUV": {"value": -1.0000000000, "unit": u.m}, - "log.initial.b.RadSolid": {"value": -1.0000000000, "unit": u.m}, - "log.initial.b.PresXUV": {"value": 5.0000000000}, - "log.initial.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m}, - "log.initial.b.ThermTemp": {"value": 400.0000000000, "unit": u.K}, - "log.initial.b.AtmGasConst": {"value": 4124.0000000000}, - "log.initial.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa}, - "log.initial.b.DEnvMassDt": {"value": -9.8638423785e+06, "unit": u.kg / u.sec}, - "log.initial.b.FXUV": {"value": 14.2595476939, "unit": u.W / u.m ** 2}, - "log.initial.b.AtmXAbsEffH2O": {"value": 0.3000000000}, - "log.initial.b.RocheRadius": {"value": 1.5935887288e+08, "unit": u.m}, - "log.initial.b.BondiRadius": {"value": 1.9083081091e+08, "unit": u.m}, - "log.initial.b.HEscapeRegime": {"value": 3.0000000000}, - "log.initial.b.RRCriticalFlux": {"value": 27.7437416693, "unit": u.W / u.m ** 2}, - "log.initial.b.CrossoverMass": {"value": 0.0000000000, "unit": u.kg}, - "log.initial.b.WaterEscapeRegime": {"value": 8.0000000000}, - "log.initial.b.FXUVCRITDRAG": {"value": 0.1090267838, "unit": u.W / u.m ** 2}, - "log.initial.b.HREFFLUX": {"value": 1.2206723412e+19, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.b.XO2": {"value": 0.0000000000}, - "log.initial.b.XH2O": {"value": 1.0000000000}, - "log.initial.b.HDiffFlux": {"value": 8.4375341524e+16, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.b.HRefODragMod": {"value": 0.0077519380}, - "log.initial.b.KTide": {"value": 0.9172472694}, - "log.initial.b.RGDuration": {"value": 0.00000e+00, "unit": u.yr}, - "log.final.system.Age": {"value": 3.4713360000e+15, "unit": u.sec, "rtol": 1e-4}, - "log.final.system.Time": {"value": 3.1557600000e+15, "unit": u.sec, "rtol": 1e-4}, - "log.final.system.TotAngMom": {"value": 3.7311341059e+41, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.system.TotEnergy": {"value": -7.1802001227e+39, "unit": u.Joule, "rtol": 1e-4}, - "log.final.system.PotEnergy": {"value": -1.6690359127e+40, "unit": u.Joule, "rtol": 1e-4}, - "log.final.system.KinEnergy": {"value": 1.4184861863e+37, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.Mass": {"value": 2.3860992000e+29, "unit": u.kg, "rtol": 1e-4}, - "log.final.star.Radius": {"value": 1.3660512134e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.star.RadGyra": {"value": 0.4634687447, "rtol": 1e-4}, - "log.final.star.RotAngMom": {"value": 1.6472489290e+41, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.star.RotVel": {"value": 2.3526799645e+04, "unit": u.m / u.sec, "rtol": 1e-4}, - "log.final.star.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, - "log.final.star.RotRate": {"value": 0.0001722249, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.RotPer": {"value": 3.6482449982e+04, "unit": u.sec, "rtol": 1e-4}, - "log.final.star.Density": {"value": 2.2345956122e+04, "unit": u.kg / u.m ** 3, "rtol": 1e-4}, - "log.final.star.HZLimitDryRunaway": {"value": 7.5299869568e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimRecVenus": {"value": 6.7635438474e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimRunaway": {"value": 8.9093039211e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimMoistGreenhouse": {"value": 8.9492853820e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimMaxGreenhouse": {"value": 1.7098795944e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimEarlyMars": {"value": 1.8647985431e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.star.Instellation": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.star.CriticalSemiMajorAxis": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.star.LXUVTot": {"value": 3.8767894028e+21, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.star.LostEnergy": {"value": 9.4959827978e+39, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.LostAngMom": {"value": 2.0582063633e+41, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.star.Luminosity": {"value": 1.1827866115e+24, "unit": u.W, "rtol": 1e-4}, - "log.final.star.LXUVStellar": {"value": 2.7351686957e-06, "unit": u.LSUN, "rtol": 1e-4}, - "log.final.star.Temperature": {"value": 3070.0998278738, "unit": u.K, "rtol": 1e-4}, - "log.final.star.LXUVFrac": {"value": 0.0008893793, "rtol": 1e-4}, - "log.final.star.RossbyNumber": {"value": 0.0064740915, "rtol": 1e-4}, - "log.final.star.DRotPerDtStellar": {"value": -2.9658114783e-12, "rtol": 1e-4}, - "log.final.star.LXUVFlare": {"value": 7.3448869539e-06, "unit": u.LSUN, "rtol": 1e-4}, - "log.final.star.FlareFreq1": {"value": 1.9829469531e-06, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreq2": {"value": 1.8540389414e-06, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreq3": {"value": 1.7335110204e-06, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreq4": {"value": 1.6208184147e-06, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreqMin": {"value": 1.9829469531e-06, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreqMid": {"value": 6.8817495244e-08, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareFreqMax": {"value": 2.3882876161e-09, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.FlareEnergy1": {"value": 1.0000000000e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergy2": {"value": 1.0715193052e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergy3": {"value": 1.1481536215e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergy4": {"value": 1.2302687708e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergyMin": {"value": 1.0000000000e+26, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergyMid": {"value": 3.1622776602e+27, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.FlareEnergyMax": {"value": 1.0000000000e+29, "unit": u.Joule, "rtol": 1e-4}, - "log.final.b.Mass": {"value": 7.5787040340e+24, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.Radius": {"value": 6.8050745192e+06, "unit": u.m, "rtol": 1e-4}, - "log.final.b.RadGyra": {"value": 0.5000000000, "rtol": 1e-4}, - "log.final.b.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, - "log.final.b.Density": {"value": 5741.2661742908, "unit": u.kg / u.m ** 3, "rtol": 1e-4}, - "log.final.b.HZLimitDryRunaway": {"value": 7.5541991960e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimRecVenus": {"value": 6.7635438474e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimRunaway": {"value": 8.9093039211e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimMoistGreenhouse": {"value": 8.9492853820e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimMaxGreenhouse": {"value": 1.7098795944e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimEarlyMars": {"value": 1.8647985431e+10, "unit": u.m, "rtol": 1e-4}, - "log.final.b.Instellation": {"value": 1793.7274039253, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.b.MeanMotion": {"value": 6.4573247685e-06, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.b.OrbPeriod": {"value": 9.7303225908e+05, "unit": u.sec, "rtol": 1e-4}, - "log.final.b.SemiMajorAxis": {"value": 7.2554967289e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.LXUVTot": {"value": -1.0000000000, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.b.SurfWaterMass": {"value": 0.3509650099, "unit": u.TO, "rtol": 1e-4}, - "log.final.b.EnvelopeMass": {"value": 0.0000000000, "unit": u.Mearth, "rtol": 1e-4}, - "log.final.b.OxygenMass": {"value": 46.4328090748, "unit": u.bar, "rtol": 1e-4}, - "log.final.b.RGLimit": {"value": 8.5788629016e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.XO": {"value": 0.4398513218, "rtol": 1e-4}, - "log.final.b.EtaO": {"value": 0.0000000000, "rtol": 1e-4}, - "log.final.b.PlanetRadius": {"value": 1.0669438421, "unit": u.Rearth, "rtol": 1e-4}, - "log.final.b.OxygenMantleMass": {"value": 0.0000000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.RadXUV": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.RadSolid": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.PresXUV": {"value": 5.0000000000, "rtol": 1e-4}, - "log.final.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.ThermTemp": {"value": 400.0000000000, "unit": u.K, "rtol": 1e-4}, - "log.final.b.AtmGasConst": {"value": 4124.0000000000, "rtol": 1e-4}, - "log.final.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa, "rtol": 1e-4}, - "log.final.b.DEnvMassDt": {"value": 5.5626846463e-309, "unit": u.kg / u.sec, "rtol": 1e-4}, - "log.final.b.FXUV": {"value": 5.8792544008, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.AtmXAbsEffH2O": {"value": 0.3000000000, "rtol": 1e-4}, - "log.final.b.RocheRadius": {"value": 1.5931703542e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.b.BondiRadius": {"value": 2.9268188250e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HEscapeRegime": {"value": 8.0000000000, "rtol": 1e-4}, - "log.final.b.RRCriticalFlux": {"value": 62.3818675680, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.CrossoverMass": {"value": 8.3894445387e-26, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.WaterEscapeRegime": {"value": 4.0000000000, "rtol": 1e-4}, - "log.final.b.FXUVCRITDRAG": {"value": 0.1978208482, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.HREFFLUX": {"value": 3.8168669119e+18, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.b.XO2": {"value": 0.2219353904, "rtol": 1e-4}, - "log.final.b.XH2O": {"value": 0.7780646096, "rtol": 1e-4}, - "log.final.b.HDiffFlux": {"value": 1.1847326044e+17, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.b.HRefODragMod": {"value": 0.1024764157, "rtol": 1e-4}, - "log.final.b.KTide": {"value": 0.9359679029, "rtol": 1e-4}, - "log.final.b.RGDuration": {"value": 0.00000e+00, "unit": u.yr, "rtol": 1e-4}, - } +import astropy.units as u +from benchmark import Benchmark, benchmark + + +@benchmark( + { + "log.initial.system.Age": {"value": 3.1557600000e14, "unit": u.sec}, + "log.initial.system.Time": {"value": 0.0000000000, "unit": u.sec}, + "log.initial.system.TotAngMom": { + "value": 3.7230704732e41, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.system.TotEnergy": {"value": -7.1876127212e39, "unit": u.Joule}, + "log.initial.system.PotEnergy": {"value": -7.2010481575e39, "unit": u.Joule}, + "log.initial.system.KinEnergy": {"value": 1.3444021724e37, "unit": u.Joule}, + "log.initial.system.DeltaTime": {"value": 0.0000000000, "unit": u.sec}, + "log.initial.star.Mass": {"value": 2.3860992000e29, "unit": u.kg}, + "log.initial.star.Radius": {"value": 3.1661898155e08, "unit": u.m}, + "log.initial.star.RadGyra": {"value": 0.4610332834}, + "log.initial.star.RotAngMom": { + "value": 3.6973713815e41, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.star.RotVel": {"value": 2.3025182093e04, "unit": u.m / u.sec}, + "log.initial.star.BodyType": {"value": 0.0000000000}, + "log.initial.star.RotRate": {"value": 7.2722052166e-05, "unit": 1 / u.sec}, + "log.initial.star.RotPer": {"value": 8.6400000000e04, "unit": u.sec}, + "log.initial.star.Density": {"value": 1794.6883475331, "unit": u.kg / u.m**3}, + "log.initial.star.HZLimitDryRunaway": {"value": 1.7757648517e10, "unit": u.m}, + "log.initial.star.HZLimRecVenus": {"value": 1.5942915196e10, "unit": u.m}, + "log.initial.star.HZLimRunaway": {"value": 2.1005311219e10, "unit": u.m}, + "log.initial.star.HZLimMoistGreenhouse": { + "value": 2.1095107199e10, + "unit": u.m, + }, + "log.initial.star.HZLimMaxGreenhouse": {"value": 4.0266652294e10, "unit": u.m}, + "log.initial.star.HZLimEarlyMars": {"value": 4.3914925610e10, "unit": u.m}, + "log.initial.star.Instellation": { + "value": -1.0000000000, + "unit": u.kg / u.sec**3, + }, + "log.initial.star.CriticalSemiMajorAxis": {"value": -1.0000000000, "unit": u.m}, + "log.initial.star.LXUVTot": { + "value": 9.4027677015e21, + "unit": u.kg / u.sec**3, + }, + "log.initial.star.LostEnergy": {"value": 5.5626846463e-309, "unit": u.Joule}, + "log.initial.star.LostAngMom": { + "value": 5.5626846463e-309, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.star.Luminosity": {"value": 6.5779241790e24, "unit": u.W}, + "log.initial.star.LXUVStellar": {"value": 1.7103286997e-05, "unit": u.LSUN}, + "log.initial.star.Temperature": {"value": 3095.3300004448, "unit": u.K}, + "log.initial.star.LXUVFrac": {"value": 0.0010000000}, + "log.initial.star.RossbyNumber": {"value": 0.0155317554}, + "log.initial.star.DRotPerDtStellar": {"value": -1.1359491987e-10}, + "log.initial.star.LXUVFlare": {"value": 7.3448869539e-06, "unit": u.LSUN}, + "log.initial.star.FlareFreq1": {"value": 1.9829469531e-06, "unit": 1 / u.sec}, + "log.initial.star.FlareFreq2": {"value": 1.8540389414e-06, "unit": 1 / u.sec}, + "log.initial.star.FlareFreq3": {"value": 1.7335110204e-06, "unit": 1 / u.sec}, + "log.initial.star.FlareFreq4": {"value": 1.6208184147e-06, "unit": 1 / u.sec}, + "log.initial.star.FlareFreqMin": {"value": 1.9829469531e-06, "unit": 1 / u.sec}, + "log.initial.star.FlareFreqMid": {"value": 6.8817495244e-08, "unit": 1 / u.sec}, + "log.initial.star.FlareFreqMax": {"value": 2.3882876161e-09, "unit": 1 / u.sec}, + "log.initial.star.FlareEnergy1": {"value": 1.0000000000e26, "unit": u.Joule}, + "log.initial.star.FlareEnergy2": {"value": 1.0715193052e26, "unit": u.Joule}, + "log.initial.star.FlareEnergy3": {"value": 1.1481536215e26, "unit": u.Joule}, + "log.initial.star.FlareEnergy4": {"value": 1.2302687708e26, "unit": u.Joule}, + "log.initial.star.FlareEnergyMin": {"value": 1.0000000000e26, "unit": u.Joule}, + "log.initial.star.FlareEnergyMid": {"value": 3.1622776602e27, "unit": u.Joule}, + "log.initial.star.FlareEnergyMax": {"value": 1.0000000000e29, "unit": u.Joule}, + "log.initial.b.Mass": {"value": 7.5846762200e24, "unit": u.kg}, + "log.initial.b.Radius": {"value": 8.8005344212e06, "unit": u.m}, + "log.initial.b.RadGyra": {"value": 0.5000000000}, + "log.initial.b.BodyType": {"value": 0.0000000000}, + "log.initial.b.Density": {"value": 2656.5702144167, "unit": u.kg / u.m**3}, + "log.initial.b.HZLimitDryRunaway": {"value": 1.7814747212e10, "unit": u.m}, + "log.initial.b.HZLimRecVenus": {"value": 1.5942915196e10, "unit": u.m}, + "log.initial.b.HZLimRunaway": {"value": 2.1005311219e10, "unit": u.m}, + "log.initial.b.HZLimMoistGreenhouse": {"value": 2.1095107199e10, "unit": u.m}, + "log.initial.b.HZLimMaxGreenhouse": {"value": 4.0266652294e10, "unit": u.m}, + "log.initial.b.HZLimEarlyMars": {"value": 4.3914925610e10, "unit": u.m}, + "log.initial.b.Instellation": { + "value": 9975.5972427825, + "unit": u.kg / u.sec**3, + }, + "log.initial.b.MeanMotion": {"value": 6.4573248494e-06, "unit": 1 / u.sec}, + "log.initial.b.OrbPeriod": {"value": 9.7303224691e05, "unit": u.sec}, + "log.initial.b.SemiMajorAxis": {"value": 7.2554967289e09, "unit": u.m}, + "log.initial.b.LXUVTot": {"value": -1.0000000000, "unit": u.kg / u.sec**3}, + "log.initial.b.SurfWaterMass": {"value": 1.5000000000, "unit": u.TO}, + "log.initial.b.EnvelopeMass": {"value": 0.0010000000, "unit": u.Mearth}, + "log.initial.b.OxygenMass": {"value": 0.0000000000, "unit": u.bar}, + "log.initial.b.RGLimit": {"value": 2.0225735532e10, "unit": u.m}, + "log.initial.b.XO": {"value": 0.3333333333}, + "log.initial.b.EtaO": {"value": 0.0000000000}, + "log.initial.b.PlanetRadius": {"value": 1.3798050236, "unit": u.Rearth}, + "log.initial.b.OxygenMantleMass": {"value": 0.0000000000, "unit": u.kg}, + "log.initial.b.RadXUV": {"value": -1.0000000000, "unit": u.m}, + "log.initial.b.RadSolid": {"value": -1.0000000000, "unit": u.m}, + "log.initial.b.PresXUV": {"value": 5.0000000000}, + "log.initial.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m}, + "log.initial.b.ThermTemp": {"value": 400.0000000000, "unit": u.K}, + "log.initial.b.AtmGasConst": {"value": 4124.0000000000}, + "log.initial.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa}, + "log.initial.b.DEnvMassDt": {"value": -9.8638423785e06, "unit": u.kg / u.sec}, + "log.initial.b.FXUV": {"value": 14.2595476939, "unit": u.W / u.m**2}, + "log.initial.b.AtmXAbsEffH2O": {"value": 0.3000000000}, + "log.initial.b.RocheRadius": {"value": 1.5935887288e08, "unit": u.m}, + "log.initial.b.BondiRadius": {"value": 1.9083081091e08, "unit": u.m}, + "log.initial.b.HEscapeRegime": {"value": 3.0000000000}, + "log.initial.b.RRCriticalFlux": { + "value": 27.7437416693, + "unit": u.W / u.m**2, + }, + "log.initial.b.CrossoverMass": {"value": 0.0000000000, "unit": u.kg}, + "log.initial.b.WaterEscapeRegime": {"value": 8.0000000000}, + "log.initial.b.FXUVCRITDRAG": {"value": 0.1090267838, "unit": u.W / u.m**2}, + "log.initial.b.HREFFLUX": { + "value": 1.2206723412e19, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.b.XO2": {"value": 0.0000000000}, + "log.initial.b.XH2O": {"value": 1.0000000000}, + "log.initial.b.HDiffFlux": { + "value": 8.4375341524e16, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.b.HRefODragMod": {"value": 0.0077519380}, + "log.initial.b.KTide": {"value": 0.9172472694}, + "log.initial.b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, + "log.final.system.Age": {"value": 3.4713360000e15, "unit": u.sec, "rtol": 1e-4}, + "log.final.system.Time": { + "value": 3.1557600000e15, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.system.TotAngMom": { + "value": 3.7311328359e41, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.system.TotEnergy": { + "value": -7.1801995474e39, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.PotEnergy": { + "value": -1.6690348077e40, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.KinEnergy": { + "value": 1.4184833824e37, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.Mass": {"value": 2.3860992000e29, "unit": u.kg, "rtol": 1e-4}, + "log.final.star.Radius": {"value": 1.3660521178e08, "unit": u.m, "rtol": 1e-4}, + "log.final.star.RadGyra": {"value": 0.4634687430, "rtol": 1e-4}, + "log.final.star.RotAngMom": { + "value": 1.6472483854e41, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.star.RotVel": { + "value": 2.3526776481e04, + "unit": u.m / u.sec, + "rtol": 1e-4, + }, + "log.final.star.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, + "log.final.star.RotRate": { + "value": 0.0001722246, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.RotPer": { + "value": 3.6482510055e04, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.star.Density": { + "value": 2.2345911738e04, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.star.HZLimitDryRunaway": { + "value": 7.5299929793e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimRecVenus": { + "value": 6.7635492442e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimRunaway": { + "value": 8.9093110378e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimMoistGreenhouse": { + "value": 8.9492925229e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimMaxGreenhouse": { + "value": 1.7098809520e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimEarlyMars": { + "value": 1.8648000238e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.Instellation": { + "value": -1.0000000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.star.CriticalSemiMajorAxis": { + "value": -1.0000000000, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.LXUVTot": { + "value": 3.8767910855e21, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.star.LostEnergy": { + "value": 9.4959723508e39, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.LostAngMom": { + "value": 2.0582056369e41, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.star.Luminosity": { + "value": 1.1827885035e24, + "unit": u.W, + "rtol": 1e-4, + }, + "log.final.star.LXUVStellar": { + "value": 2.7351730709e-06, + "unit": u.LSUN, + "rtol": 1e-4, + }, + "log.final.star.Temperature": { + "value": 3070.0999321598, + "unit": u.K, + "rtol": 1e-4, + }, + "log.final.star.LXUVFrac": {"value": 0.0008893793, "rtol": 1e-4}, + "log.final.star.RossbyNumber": {"value": 0.0064741025, "rtol": 1e-4}, + "log.final.star.DRotPerDtStellar": {"value": -2.9658057232e-12, "rtol": 1e-4}, + "log.final.star.LXUVFlare": { + "value": 7.3448869539e-06, + "unit": u.LSUN, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq1": { + "value": 1.9829469531e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq2": { + "value": 1.8540389414e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq3": { + "value": 1.7335110204e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreq4": { + "value": 1.6208184147e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreqMin": { + "value": 1.9829469531e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreqMid": { + "value": 6.8817495244e-08, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareFreqMax": { + "value": 2.3882876161e-09, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy1": { + "value": 1.0000000000e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy2": { + "value": 1.0715193052e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy3": { + "value": 1.1481536215e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergy4": { + "value": 1.2302687708e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergyMin": { + "value": 1.0000000000e26, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergyMid": { + "value": 3.1622776602e27, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.FlareEnergyMax": { + "value": 1.0000000000e29, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.b.Mass": {"value": 7.5787040340e24, "unit": u.kg, "rtol": 1e-4}, + "log.final.b.Radius": {"value": 6.8050745192e06, "unit": u.m, "rtol": 1e-4}, + "log.final.b.RadGyra": {"value": 0.5000000000, "rtol": 1e-4}, + "log.final.b.BodyType": {"value": 0.0000000000, "rtol": 1e-4}, + "log.final.b.Density": { + "value": 5741.2661742908, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.b.HZLimitDryRunaway": { + "value": 7.5542052378e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimRecVenus": { + "value": 6.7635492442e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimRunaway": { + "value": 8.9093110378e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimMoistGreenhouse": { + "value": 8.9492925229e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimMaxGreenhouse": { + "value": 1.7098809520e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimEarlyMars": { + "value": 1.8648000238e10, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.Instellation": { + "value": 1793.7302731775, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.b.MeanMotion": { + "value": 6.4573247685e-06, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.OrbPeriod": { + "value": 9.7303225908e05, + "unit": u.sec, + "rtol": 1e-4, + }, + "log.final.b.SemiMajorAxis": { + "value": 7.2554967289e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.LXUVTot": { + "value": -1.0000000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.b.SurfWaterMass": { + "value": 0.3509542656, + "unit": u.TO, + "rtol": 1e-4, + }, + "log.final.b.EnvelopeMass": { + "value": 0.0000000000, + "unit": u.Mearth, + "rtol": 1e-4, + }, + "log.final.b.OxygenMass": {"value": 46.4322999329, "unit": u.bar, "rtol": 1e-4}, + "log.final.b.RGLimit": {"value": 8.5788697541e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.XO": {"value": 0.4398530803, "rtol": 1e-4}, + "log.final.b.EtaO": {"value": 0.0000000000, "rtol": 1e-4}, + "log.final.b.PlanetRadius": { + "value": 1.0669438421, + "unit": u.Rearth, + "rtol": 1e-4, + }, + "log.final.b.OxygenMantleMass": { + "value": 0.0000000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.b.RadXUV": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.RadSolid": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.PresXUV": {"value": 5.0000000000, "rtol": 1e-4}, + "log.final.b.ScaleHeight": {"value": -1.0000000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.ThermTemp": {"value": 400.0000000000, "unit": u.K, "rtol": 1e-4}, + "log.final.b.AtmGasConst": {"value": 4124.0000000000, "rtol": 1e-4}, + "log.final.b.PresSurf": {"value": -1.0000000000, "unit": u.Pa, "rtol": 1e-4}, + "log.final.b.DEnvMassDt": { + "value": 5.5626846463e-309, + "unit": u.kg / u.sec, + "rtol": 1e-4, + }, + "log.final.b.FXUV": { + "value": 5.8792569527, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.AtmXAbsEffH2O": {"value": 0.3000000000, "rtol": 1e-4}, + "log.final.b.RocheRadius": { + "value": 1.5931703542e08, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.BondiRadius": { + "value": 2.9268177567e08, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HEscapeRegime": {"value": 8.0000000000, "rtol": 1e-4}, + "log.final.b.RRCriticalFlux": { + "value": 62.3818675680, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.CrossoverMass": { + "value": 8.3894277804e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.b.WaterEscapeRegime": {"value": 4.0000000000, "rtol": 1e-4}, + "log.final.b.FXUVCRITDRAG": { + "value": 0.1978202271, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.HREFFLUX": { + "value": 3.8168685686e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.XO2": {"value": 0.2219387834, "rtol": 1e-4}, + "log.final.b.XH2O": {"value": 0.7780612166, "rtol": 1e-4}, + "log.final.b.HDiffFlux": { + "value": 1.1847288850e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.HRefODragMod": {"value": 0.1024758407, "rtol": 1e-4}, + "log.final.b.KTide": {"value": 0.9359679029, "rtol": 1e-4}, + "log.final.b.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, + } ) -class Test_AtmEscFlareLacy(Benchmark): - pass +class Test_AtmEscFlareLacy(Benchmark): + pass diff --git a/tests/AtmescMagmocStellar/MagmOc_Earth/test_MagmOc_Earth.py b/tests/AtmescMagmocStellar/MagmOc_Earth/test_MagmOc_Earth.py index df2dbaa0e..52aa11086 100644 --- a/tests/AtmescMagmocStellar/MagmOc_Earth/test_MagmOc_Earth.py +++ b/tests/AtmescMagmocStellar/MagmOc_Earth/test_MagmOc_Earth.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -91,6 +90,20 @@ "value": 53.023382, "unit": u.W / u.m**2, }, + "log.initial.Earth.CrossoverMass": {"value": 6.588282e-26, "unit": u.kg}, + "log.initial.Earth.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.Earth.FXUVCRITDRAG": {"value": 0.177574, "unit": u.W / u.m**2}, + "log.initial.Earth.HREFFLUX": { + "value": 1.923284e18, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.Earth.XO2": {"value": 0.000000}, + "log.initial.Earth.XH2O": {"value": 1.000000}, + "log.initial.Earth.HDiffFlux": { + "value": 1.264874e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.Earth.HRefODragMod": {"value": 0.169570}, "log.initial.Earth.KTide": {"value": 0.993607}, "log.initial.Earth.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.Earth.WaterMassMOAtm": {"value": 5.000000, "unit": u.TO}, @@ -137,11 +150,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 3.019866e06, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.Sun.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.Sun.Radius": {"value": 263.919878, "unit": u.Rearth, "rtol": 1e-4}, "log.final.Sun.RadGyra": {"value": 0.449900, "rtol": 1e-4}, @@ -342,6 +350,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.Earth.CrossoverMass": { + "value": 6.588282e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.Earth.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.Earth.FXUVCRITDRAG": { + "value": 0.177574, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.Earth.HREFFLUX": { + "value": 1.923284e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.Earth.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.Earth.XH2O": {"value": 1.000000, "rtol": 1e-4}, + "log.final.Earth.HDiffFlux": { + "value": 1.264874e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.Earth.HRefODragMod": {"value": 0.169570, "rtol": 1e-4}, "log.final.Earth.KTide": {"value": 0.993607, "rtol": 1e-4}, "log.final.Earth.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, "log.final.Earth.WaterMassMOAtm": { @@ -404,5 +436,5 @@ "log.final.Earth.CO2FracMelt": {"value": 0.000000, "rtol": 1e-4}, } ) -class TestMagmOc_Earth(Benchmark): +class Test_MagmOc_Earth(Benchmark): pass diff --git a/tests/AtmescMagmocStellar/MagmOc_GJ1132b/test_MagmOc_GJ1132b.py b/tests/AtmescMagmocStellar/MagmOc_GJ1132b/test_MagmOc_GJ1132b.py index b21c33565..26ff95018 100644 --- a/tests/AtmescMagmocStellar/MagmOc_GJ1132b/test_MagmOc_GJ1132b.py +++ b/tests/AtmescMagmocStellar/MagmOc_GJ1132b/test_MagmOc_GJ1132b.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -94,6 +93,20 @@ "value": 55.216468, "unit": u.W / u.m**2, }, + "log.initial.GJ1132b.CrossoverMass": {"value": 3.364096e-24, "unit": u.kg}, + "log.initial.GJ1132b.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.GJ1132b.FXUVCRITDRAG": {"value": 0.306419, "unit": u.W / u.m**2}, + "log.initial.GJ1132b.HREFFLUX": { + "value": 1.870052e20, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.GJ1132b.XO2": {"value": 0.000000}, + "log.initial.GJ1132b.XH2O": {"value": 1.000000}, + "log.initial.GJ1132b.HDiffFlux": { + "value": 1.549411e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.GJ1132b.HRefODragMod": {"value": 0.111848}, "log.initial.GJ1132b.KTide": {"value": 0.771875}, "log.initial.GJ1132b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.GJ1132b.WaterMassMOAtm": {"value": 100.000000, "unit": u.TO}, @@ -140,11 +153,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 2.494672e06, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.GJ1132.Mass": {"value": 3.599033e29, "unit": u.kg, "rtol": 1e-4}, "log.final.GJ1132.Radius": {"value": 78.764688, "unit": u.Rearth, "rtol": 1e-4}, "log.final.GJ1132.RadGyra": {"value": 0.455999, "rtol": 1e-4}, @@ -369,6 +377,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.GJ1132b.CrossoverMass": { + "value": 3.323598e-24, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.GJ1132b.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.GJ1132b.FXUVCRITDRAG": { + "value": 0.306419, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.GJ1132b.HREFFLUX": { + "value": 1.847379e20, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.GJ1132b.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.GJ1132b.XH2O": {"value": 1.000000, "rtol": 1e-4}, + "log.final.GJ1132b.HDiffFlux": { + "value": 1.549411e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.GJ1132b.HRefODragMod": {"value": 0.111857, "rtol": 1e-4}, "log.final.GJ1132b.KTide": {"value": 0.771875, "rtol": 1e-4}, "log.final.GJ1132b.RGDuration": { "value": 0.00000e00, @@ -443,5 +475,5 @@ "log.final.GJ1132b.CO2FracMelt": {"value": 0.000000, "rtol": 1e-4}, } ) -class TestMagmOc_GJ1132b(Benchmark): +class Test_MagmOc_GJ1132b(Benchmark): pass diff --git a/tests/AtmescSpinbody/NBodyAtmEsc/test_NBodyAtmEsc.py b/tests/AtmescSpinbody/NBodyAtmEsc/test_NBodyAtmEsc.py index 206c107e0..7d11118a7 100644 --- a/tests/AtmescSpinbody/NBodyAtmEsc/test_NBodyAtmEsc.py +++ b/tests/AtmescSpinbody/NBodyAtmEsc/test_NBodyAtmEsc.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -127,6 +126,14 @@ "log.initial.A.BondiRadius": {"value": 7.41067e09, "unit": u.m}, "log.initial.A.HEscapeRegime": {"value": 3.00000}, "log.initial.A.RRCriticalFlux": {"value": 0.00059, "unit": u.W / u.m**2}, + "log.initial.A.CrossoverMass": {"value": 0.00000, "unit": u.kg}, + "log.initial.A.WaterEscapeRegime": {"value": 8.00000}, + "log.initial.A.FXUVCRITDRAG": {"value": 1.29749e-06, "unit": u.W / u.m**2}, + "log.initial.A.HREFFLUX": {"value": 1.63010e21, "unit": 1 / u.m**2 / u.sec}, + "log.initial.A.XO2": {"value": 0.00000}, + "log.initial.A.XH2O": {"value": 0.00000}, + "log.initial.A.HDiffFlux": {"value": 5.41620e13, "unit": 1 / u.m**2 / u.sec}, + "log.initial.A.HRefODragMod": {"value": 1.00000}, "log.initial.A.KTide": {"value": 1.00000}, "log.initial.A.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.A.PositionXSpiNBody": {"value": 2.73318e10}, @@ -189,6 +196,14 @@ "log.initial.B.BondiRadius": {"value": 2.23584e10, "unit": u.m}, "log.initial.B.HEscapeRegime": {"value": 3.00000}, "log.initial.B.RRCriticalFlux": {"value": 0.62208, "unit": u.W / u.m**2}, + "log.initial.B.CrossoverMass": {"value": 0.00000, "unit": u.kg}, + "log.initial.B.WaterEscapeRegime": {"value": 8.00000}, + "log.initial.B.FXUVCRITDRAG": {"value": 0.00197, "unit": u.W / u.m**2}, + "log.initial.B.HREFFLUX": {"value": 2.90366e19, "unit": 1 / u.m**2 / u.sec}, + "log.initial.B.XO2": {"value": 0.00000}, + "log.initial.B.XH2O": {"value": 0.00000}, + "log.initial.B.HDiffFlux": {"value": 4.44012e15, "unit": 1 / u.m**2 / u.sec}, + "log.initial.B.HRefODragMod": {"value": 1.00000}, "log.initial.B.KTide": {"value": 0.83517}, "log.initial.B.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.B.PositionXSpiNBody": {"value": -1.27562e10}, @@ -251,6 +266,14 @@ "log.initial.C.BondiRadius": {"value": 1.78957e10, "unit": u.m}, "log.initial.C.HEscapeRegime": {"value": 3.00000}, "log.initial.C.RRCriticalFlux": {"value": 0.38036, "unit": u.W / u.m**2}, + "log.initial.C.CrossoverMass": {"value": 0.00000, "unit": u.kg}, + "log.initial.C.WaterEscapeRegime": {"value": 8.00000}, + "log.initial.C.FXUVCRITDRAG": {"value": 0.00115, "unit": u.W / u.m**2}, + "log.initial.C.HREFFLUX": {"value": 2.08584e19, "unit": 1 / u.m**2 / u.sec}, + "log.initial.C.XO2": {"value": 0.00000}, + "log.initial.C.XH2O": {"value": 0.00000}, + "log.initial.C.HDiffFlux": {"value": 3.20948e15, "unit": 1 / u.m**2 / u.sec}, + "log.initial.C.HRefODragMod": {"value": 1.00000}, "log.initial.C.KTide": {"value": 0.85262}, "log.initial.C.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.C.PositionXSpiNBody": {"value": -2.44624e10}, @@ -283,11 +306,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 1.57788e04, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.Pulsar.Mass": {"value": 2.78424e30, "unit": u.kg, "rtol": 1e-4}, "log.final.Pulsar.Radius": {"value": 1.00000e04, "unit": u.m, "rtol": 1e-4}, "log.final.Pulsar.RadGyra": {"value": 0.50000, "rtol": 1e-4}, @@ -529,6 +547,26 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.A.CrossoverMass": {"value": 0.00000, "unit": u.kg, "rtol": 1e-4}, + "log.final.A.WaterEscapeRegime": {"value": 8.00000, "rtol": 1e-4}, + "log.final.A.FXUVCRITDRAG": { + "value": 1.29333e-06, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.A.HREFFLUX": { + "value": 1.63247e21, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.A.XO2": {"value": 0.00000, "rtol": 1e-4}, + "log.final.A.XH2O": {"value": 0.00000, "rtol": 1e-4}, + "log.final.A.HDiffFlux": { + "value": 5.40615e13, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.A.HRefODragMod": {"value": 1.00000, "rtol": 1e-4}, "log.final.A.KTide": {"value": 1.00000, "rtol": 1e-4}, "log.final.A.RGDuration": {"value": 5.00000e-04, "unit": u.yr, "rtol": 1e-4}, "log.final.A.PositionXSpiNBody": {"value": 2.61203e10, "rtol": 1e-4}, @@ -636,6 +674,26 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.B.CrossoverMass": {"value": 0.00000, "unit": u.kg, "rtol": 1e-4}, + "log.final.B.WaterEscapeRegime": {"value": 8.00000, "rtol": 1e-4}, + "log.final.B.FXUVCRITDRAG": { + "value": 0.00197, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.B.HREFFLUX": { + "value": 2.90400e19, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.B.XO2": {"value": 0.00000, "rtol": 1e-4}, + "log.final.B.XH2O": {"value": 0.00000, "rtol": 1e-4}, + "log.final.B.HDiffFlux": { + "value": 4.44012e15, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.B.HRefODragMod": {"value": 1.00000, "rtol": 1e-4}, "log.final.B.KTide": {"value": 0.83516, "rtol": 1e-4}, "log.final.B.RGDuration": {"value": 5.00000e-04, "unit": u.yr, "rtol": 1e-4}, "log.final.B.PositionXSpiNBody": {"value": -3.60794e10, "rtol": 1e-4}, @@ -739,6 +797,26 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.C.CrossoverMass": {"value": 0.00000, "unit": u.kg, "rtol": 1e-4}, + "log.final.C.WaterEscapeRegime": {"value": 8.00000, "rtol": 1e-4}, + "log.final.C.FXUVCRITDRAG": { + "value": 0.00115, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.C.HREFFLUX": { + "value": 2.08549e19, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.C.XO2": {"value": 0.00000, "rtol": 1e-4}, + "log.final.C.XH2O": {"value": 0.00000, "rtol": 1e-4}, + "log.final.C.HDiffFlux": { + "value": 3.20949e15, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.C.HRefODragMod": {"value": 1.00000, "rtol": 1e-4}, "log.final.C.KTide": {"value": 0.85263, "rtol": 1e-4}, "log.final.C.RGDuration": {"value": 5.00000e-04, "unit": u.yr, "rtol": 1e-4}, "log.final.C.PositionXSpiNBody": {"value": 1.19574e10, "rtol": 1e-4}, @@ -751,5 +829,5 @@ "log.final.C.SpiNBodyLongA": {"value": 0.06377, "unit": u.rad, "rtol": 1e-4}, } ) -class TestNBodyAtmEsc(Benchmark): +class Test_NBodyAtmEsc(Benchmark): pass diff --git a/tests/AtmescStellar/AbioticO2/test_AbioticO2.py b/tests/AtmescStellar/AbioticO2/test_AbioticO2.py index 87b3226ab..162d42faf 100644 --- a/tests/AtmescStellar/AbioticO2/test_AbioticO2.py +++ b/tests/AtmescStellar/AbioticO2/test_AbioticO2.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -88,6 +87,14 @@ "log.initial.b.BondiRadius": {"value": 3.408687e08, "unit": u.m}, "log.initial.b.HEscapeRegime": {"value": 8.000000}, "log.initial.b.RRCriticalFlux": {"value": 20.874806, "unit": u.W / u.m**2}, + "log.initial.b.CrossoverMass": {"value": 1.466733e-25, "unit": u.kg}, + "log.initial.b.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.b.FXUVCRITDRAG": {"value": 3.911337, "unit": u.W / u.m**2}, + "log.initial.b.HREFFLUX": {"value": 4.544783e18, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.XO2": {"value": 0.000000}, + "log.initial.b.XH2O": {"value": 1.000000}, + "log.initial.b.HDiffFlux": {"value": 1.023663e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.HRefODragMod": {"value": 0.131132}, "log.initial.b.KTide": {"value": 0.727578}, "log.initial.b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.e.Mass": {"value": 4.610528e24, "unit": u.kg}, @@ -128,79 +135,86 @@ "log.initial.e.BondiRadius": {"value": 1.624896e08, "unit": u.m}, "log.initial.e.HEscapeRegime": {"value": 8.000000}, "log.initial.e.RRCriticalFlux": {"value": 34.669871, "unit": u.W / u.m**2}, + "log.initial.e.CrossoverMass": {"value": 5.980698e-26, "unit": u.kg}, + "log.initial.e.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.e.FXUVCRITDRAG": {"value": 1.671662, "unit": u.W / u.m**2}, + "log.initial.e.HREFFLUX": {"value": 1.534115e18, "unit": 1 / u.m**2 / u.sec}, + "log.initial.e.XO2": {"value": 0.000000}, + "log.initial.e.XH2O": {"value": 1.000000}, + "log.initial.e.HDiffFlux": {"value": 1.179185e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.e.HRefODragMod": {"value": 0.179435}, "log.initial.e.KTide": {"value": 0.903445}, "log.initial.e.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 3.471336e15, "unit": u.sec, "rtol": 1e-4}, "log.final.system.Time": {"value": 3.155760e15, "unit": u.sec, "rtol": 1e-4}, "log.final.system.TotAngMom": { - "value": 2.196283e41, + "value": 2.196360e41, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.system.TotEnergy": { - "value": -4.460407e39, + "value": -4.460233e39, "unit": u.Joule, "rtol": 1e-4, }, "log.final.system.PotEnergy": { - "value": -1.057009e40, + "value": -1.057007e40, "unit": u.Joule, "rtol": 1e-4, }, "log.final.system.KinEnergy": { - "value": 8.299131e36, + "value": 8.299539e36, "unit": u.Joule, "rtol": 1e-4, }, - # "log.final.system.DeltaTime": {"value": 4.378318e+09, "unit": u.sec, "rtol": 1e-4}, "log.final.star.Mass": {"value": 1.769690e29, "unit": u.kg, "rtol": 1e-4}, - "log.final.star.Radius": {"value": 1.186510e08, "unit": u.m, "rtol": 1e-4}, + "log.final.star.Radius": {"value": 1.186513e08, "unit": u.m, "rtol": 1e-4}, "log.final.star.RadGyra": {"value": 0.466090, "rtol": 1e-4}, "log.final.star.RotAngMom": { - "value": 9.478094e40, + "value": 9.478347e40, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.star.RotVel": { - "value": 2.077844e04, + "value": 2.077896e04, "unit": u.m / u.sec, "rtol": 1e-4, }, "log.final.star.BodyType": {"value": 0.000000, "rtol": 1e-4}, "log.final.star.RotRate": {"value": 0.000175, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.RotPer": {"value": 3.587883e04, "unit": u.sec, "rtol": 1e-4}, + "log.final.star.RotPer": {"value": 3.587803e04, "unit": u.sec, "rtol": 1e-4}, "log.final.star.Density": { - "value": 2.529265e04, + "value": 2.529248e04, "unit": u.kg / u.m**3, "rtol": 1e-4, }, "log.final.star.HZLimitDryRunaway": { - "value": 5.941096e09, + "value": 5.941109e09, "unit": u.m, "rtol": 1e-4, }, "log.final.star.HZLimRecVenus": { - "value": 5.349684e09, + "value": 5.349697e09, "unit": u.m, "rtol": 1e-4, }, "log.final.star.HZLimRunaway": { - "value": 7.039052e09, + "value": 7.039068e09, "unit": u.m, "rtol": 1e-4, }, "log.final.star.HZLimMoistGreenhouse": { - "value": 7.078520e09, + "value": 7.078537e09, "unit": u.m, "rtol": 1e-4, }, "log.final.star.HZLimMaxGreenhouse": { - "value": 1.359778e10, + "value": 1.359781e10, "unit": u.m, "rtol": 1e-4, }, "log.final.star.HZLimEarlyMars": { - "value": 1.482979e10, + "value": 1.482982e10, "unit": u.m, "rtol": 1e-4, }, @@ -215,26 +229,26 @@ "rtol": 1e-4, }, "log.final.star.LXUVTot": { - "value": 7.362936e20, + "value": 7.362970e20, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, "log.final.star.LostEnergy": { - "value": 6.101413e39, + "value": 6.101563e39, "unit": u.Joule, "rtol": 1e-4, }, "log.final.star.LostAngMom": { - "value": 1.229310e41, + "value": 1.229362e41, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, - "log.final.star.Luminosity": {"value": 7.362936e23, "unit": u.W, "rtol": 1e-4}, - "log.final.star.LXUVStellar": {"value": 7.362936e20, "unit": u.W, "rtol": 1e-4}, - "log.final.star.Temperature": {"value": 2926.559033, "unit": u.K, "rtol": 1e-4}, + "log.final.star.Luminosity": {"value": 7.362970e23, "unit": u.W, "rtol": 1e-4}, + "log.final.star.LXUVStellar": {"value": 7.362970e20, "unit": u.W, "rtol": 1e-4}, + "log.final.star.Temperature": {"value": 2926.559809, "unit": u.K, "rtol": 1e-4}, "log.final.star.LXUVFrac": {"value": 0.001000, "rtol": 1e-4}, "log.final.star.RossbyNumber": {"value": 0.005916, "rtol": 1e-4}, - "log.final.star.DRotPerDtStellar": {"value": -4.367201e-12, "rtol": 1e-4}, + "log.final.star.DRotPerDtStellar": {"value": -4.367065e-12, "rtol": 1e-4}, "log.final.b.Mass": {"value": 6.073713e24, "unit": u.kg, "rtol": 1e-4}, "log.final.b.Radius": {"value": 7.149850e06, "unit": u.m, "rtol": 1e-4}, "log.final.b.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -245,25 +259,25 @@ "rtol": 1e-4, }, "log.final.b.HZLimitDryRunaway": { - "value": 5.941210e09, + "value": 5.941224e09, "unit": u.m, "rtol": 1e-4, }, - "log.final.b.HZLimRecVenus": {"value": 5.349684e09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimRunaway": {"value": 7.039052e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.HZLimRecVenus": {"value": 5.349697e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.HZLimRunaway": {"value": 7.039068e09, "unit": u.m, "rtol": 1e-4}, "log.final.b.HZLimMoistGreenhouse": { - "value": 7.078520e09, + "value": 7.078537e09, "unit": u.m, "rtol": 1e-4, }, "log.final.b.HZLimMaxGreenhouse": { - "value": 1.359778e10, + "value": 1.359781e10, "unit": u.m, "rtol": 1e-4, }, - "log.final.b.HZLimEarlyMars": {"value": 1.482979e10, "unit": u.m, "rtol": 1e-4}, + "log.final.b.HZLimEarlyMars": {"value": 1.482982e10, "unit": u.m, "rtol": 1e-4}, "log.final.b.Instellation": { - "value": 1.963378e04, + "value": 1.963387e04, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -279,12 +293,12 @@ "unit": u.kg / u.sec**3, "rtol": 1e-4, }, - "log.final.b.SurfWaterMass": {"value": 2.800778, "unit": u.TO, "rtol": 1e-4}, + "log.final.b.SurfWaterMass": {"value": 2.800732, "unit": u.TO, "rtol": 1e-4}, "log.final.b.EnvelopeMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.OxygenMass": {"value": 209.804676, "unit": u.bar, "rtol": 1e-4}, - "log.final.b.RGLimit": {"value": 6.824916e09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.XO": {"value": 0.427123, "rtol": 1e-4}, - "log.final.b.EtaO": {"value": 0.894840, "rtol": 1e-4}, + "log.final.b.OxygenMass": {"value": 209.804125, "unit": u.bar, "rtol": 1e-4}, + "log.final.b.RGLimit": {"value": 6.824931e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.XO": {"value": 0.427124, "rtol": 1e-4}, + "log.final.b.EtaO": {"value": 0.894844, "rtol": 1e-4}, "log.final.b.PlanetRadius": {"value": 7.149850e06, "unit": u.m, "rtol": 1e-4}, "log.final.b.OxygenMantleMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, "log.final.b.RadXUV": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, @@ -299,16 +313,40 @@ "unit": u.kg / u.sec, "rtol": 1e-4, }, - "log.final.b.FXUV": {"value": 19.633781, "unit": u.W / u.m**2, "rtol": 1e-4}, + "log.final.b.FXUV": {"value": 19.633872, "unit": u.W / u.m**2, "rtol": 1e-4}, "log.final.b.AtmXAbsEffH2O": {"value": 0.025045, "rtol": 1e-4}, "log.final.b.RocheRadius": {"value": 3.892555e07, "unit": u.m, "rtol": 1e-4}, - "log.final.b.BondiRadius": {"value": 5.410910e08, "unit": u.m, "rtol": 1e-4}, + "log.final.b.BondiRadius": {"value": 5.410903e08, "unit": u.m, "rtol": 1e-4}, "log.final.b.HEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, "log.final.b.RRCriticalFlux": { "value": 20.874806, "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.b.CrossoverMass": { + "value": 6.394649e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.b.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.b.FXUVCRITDRAG": { + "value": 1.341992, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.HREFFLUX": { + "value": 1.794662e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.XO2": {"value": 0.197160, "rtol": 1e-4}, + "log.final.b.XH2O": {"value": 0.802840, "rtol": 1e-4}, + "log.final.b.HDiffFlux": { + "value": 8.796482e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.HRefODragMod": {"value": 0.122568, "rtol": 1e-4}, "log.final.b.KTide": {"value": 0.727578, "rtol": 1e-4}, "log.final.b.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, "log.final.e.Mass": {"value": 4.610528e24, "unit": u.kg, "rtol": 1e-4}, @@ -321,25 +359,25 @@ "rtol": 1e-4, }, "log.final.e.HZLimitDryRunaway": { - "value": 5.941173e09, + "value": 5.941187e09, "unit": u.m, "rtol": 1e-4, }, - "log.final.e.HZLimRecVenus": {"value": 5.349684e09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.HZLimRunaway": {"value": 7.039052e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.HZLimRecVenus": {"value": 5.349697e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.HZLimRunaway": {"value": 7.039068e09, "unit": u.m, "rtol": 1e-4}, "log.final.e.HZLimMoistGreenhouse": { - "value": 7.078520e09, + "value": 7.078537e09, "unit": u.m, "rtol": 1e-4, }, "log.final.e.HZLimMaxGreenhouse": { - "value": 1.359778e10, + "value": 1.359781e10, "unit": u.m, "rtol": 1e-4, }, - "log.final.e.HZLimEarlyMars": {"value": 1.482979e10, "unit": u.m, "rtol": 1e-4}, + "log.final.e.HZLimEarlyMars": {"value": 1.482982e10, "unit": u.m, "rtol": 1e-4}, "log.final.e.Instellation": { - "value": 3053.298722, + "value": 3053.312903, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -355,12 +393,12 @@ "unit": u.kg / u.sec**3, "rtol": 1e-4, }, - "log.final.e.SurfWaterMass": {"value": 7.403333, "unit": u.TO, "rtol": 1e-4}, + "log.final.e.SurfWaterMass": {"value": 7.403320, "unit": u.TO, "rtol": 1e-4}, "log.final.e.EnvelopeMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.e.OxygenMass": {"value": 418.194192, "unit": u.bar, "rtol": 1e-4}, - "log.final.e.RGLimit": {"value": 6.869930e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.OxygenMass": {"value": 418.194151, "unit": u.bar, "rtol": 1e-4}, + "log.final.e.RGLimit": {"value": 6.869946e09, "unit": u.m, "rtol": 1e-4}, "log.final.e.XO": {"value": 0.377310, "rtol": 1e-4}, - "log.final.e.EtaO": {"value": 0.299543, "rtol": 1e-4}, + "log.final.e.EtaO": {"value": 0.299544, "rtol": 1e-4}, "log.final.e.PlanetRadius": {"value": 5.804071e06, "unit": u.m, "rtol": 1e-4}, "log.final.e.OxygenMantleMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, "log.final.e.RadXUV": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, @@ -375,19 +413,43 @@ "unit": u.kg / u.sec, "rtol": 1e-4, }, - "log.final.e.FXUV": {"value": 3.053299, "unit": u.W / u.m**2, "rtol": 1e-4}, + "log.final.e.FXUV": {"value": 3.053313, "unit": u.W / u.m**2, "rtol": 1e-4}, "log.final.e.AtmXAbsEffH2O": {"value": 0.051776, "rtol": 1e-4}, "log.final.e.RocheRadius": {"value": 9.004290e07, "unit": u.m, "rtol": 1e-4}, - "log.final.e.BondiRadius": {"value": 2.579341e08, "unit": u.m, "rtol": 1e-4}, + "log.final.e.BondiRadius": {"value": 2.579337e08, "unit": u.m, "rtol": 1e-4}, "log.final.e.HEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, "log.final.e.RRCriticalFlux": { "value": 34.669871, "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.e.CrossoverMass": { + "value": 3.474669e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.e.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.e.FXUVCRITDRAG": { + "value": 0.760060, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.e.HREFFLUX": { + "value": 4.968939e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.e.XO2": {"value": 0.095789, "rtol": 1e-4}, + "log.final.e.XH2O": {"value": 0.904211, "rtol": 1e-4}, + "log.final.e.HDiffFlux": { + "value": 1.101399e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.e.HRefODragMod": {"value": 0.294433, "rtol": 1e-4}, "log.final.e.KTide": {"value": 0.903445, "rtol": 1e-4}, "log.final.e.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, } ) -class TestAbioticO2(Benchmark): +class Test_AbioticO2(Benchmark): pass diff --git a/tests/AtmescStellar/AtmEscKepler-36/test_AtmEscKepler36.py b/tests/AtmescStellar/AtmEscKepler-36/test_AtmEscKepler36.py index 414ce644e..8f6316f29 100644 --- a/tests/AtmescStellar/AtmEscKepler-36/test_AtmEscKepler36.py +++ b/tests/AtmescStellar/AtmEscKepler-36/test_AtmEscKepler36.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -88,6 +87,14 @@ "log.initial.b.BondiRadius": {"value": 4.689081e06, "unit": u.m}, "log.initial.b.HEscapeRegime": {"value": 3.000000}, "log.initial.b.RRCriticalFlux": {"value": 0.014584, "unit": u.W / u.m**2}, + "log.initial.b.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.b.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.b.FXUVCRITDRAG": {"value": 3.214511e-05, "unit": u.W / u.m**2}, + "log.initial.b.HREFFLUX": {"value": 1.638654e21, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.XO2": {"value": 0.000000}, + "log.initial.b.XH2O": {"value": 0.000000}, + "log.initial.b.HDiffFlux": {"value": 3.796261e14, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.HRefODragMod": {"value": 1.000000}, "log.initial.b.KTide": {"value": 1.000000}, "log.initial.b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.c.Mass": {"value": 8.510699e25, "unit": u.kg}, @@ -128,6 +135,14 @@ "log.initial.c.BondiRadius": {"value": 3.675215e07, "unit": u.m}, "log.initial.c.HEscapeRegime": {"value": 3.000000}, "log.initial.c.RRCriticalFlux": {"value": 2.182140, "unit": u.W / u.m**2}, + "log.initial.c.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.c.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.c.FXUVCRITDRAG": {"value": 0.013654, "unit": u.W / u.m**2}, + "log.initial.c.HREFFLUX": {"value": 1.848993e20, "unit": 1 / u.m**2 / u.sec}, + "log.initial.c.XO2": {"value": 0.000000}, + "log.initial.c.XH2O": {"value": 0.000000}, + "log.initial.c.HDiffFlux": {"value": 1.079886e16, "unit": 1 / u.m**2 / u.sec}, + "log.initial.c.HRefODragMod": {"value": 1.000000}, "log.initial.c.KTide": {"value": 0.593531}, "log.initial.c.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 1.581036e17, "unit": u.sec, "rtol": 1e-4}, @@ -152,11 +167,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 2.705648e12, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Radius": {"value": 1.495979e11, "unit": u.m, "rtol": 1e-4}, "log.final.star.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -317,6 +327,26 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.b.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.b.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.b.FXUVCRITDRAG": { + "value": 0.266361, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.HREFFLUX": { + "value": 8.566168e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.b.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.b.HDiffFlux": { + "value": 1.897311e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.b.KTide": {"value": 0.936111, "rtol": 1e-4}, "log.final.b.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, "log.final.c.Mass": {"value": 6.650983e25, "unit": u.kg, "rtol": 1e-4}, @@ -393,9 +423,29 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.c.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.c.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.c.FXUVCRITDRAG": { + "value": 0.223423, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.c.HREFFLUX": { + "value": 4.483991e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.c.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.c.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.c.HDiffFlux": { + "value": 7.556605e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.c.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.c.KTide": {"value": 0.849139, "rtol": 1e-4}, "log.final.c.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, } ) -class TestAtmEscKepler36(Benchmark): +class Test_AtmEscKepler36(Benchmark): pass diff --git a/tests/AtmescStellar/AtmEscRegimes/test_AtmEscRegimes.py b/tests/AtmescStellar/AtmEscRegimes/test_AtmEscRegimes.py index dfaf9c250..36db08998 100644 --- a/tests/AtmescStellar/AtmEscRegimes/test_AtmEscRegimes.py +++ b/tests/AtmescStellar/AtmEscRegimes/test_AtmEscRegimes.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -91,6 +90,20 @@ "log.initial.bondi.BondiRadius": {"value": 50.317150, "unit": u.Rearth}, "log.initial.bondi.HEscapeRegime": {"value": 5.000000}, "log.initial.bondi.RRCriticalFlux": {"value": 0.917927, "unit": u.W / u.m**2}, + "log.initial.bondi.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.bondi.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.bondi.FXUVCRITDRAG": {"value": 0.011845, "unit": u.W / u.m**2}, + "log.initial.bondi.HREFFLUX": { + "value": 4.037870e20, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.bondi.XO2": {"value": 0.000000}, + "log.initial.bondi.XH2O": {"value": 0.000000}, + "log.initial.bondi.HDiffFlux": { + "value": 1.105368e16, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.bondi.HRefODragMod": {"value": 1.000000}, "log.initial.bondi.KTide": {"value": 0.619953}, "log.initial.bondi.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.rr.Mass": {"value": 1.000000, "unit": u.Mearth}, @@ -134,6 +147,17 @@ "log.initial.rr.BondiRadius": {"value": 5.031715, "unit": u.Rearth}, "log.initial.rr.HEscapeRegime": {"value": 6.000000}, "log.initial.rr.RRCriticalFlux": {"value": 47.046983, "unit": u.W / u.m**2}, + "log.initial.rr.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.rr.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.rr.FXUVCRITDRAG": {"value": 0.266266, "unit": u.W / u.m**2}, + "log.initial.rr.HREFFLUX": {"value": 7.721349e14, "unit": 1 / u.m**2 / u.sec}, + "log.initial.rr.XO2": {"value": 0.000000}, + "log.initial.rr.XH2O": {"value": 0.000000}, + "log.initial.rr.HDiffFlux": { + "value": 1.896863e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.rr.HRefODragMod": {"value": 1.000000}, "log.initial.rr.KTide": {"value": 0.936103}, "log.initial.rr.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 3.471336e13, "unit": u.sec, "rtol": 1e-4}, @@ -158,11 +182,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 9.428623e08, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Radius": {"value": 1.629995e09, "unit": u.m, "rtol": 1e-4}, "log.final.star.RadGyra": {"value": 0.450178, "rtol": 1e-4}, @@ -371,6 +390,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.bondi.CrossoverMass": { + "value": 0.000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.bondi.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.bondi.FXUVCRITDRAG": { + "value": 2.667266, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.bondi.HREFFLUX": { + "value": 4.591381e19, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.bondi.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.bondi.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.bondi.HDiffFlux": { + "value": 4.607902e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.bondi.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.bondi.KTide": {"value": 0.943291, "rtol": 1e-4}, "log.final.bondi.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, "log.final.rr.Mass": {"value": 1.000000, "unit": u.Mearth, "rtol": 1e-4}, @@ -463,9 +506,29 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.rr.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.rr.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.rr.FXUVCRITDRAG": { + "value": 0.266266, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.rr.HREFFLUX": { + "value": 7.721350e14, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.rr.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.rr.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.rr.HDiffFlux": { + "value": 1.896863e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.rr.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.rr.KTide": {"value": 0.936103, "rtol": 1e-4}, "log.final.rr.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, } ) -class TestAtmEscRegimes(Benchmark): +class Test_AtmEscRegimes(Benchmark): pass diff --git a/tests/AtmescStellar/DiffLimWaterEscape/test_DiffLimWaterEscape.py b/tests/AtmescStellar/DiffLimWaterEscape/test_DiffLimWaterEscape.py index e941677dd..7967c1876 100644 --- a/tests/AtmescStellar/DiffLimWaterEscape/test_DiffLimWaterEscape.py +++ b/tests/AtmescStellar/DiffLimWaterEscape/test_DiffLimWaterEscape.py @@ -1,267 +1,447 @@ -from benchmark import Benchmark, benchmark -import astropy.units as u -import pytest - -@benchmark( - { - "log.initial.system.Age": {"value": 3.155760e+13, "unit": u.sec}, - "log.initial.system.Time": {"value": 0.000000, "unit": u.sec}, - "log.initial.system.TotAngMom": {"value": 1.151432e+42, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.system.TotEnergy": {"value": -1.877843e+39, "unit": u.Joule}, - "log.initial.system.PotEnergy": {"value": -1.919599e+39, "unit": u.Joule}, - "log.initial.system.KinEnergy": {"value": 4.178988e+37, "unit": u.Joule}, - "log.initial.system.DeltaTime": {"value": 0.000000, "unit": u.sec}, - "log.initial.star.Mass": {"value": 1.789574e+29, "unit": u.kg}, - "log.initial.star.Radius": {"value": 6.681051e+08, "unit": u.m}, - "log.initial.star.RadGyra": {"value": 0.444800}, - "log.initial.star.RotAngMom": {"value": 1.149304e+42, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.star.RotVel": {"value": 4.858597e+04, "unit": u.m / u.sec}, - "log.initial.star.BodyType": {"value": 0.000000}, - "log.initial.star.RotRate": {"value": 7.272205e-05, "unit": 1 / u.sec}, - "log.initial.star.RotPer": {"value": 8.640000e+04, "unit": u.sec}, - "log.initial.star.Density": {"value": 143.260634, "unit": u.kg / u.m ** 3}, - "log.initial.star.HZLimitDryRunaway": {"value": 3.305062e+10, "unit": u.m}, - "log.initial.star.HZLimRecVenus": {"value": 2.977014e+10, "unit": u.m}, - "log.initial.star.HZLimRunaway": {"value": 3.916594e+10, "unit": u.m}, - "log.initial.star.HZLimMoistGreenhouse": {"value": 3.939084e+10, "unit": u.m}, - "log.initial.star.HZLimMaxGreenhouse": {"value": 7.572440e+10, "unit": u.m}, - "log.initial.star.HZLimEarlyMars": {"value": 8.258537e+10, "unit": u.m}, - "log.initial.star.Instellation": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.initial.star.CriticalSemiMajorAxis": {"value": -1.000000, "unit": u.m}, - "log.initial.star.LXUVTot": {"value": 5.924722e-05, "unit": u.LSUN}, - "log.initial.star.LostEnergy": {"value": 5.562685e-309, "unit": u.Joule}, - "log.initial.star.LostAngMom": {"value": 5.562685e-309, "unit": (u.kg * u.m ** 2) / u.sec}, - "log.initial.star.Luminosity": {"value": 0.059247, "unit": u.LSUN}, - "log.initial.star.LXUVStellar": {"value": 2.278648e+22, "unit": u.W}, - "log.initial.star.Temperature": {"value": 2907.334487, "unit": u.K}, - "log.initial.star.LXUVFrac": {"value": 0.001000}, - "log.initial.star.RossbyNumber": {"value": 0.014106}, - "log.initial.star.DRotPerDtStellar": {"value": 2.355449e-09}, - "log.initial.b.Mass": {"value": 8.223700e+24, "unit": u.kg}, - "log.initial.b.Radius": {"value": 7.124338e+06, "unit": u.m}, - "log.initial.b.RadGyra": {"value": 0.500000}, - "log.initial.b.BodyType": {"value": 0.000000}, - "log.initial.b.Density": {"value": 5429.316562, "unit": u.kg / u.m ** 3}, - "log.initial.b.HZLimitDryRunaway": {"value": 3.305089e+10, "unit": u.m}, - "log.initial.b.HZLimRecVenus": {"value": 2.977014e+10, "unit": u.m}, - "log.initial.b.HZLimRunaway": {"value": 3.916594e+10, "unit": u.m}, - "log.initial.b.HZLimMoistGreenhouse": {"value": 3.939084e+10, "unit": u.m}, - "log.initial.b.HZLimMaxGreenhouse": {"value": 7.572440e+10, "unit": u.m}, - "log.initial.b.HZLimEarlyMars": {"value": 8.258537e+10, "unit": u.m}, - "log.initial.b.Instellation": {"value": 6.076083e+05, "unit": u.kg / u.sec ** 3}, - "log.initial.b.MeanMotion": {"value": 4.813397e-05, "unit": 1 / u.sec}, - "log.initial.b.OrbPeriod": {"value": 1.305354e+05, "unit": u.sec}, - "log.initial.b.SemiMajorAxis": {"value": 1.727522e+09, "unit": u.m}, - "log.initial.b.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.initial.b.SurfWaterMass": {"value": 10.000000, "unit": u.TO}, - "log.initial.b.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.b.OxygenMass": {"value": 0.000000, "unit": u.bar}, - "log.initial.b.RGLimit": {"value": 3.770574e+10, "unit": u.m}, - "log.initial.b.XO": {"value": 0.333333}, - "log.initial.b.EtaO": {"value": 0.902643}, - "log.initial.b.PlanetRadius": {"value": 7.124338e+06, "unit": u.m}, - "log.initial.b.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.b.RadXUV": {"value": -1.000000, "unit": u.m}, - "log.initial.b.RadSolid": {"value": -1.000000, "unit": u.m}, - "log.initial.b.PresXUV": {"value": 5.000000}, - "log.initial.b.ScaleHeight": {"value": -1.000000, "unit": u.m}, - "log.initial.b.ThermTemp": {"value": 400.000000, "unit": u.K}, - "log.initial.b.AtmGasConst": {"value": 4124.000000}, - "log.initial.b.PresSurf": {"value": -1.000000, "unit": u.Pa}, - "log.initial.b.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, - "log.initial.b.FXUV": {"value": 607.608327, "unit": u.W / u.m ** 2}, - "log.initial.b.AtmXAbsEffH2O": {"value": 0.010000}, - "log.initial.b.RocheRadius": {"value": 4.290313e+07, "unit": u.m}, - "log.initial.b.BondiRadius": {"value": 3.107839e+08, "unit": u.m}, - "log.initial.b.HEscapeRegime": {"value": 8.000000}, - "log.initial.b.RRCriticalFlux": {"value": 41.454587, "unit": u.W / u.m ** 2}, - "log.initial.b.CrossoverMass": {"value": 2.575027e-25, "unit": u.kg}, - "log.initial.b.WaterEscapeRegime": {"value": 3.000000}, - "log.initial.b.FXUVCRITDRAG": {"value": 7.247839, "unit": u.W / u.m ** 2}, - "log.initial.b.HREFFLUX": {"value": 1.178796e+19, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.b.XO2": {"value": 0.000000}, - "log.initial.b.XH2O": {"value": 1.000000}, - "log.initial.b.HDiffFlux": {"value": 1.395966e+17, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.b.HRefODragMod": {"value": 0.121638}, - "log.initial.b.KTide": {"value": 0.753205}, - "log.initial.b.RGDuration": {"value": 0.00000e+00, "unit": u.yr}, - "log.initial.e.Mass": {"value": 4.138725e+24, "unit": u.kg}, - "log.initial.e.Radius": {"value": 5.880608e+06, "unit": u.m}, - "log.initial.e.RadGyra": {"value": 0.500000}, - "log.initial.e.BodyType": {"value": 0.000000}, - "log.initial.e.Density": {"value": 4858.600773, "unit": u.kg / u.m ** 3}, - "log.initial.e.HZLimitDryRunaway": {"value": 3.305129e+10, "unit": u.m}, - "log.initial.e.HZLimRecVenus": {"value": 2.977014e+10, "unit": u.m}, - "log.initial.e.HZLimRunaway": {"value": 3.916594e+10, "unit": u.m}, - "log.initial.e.HZLimMoistGreenhouse": {"value": 3.939084e+10, "unit": u.m}, - "log.initial.e.HZLimMaxGreenhouse": {"value": 7.572440e+10, "unit": u.m}, - "log.initial.e.HZLimEarlyMars": {"value": 8.258537e+10, "unit": u.m}, - "log.initial.e.Instellation": {"value": 9.448996e+04, "unit": u.kg / u.sec ** 3}, - "log.initial.e.MeanMotion": {"value": 1.191967e-05, "unit": 1 / u.sec}, - "log.initial.e.OrbPeriod": {"value": 5.271275e+05, "unit": u.sec}, - "log.initial.e.SemiMajorAxis": {"value": 4.380718e+09, "unit": u.m}, - "log.initial.e.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3}, - "log.initial.e.SurfWaterMass": {"value": 10.000000, "unit": u.TO}, - "log.initial.e.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.e.OxygenMass": {"value": 0.000000, "unit": u.bar}, - "log.initial.e.RGLimit": {"value": 3.832506e+10, "unit": u.m}, - "log.initial.e.XO": {"value": 0.333333}, - "log.initial.e.EtaO": {"value": 0.776474}, - "log.initial.e.PlanetRadius": {"value": 5.880608e+06, "unit": u.m}, - "log.initial.e.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, - "log.initial.e.RadXUV": {"value": -1.000000, "unit": u.m}, - "log.initial.e.RadSolid": {"value": -1.000000, "unit": u.m}, - "log.initial.e.PresXUV": {"value": 5.000000}, - "log.initial.e.ScaleHeight": {"value": -1.000000, "unit": u.m}, - "log.initial.e.ThermTemp": {"value": 400.000000, "unit": u.K}, - "log.initial.e.AtmGasConst": {"value": 4124.000000}, - "log.initial.e.PresSurf": {"value": -1.000000, "unit": u.Pa}, - "log.initial.e.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, - "log.initial.e.FXUV": {"value": 94.489956, "unit": u.W / u.m ** 2}, - "log.initial.e.AtmXAbsEffH2O": {"value": 0.011065}, - "log.initial.e.RocheRadius": {"value": 8.653872e+07, "unit": u.m}, - "log.initial.e.BondiRadius": {"value": 9.821934e+07, "unit": u.m}, - "log.initial.e.HEscapeRegime": {"value": 8.000000}, - "log.initial.e.RRCriticalFlux": {"value": 26.551159, "unit": u.W / u.m ** 2}, - "log.initial.e.CrossoverMass": {"value": 1.130931e-25, "unit": u.kg}, - "log.initial.e.WaterEscapeRegime": {"value": 3.000000}, - "log.initial.e.FXUVCRITDRAG": {"value": 2.949984, "unit": u.W / u.m ** 2}, - "log.initial.e.HREFFLUX": {"value": 3.326851e+18, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.e.XO2": {"value": 0.000000}, - "log.initial.e.XH2O": {"value": 1.000000}, - "log.initial.e.HDiffFlux": {"value": 1.031142e+17, "unit": 1 / u.m ** 2 / u.sec}, - "log.initial.e.HRefODragMod": {"value": 0.138662}, - "log.initial.e.KTide": {"value": 0.898227}, - "log.initial.e.RGDuration": {"value": 0.00000e+00, "unit": u.yr}, - "log.final.system.Age": {"value": 3.001128e+16, "unit": u.sec, "rtol": 1e-4}, - "log.final.system.Time": {"value": 2.997972e+16, "unit": u.sec, "rtol": 1e-4}, - "log.final.system.TotAngMom": {"value": 1.140605e+42, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.system.TotEnergy": {"value": -1.890023e+39, "unit": u.Joule, "rtol": 1e-4}, - "log.final.system.PotEnergy": {"value": -1.631379e+40, "unit": u.Joule, "rtol": 1e-4}, - "log.final.system.KinEnergy": {"value": 9.851807e+35, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.Mass": {"value": 1.789574e+29, "unit": u.kg, "rtol": 1e-4}, - "log.final.star.Radius": {"value": 7.861410e+07, "unit": u.m, "rtol": 1e-4}, - "log.final.star.RadGyra": {"value": 0.465100, "rtol": 1e-4}, - "log.final.star.RotAngMom": {"value": 2.171174e+40, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.star.RotVel": {"value": 7134.305972, "unit": u.m / u.sec, "rtol": 1e-4}, - "log.final.star.BodyType": {"value": 0.000000, "rtol": 1e-4}, - "log.final.star.RotRate": {"value": 9.075097e-05, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.star.RotPer": {"value": 6.923546e+04, "unit": u.sec, "rtol": 1e-4}, - "log.final.star.Density": {"value": 8.793460e+04, "unit": u.kg / u.m ** 3, "rtol": 1e-4}, - "log.final.star.HZLimitDryRunaway": {"value": 3.236261e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimRecVenus": {"value": 2.926995e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimRunaway": {"value": 3.845735e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimMoistGreenhouse": {"value": 3.872906e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimMaxGreenhouse": {"value": 7.519102e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.HZLimEarlyMars": {"value": 8.200580e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.star.Instellation": {"value": -1.000000, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.star.CriticalSemiMajorAxis": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, - "log.final.star.LXUVTot": {"value": 5.680619e-07, "unit": u.LSUN, "rtol": 1e-4}, - "log.final.star.LostEnergy": {"value": 1.442281e+40, "unit": u.Joule, "rtol": 1e-4}, - "log.final.star.LostAngMom": {"value": 1.116766e+42, "unit": (u.kg * u.m ** 2) / u.sec, "rtol": 1e-4}, - "log.final.star.Luminosity": {"value": 0.000568, "unit": u.LSUN, "rtol": 1e-4}, - "log.final.star.LXUVStellar": {"value": 2.184766e+20, "unit": u.W, "rtol": 1e-4}, - "log.final.star.Temperature": {"value": 2649.348933, "unit": u.K, "rtol": 1e-4}, - "log.final.star.LXUVFrac": {"value": 0.001000, "rtol": 1e-4}, - "log.final.star.RossbyNumber": {"value": 0.009905, "rtol": 1e-4}, - "log.final.star.DRotPerDtStellar": {"value": 1.447229e-12, "rtol": 1e-4}, - "log.final.b.Mass": {"value": 8.223700e+24, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.Radius": {"value": 7.124338e+06, "unit": u.m, "rtol": 1e-4}, - "log.final.b.RadGyra": {"value": 0.500000, "rtol": 1e-4}, - "log.final.b.BodyType": {"value": 0.000000, "rtol": 1e-4}, - "log.final.b.Density": {"value": 5429.316562, "unit": u.kg / u.m ** 3, "rtol": 1e-4}, - "log.final.b.HZLimitDryRunaway": {"value": 3.236287e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimRecVenus": {"value": 2.926995e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimRunaway": {"value": 3.845735e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimMoistGreenhouse": {"value": 3.872906e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimMaxGreenhouse": {"value": 7.519102e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HZLimEarlyMars": {"value": 8.200580e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.Instellation": {"value": 5825.743992, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.b.MeanMotion": {"value": 4.813397e-05, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.b.OrbPeriod": {"value": 1.305354e+05, "unit": u.sec, "rtol": 1e-4}, - "log.final.b.SemiMajorAxis": {"value": 1.727522e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.b.SurfWaterMass": {"value": 0.000000, "unit": u.TO, "rtol": 1e-4}, - "log.final.b.EnvelopeMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.OxygenMass": {"value": 1146.053603, "unit": u.bar, "rtol": 1e-4}, - "log.final.b.RGLimit": {"value": 3.704010e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.b.XO": {"value": 1.000000, "rtol": 1e-4}, - "log.final.b.EtaO": {"value": 0.000000, "rtol": 1e-4}, - "log.final.b.PlanetRadius": {"value": 7.124338e+06, "unit": u.m, "rtol": 1e-4}, - "log.final.b.OxygenMantleMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.RadXUV": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.RadSolid": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.PresXUV": {"value": 5.000000, "rtol": 1e-4}, - "log.final.b.ScaleHeight": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, - "log.final.b.ThermTemp": {"value": 400.000000, "unit": u.K, "rtol": 1e-4}, - "log.final.b.AtmGasConst": {"value": 4124.000000, "rtol": 1e-4}, - "log.final.b.PresSurf": {"value": -1.000000, "unit": u.Pa, "rtol": 1e-4}, - "log.final.b.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec, "rtol": 1e-4}, - "log.final.b.FXUV": {"value": 5.825744, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.AtmXAbsEffH2O": {"value": 0.041374, "rtol": 1e-4}, - "log.final.b.RocheRadius": {"value": 4.290313e+07, "unit": u.m, "rtol": 1e-4}, - "log.final.b.BondiRadius": {"value": 9.942293e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.b.HEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, - "log.final.b.RRCriticalFlux": {"value": 41.454587, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, - "log.final.b.FXUVCRITDRAG": {"value": 0.000000, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.b.HREFFLUX": {"value": 4.676160e+17, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.b.XO2": {"value": 1.000000, "rtol": 1e-4}, - "log.final.b.XH2O": {"value": 0.000000, "rtol": 1e-4}, - "log.final.b.HDiffFlux": {"value": 0.000000, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.b.HRefODragMod": {"value": 0.000000, "rtol": 1e-4}, - "log.final.b.KTide": {"value": 0.753205, "rtol": 1e-4}, - "log.final.b.RGDuration": {"value": 0.00000e+00, "unit": u.yr, "rtol": 1e-4}, - "log.final.e.Mass": {"value": 4.138725e+24, "unit": u.kg, "rtol": 1e-4}, - "log.final.e.Radius": {"value": 5.880608e+06, "unit": u.m, "rtol": 1e-4}, - "log.final.e.RadGyra": {"value": 0.500000, "rtol": 1e-4}, - "log.final.e.BodyType": {"value": 0.000000, "rtol": 1e-4}, - "log.final.e.Density": {"value": 4858.600773, "unit": u.kg / u.m ** 3, "rtol": 1e-4}, - "log.final.e.HZLimitDryRunaway": {"value": 3.236326e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.HZLimRecVenus": {"value": 2.926995e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.HZLimRunaway": {"value": 3.845735e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.HZLimMoistGreenhouse": {"value": 3.872906e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.HZLimMaxGreenhouse": {"value": 7.519102e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.HZLimEarlyMars": {"value": 8.200580e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.Instellation": {"value": 905.968971, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.e.MeanMotion": {"value": 1.191967e-05, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.e.OrbPeriod": {"value": 5.271275e+05, "unit": u.sec, "rtol": 1e-4}, - "log.final.e.SemiMajorAxis": {"value": 4.380718e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec ** 3, "rtol": 1e-4}, - "log.final.e.SurfWaterMass": {"value": 3.053422, "unit": u.TO, "rtol": 1e-4}, - "log.final.e.EnvelopeMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.e.OxygenMass": {"value": 1031.243496, "unit": u.bar, "rtol": 1e-4}, - "log.final.e.RGLimit": {"value": 3.765018e+09, "unit": u.m, "rtol": 1e-4}, - "log.final.e.XO": {"value": 0.554278, "rtol": 1e-4}, - "log.final.e.EtaO": {"value": 0.000000, "rtol": 1e-4}, - "log.final.e.PlanetRadius": {"value": 5.880608e+06, "unit": u.m, "rtol": 1e-4}, - "log.final.e.OxygenMantleMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.e.RadXUV": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, - "log.final.e.RadSolid": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, - "log.final.e.PresXUV": {"value": 5.000000, "rtol": 1e-4}, - "log.final.e.ScaleHeight": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, - "log.final.e.ThermTemp": {"value": 400.000000, "unit": u.K, "rtol": 1e-4}, - "log.final.e.AtmGasConst": {"value": 4124.000000, "rtol": 1e-4}, - "log.final.e.PresSurf": {"value": -1.000000, "unit": u.Pa, "rtol": 1e-4}, - "log.final.e.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec, "rtol": 1e-4}, - "log.final.e.FXUV": {"value": 0.905969, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.e.AtmXAbsEffH2O": {"value": 0.073282, "rtol": 1e-4}, - "log.final.e.RocheRadius": {"value": 8.653872e+07, "unit": u.m, "rtol": 1e-4}, - "log.final.e.BondiRadius": {"value": 3.142136e+08, "unit": u.m, "rtol": 1e-4}, - "log.final.e.HEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, - "log.final.e.RRCriticalFlux": {"value": 26.551159, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.e.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, - "log.final.e.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, - "log.final.e.FXUVCRITDRAG": {"value": 0.297807, "unit": u.W / u.m ** 2, "rtol": 1e-4}, - "log.final.e.HREFFLUX": {"value": 2.112523e+17, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.e.XO2": {"value": 0.426457, "rtol": 1e-4}, - "log.final.e.XH2O": {"value": 0.573543, "rtol": 1e-4}, - "log.final.e.HDiffFlux": {"value": 6.894047e+16, "unit": 1 / u.m ** 2 / u.sec, "rtol": 1e-4}, - "log.final.e.HRefODragMod": {"value": 0.003131, "rtol": 1e-4}, - "log.final.e.KTide": {"value": 0.898227, "rtol": 1e-4}, - "log.final.e.RGDuration": {"value": 3.80345e+08, "unit": u.yr, "rtol": 1e-4}, - } +import astropy.units as u +from benchmark import Benchmark, benchmark + + +@benchmark( + { + "log.initial.system.Age": {"value": 3.155760e13, "unit": u.sec}, + "log.initial.system.Time": {"value": 0.000000, "unit": u.sec}, + "log.initial.system.TotAngMom": { + "value": 1.151432e42, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.system.TotEnergy": {"value": -1.877843e39, "unit": u.Joule}, + "log.initial.system.PotEnergy": {"value": -1.919599e39, "unit": u.Joule}, + "log.initial.system.KinEnergy": {"value": 4.178988e37, "unit": u.Joule}, + "log.initial.system.DeltaTime": {"value": 0.000000, "unit": u.sec}, + "log.initial.star.Mass": {"value": 1.789574e29, "unit": u.kg}, + "log.initial.star.Radius": {"value": 6.681051e08, "unit": u.m}, + "log.initial.star.RadGyra": {"value": 0.444800}, + "log.initial.star.RotAngMom": { + "value": 1.149304e42, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.star.RotVel": {"value": 4.858597e04, "unit": u.m / u.sec}, + "log.initial.star.BodyType": {"value": 0.000000}, + "log.initial.star.RotRate": {"value": 7.272205e-05, "unit": 1 / u.sec}, + "log.initial.star.RotPer": {"value": 8.640000e04, "unit": u.sec}, + "log.initial.star.Density": {"value": 143.260634, "unit": u.kg / u.m**3}, + "log.initial.star.HZLimitDryRunaway": {"value": 3.305062e10, "unit": u.m}, + "log.initial.star.HZLimRecVenus": {"value": 2.977014e10, "unit": u.m}, + "log.initial.star.HZLimRunaway": {"value": 3.916594e10, "unit": u.m}, + "log.initial.star.HZLimMoistGreenhouse": {"value": 3.939084e10, "unit": u.m}, + "log.initial.star.HZLimMaxGreenhouse": {"value": 7.572440e10, "unit": u.m}, + "log.initial.star.HZLimEarlyMars": {"value": 8.258537e10, "unit": u.m}, + "log.initial.star.Instellation": { + "value": -1.000000, + "unit": u.kg / u.sec**3, + }, + "log.initial.star.CriticalSemiMajorAxis": {"value": -1.000000, "unit": u.m}, + "log.initial.star.LXUVTot": {"value": 5.924722e-05, "unit": u.LSUN}, + "log.initial.star.LostEnergy": {"value": 5.562685e-309, "unit": u.Joule}, + "log.initial.star.LostAngMom": { + "value": 5.562685e-309, + "unit": (u.kg * u.m**2) / u.sec, + }, + "log.initial.star.Luminosity": {"value": 0.059247, "unit": u.LSUN}, + "log.initial.star.LXUVStellar": {"value": 2.278648e22, "unit": u.W}, + "log.initial.star.Temperature": {"value": 2907.334487, "unit": u.K}, + "log.initial.star.LXUVFrac": {"value": 0.001000}, + "log.initial.star.RossbyNumber": {"value": 0.014106}, + "log.initial.star.DRotPerDtStellar": {"value": 2.355449e-09}, + "log.initial.b.Mass": {"value": 8.223700e24, "unit": u.kg}, + "log.initial.b.Radius": {"value": 7.124338e06, "unit": u.m}, + "log.initial.b.RadGyra": {"value": 0.500000}, + "log.initial.b.BodyType": {"value": 0.000000}, + "log.initial.b.Density": {"value": 5429.316562, "unit": u.kg / u.m**3}, + "log.initial.b.HZLimitDryRunaway": {"value": 3.305089e10, "unit": u.m}, + "log.initial.b.HZLimRecVenus": {"value": 2.977014e10, "unit": u.m}, + "log.initial.b.HZLimRunaway": {"value": 3.916594e10, "unit": u.m}, + "log.initial.b.HZLimMoistGreenhouse": {"value": 3.939084e10, "unit": u.m}, + "log.initial.b.HZLimMaxGreenhouse": {"value": 7.572440e10, "unit": u.m}, + "log.initial.b.HZLimEarlyMars": {"value": 8.258537e10, "unit": u.m}, + "log.initial.b.Instellation": {"value": 6.076083e05, "unit": u.kg / u.sec**3}, + "log.initial.b.MeanMotion": {"value": 4.813397e-05, "unit": 1 / u.sec}, + "log.initial.b.OrbPeriod": {"value": 1.305354e05, "unit": u.sec}, + "log.initial.b.SemiMajorAxis": {"value": 1.727522e09, "unit": u.m}, + "log.initial.b.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.initial.b.SurfWaterMass": {"value": 10.000000, "unit": u.TO}, + "log.initial.b.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.b.OxygenMass": {"value": 0.000000, "unit": u.bar}, + "log.initial.b.RGLimit": {"value": 3.770574e10, "unit": u.m}, + "log.initial.b.XO": {"value": 0.333333}, + "log.initial.b.EtaO": {"value": 0.902643}, + "log.initial.b.PlanetRadius": {"value": 7.124338e06, "unit": u.m}, + "log.initial.b.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.b.RadXUV": {"value": -1.000000, "unit": u.m}, + "log.initial.b.RadSolid": {"value": -1.000000, "unit": u.m}, + "log.initial.b.PresXUV": {"value": 5.000000}, + "log.initial.b.ScaleHeight": {"value": -1.000000, "unit": u.m}, + "log.initial.b.ThermTemp": {"value": 400.000000, "unit": u.K}, + "log.initial.b.AtmGasConst": {"value": 4124.000000}, + "log.initial.b.PresSurf": {"value": -1.000000, "unit": u.Pa}, + "log.initial.b.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, + "log.initial.b.FXUV": {"value": 607.608327, "unit": u.W / u.m**2}, + "log.initial.b.AtmXAbsEffH2O": {"value": 0.010000}, + "log.initial.b.RocheRadius": {"value": 4.290313e07, "unit": u.m}, + "log.initial.b.BondiRadius": {"value": 3.107839e08, "unit": u.m}, + "log.initial.b.HEscapeRegime": {"value": 8.000000}, + "log.initial.b.RRCriticalFlux": {"value": 41.454587, "unit": u.W / u.m**2}, + "log.initial.b.CrossoverMass": {"value": 2.575027e-25, "unit": u.kg}, + "log.initial.b.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.b.FXUVCRITDRAG": {"value": 7.247839, "unit": u.W / u.m**2}, + "log.initial.b.HREFFLUX": {"value": 1.178796e19, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.XO2": {"value": 0.000000}, + "log.initial.b.XH2O": {"value": 1.000000}, + "log.initial.b.HDiffFlux": {"value": 1.395966e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.b.HRefODragMod": {"value": 0.121638}, + "log.initial.b.KTide": {"value": 0.753205}, + "log.initial.b.RGDuration": {"value": 0.00000e00, "unit": u.yr}, + "log.initial.e.Mass": {"value": 4.138725e24, "unit": u.kg}, + "log.initial.e.Radius": {"value": 5.880608e06, "unit": u.m}, + "log.initial.e.RadGyra": {"value": 0.500000}, + "log.initial.e.BodyType": {"value": 0.000000}, + "log.initial.e.Density": {"value": 4858.600773, "unit": u.kg / u.m**3}, + "log.initial.e.HZLimitDryRunaway": {"value": 3.305129e10, "unit": u.m}, + "log.initial.e.HZLimRecVenus": {"value": 2.977014e10, "unit": u.m}, + "log.initial.e.HZLimRunaway": {"value": 3.916594e10, "unit": u.m}, + "log.initial.e.HZLimMoistGreenhouse": {"value": 3.939084e10, "unit": u.m}, + "log.initial.e.HZLimMaxGreenhouse": {"value": 7.572440e10, "unit": u.m}, + "log.initial.e.HZLimEarlyMars": {"value": 8.258537e10, "unit": u.m}, + "log.initial.e.Instellation": {"value": 9.448996e04, "unit": u.kg / u.sec**3}, + "log.initial.e.MeanMotion": {"value": 1.191967e-05, "unit": 1 / u.sec}, + "log.initial.e.OrbPeriod": {"value": 5.271275e05, "unit": u.sec}, + "log.initial.e.SemiMajorAxis": {"value": 4.380718e09, "unit": u.m}, + "log.initial.e.LXUVTot": {"value": -1.000000, "unit": u.kg / u.sec**3}, + "log.initial.e.SurfWaterMass": {"value": 10.000000, "unit": u.TO}, + "log.initial.e.EnvelopeMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.e.OxygenMass": {"value": 0.000000, "unit": u.bar}, + "log.initial.e.RGLimit": {"value": 3.832506e10, "unit": u.m}, + "log.initial.e.XO": {"value": 0.333333}, + "log.initial.e.EtaO": {"value": 0.776474}, + "log.initial.e.PlanetRadius": {"value": 5.880608e06, "unit": u.m}, + "log.initial.e.OxygenMantleMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.e.RadXUV": {"value": -1.000000, "unit": u.m}, + "log.initial.e.RadSolid": {"value": -1.000000, "unit": u.m}, + "log.initial.e.PresXUV": {"value": 5.000000}, + "log.initial.e.ScaleHeight": {"value": -1.000000, "unit": u.m}, + "log.initial.e.ThermTemp": {"value": 400.000000, "unit": u.K}, + "log.initial.e.AtmGasConst": {"value": 4124.000000}, + "log.initial.e.PresSurf": {"value": -1.000000, "unit": u.Pa}, + "log.initial.e.DEnvMassDt": {"value": 0.000000, "unit": u.kg / u.sec}, + "log.initial.e.FXUV": {"value": 94.489956, "unit": u.W / u.m**2}, + "log.initial.e.AtmXAbsEffH2O": {"value": 0.011065}, + "log.initial.e.RocheRadius": {"value": 8.653872e07, "unit": u.m}, + "log.initial.e.BondiRadius": {"value": 9.821934e07, "unit": u.m}, + "log.initial.e.HEscapeRegime": {"value": 8.000000}, + "log.initial.e.RRCriticalFlux": {"value": 26.551159, "unit": u.W / u.m**2}, + "log.initial.e.CrossoverMass": {"value": 1.130931e-25, "unit": u.kg}, + "log.initial.e.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.e.FXUVCRITDRAG": {"value": 2.949984, "unit": u.W / u.m**2}, + "log.initial.e.HREFFLUX": {"value": 3.326851e18, "unit": 1 / u.m**2 / u.sec}, + "log.initial.e.XO2": {"value": 0.000000}, + "log.initial.e.XH2O": {"value": 1.000000}, + "log.initial.e.HDiffFlux": {"value": 1.031142e17, "unit": 1 / u.m**2 / u.sec}, + "log.initial.e.HRefODragMod": {"value": 0.138662}, + "log.initial.e.KTide": {"value": 0.898227}, + "log.initial.e.RGDuration": {"value": 0.00000e00, "unit": u.yr}, + "log.final.system.Age": {"value": 3.001128e16, "unit": u.sec, "rtol": 1e-4}, + "log.final.system.Time": {"value": 2.997972e16, "unit": u.sec, "rtol": 1e-4}, + "log.final.system.TotAngMom": { + "value": 1.140606e42, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.system.TotEnergy": { + "value": -1.889993e39, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.PotEnergy": { + "value": -1.631379e40, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.system.KinEnergy": { + "value": 9.851973e35, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.Mass": {"value": 1.789574e29, "unit": u.kg, "rtol": 1e-4}, + "log.final.star.Radius": {"value": 7.861410e07, "unit": u.m, "rtol": 1e-4}, + "log.final.star.RadGyra": {"value": 0.465100, "rtol": 1e-4}, + "log.final.star.RotAngMom": { + "value": 2.171192e40, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.star.RotVel": { + "value": 7134.365876, + "unit": u.m / u.sec, + "rtol": 1e-4, + }, + "log.final.star.BodyType": {"value": 0.000000, "rtol": 1e-4}, + "log.final.star.RotRate": { + "value": 9.075173e-05, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.star.RotPer": {"value": 6.923488e04, "unit": u.sec, "rtol": 1e-4}, + "log.final.star.Density": { + "value": 8.793460e04, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.star.HZLimitDryRunaway": { + "value": 3.236263e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimRecVenus": { + "value": 2.926998e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimRunaway": { + "value": 3.845738e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimMoistGreenhouse": { + "value": 3.872909e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimMaxGreenhouse": { + "value": 7.519107e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.HZLimEarlyMars": { + "value": 8.200586e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.Instellation": { + "value": -1.000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.star.CriticalSemiMajorAxis": { + "value": -1.000000, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.star.LXUVTot": {"value": 5.680628e-07, "unit": u.LSUN, "rtol": 1e-4}, + "log.final.star.LostEnergy": { + "value": 1.442284e40, + "unit": u.Joule, + "rtol": 1e-4, + }, + "log.final.star.LostAngMom": { + "value": 1.116766e42, + "unit": (u.kg * u.m**2) / u.sec, + "rtol": 1e-4, + }, + "log.final.star.Luminosity": {"value": 0.000568, "unit": u.LSUN, "rtol": 1e-4}, + "log.final.star.LXUVStellar": {"value": 2.184770e20, "unit": u.W, "rtol": 1e-4}, + "log.final.star.Temperature": {"value": 2649.349787, "unit": u.K, "rtol": 1e-4}, + "log.final.star.LXUVFrac": {"value": 0.001000, "rtol": 1e-4}, + "log.final.star.RossbyNumber": {"value": 0.009905, "rtol": 1e-4}, + "log.final.star.DRotPerDtStellar": {"value": 1.447216e-12, "rtol": 1e-4}, + "log.final.b.Mass": {"value": 8.223700e24, "unit": u.kg, "rtol": 1e-4}, + "log.final.b.Radius": {"value": 7.124338e06, "unit": u.m, "rtol": 1e-4}, + "log.final.b.RadGyra": {"value": 0.500000, "rtol": 1e-4}, + "log.final.b.BodyType": {"value": 0.000000, "rtol": 1e-4}, + "log.final.b.Density": { + "value": 5429.316562, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.b.HZLimitDryRunaway": { + "value": 3.236289e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimRecVenus": {"value": 2.926998e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.HZLimRunaway": {"value": 3.845738e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.HZLimMoistGreenhouse": { + "value": 3.872909e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimMaxGreenhouse": { + "value": 7.519107e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.b.HZLimEarlyMars": {"value": 8.200586e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.Instellation": { + "value": 5825.753033, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.b.MeanMotion": { + "value": 4.813397e-05, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.OrbPeriod": {"value": 1.305354e05, "unit": u.sec, "rtol": 1e-4}, + "log.final.b.SemiMajorAxis": {"value": 1.727522e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.LXUVTot": { + "value": -1.000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.b.SurfWaterMass": {"value": 0.000000, "unit": u.TO, "rtol": 1e-4}, + "log.final.b.EnvelopeMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.b.OxygenMass": {"value": 1146.048414, "unit": u.bar, "rtol": 1e-4}, + "log.final.b.RGLimit": {"value": 3.704013e09, "unit": u.m, "rtol": 1e-4}, + "log.final.b.XO": {"value": 1.000000, "rtol": 1e-4}, + "log.final.b.EtaO": {"value": 0.000000, "rtol": 1e-4}, + "log.final.b.PlanetRadius": {"value": 7.124338e06, "unit": u.m, "rtol": 1e-4}, + "log.final.b.OxygenMantleMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.b.RadXUV": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.RadSolid": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.PresXUV": {"value": 5.000000, "rtol": 1e-4}, + "log.final.b.ScaleHeight": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.b.ThermTemp": {"value": 400.000000, "unit": u.K, "rtol": 1e-4}, + "log.final.b.AtmGasConst": {"value": 4124.000000, "rtol": 1e-4}, + "log.final.b.PresSurf": {"value": -1.000000, "unit": u.Pa, "rtol": 1e-4}, + "log.final.b.DEnvMassDt": { + "value": 0.000000, + "unit": u.kg / u.sec, + "rtol": 1e-4, + }, + "log.final.b.FXUV": {"value": 5.825753, "unit": u.W / u.m**2, "rtol": 1e-4}, + "log.final.b.AtmXAbsEffH2O": {"value": 0.041374, "rtol": 1e-4}, + "log.final.b.RocheRadius": {"value": 4.290313e07, "unit": u.m, "rtol": 1e-4}, + "log.final.b.BondiRadius": {"value": 9.942289e08, "unit": u.m, "rtol": 1e-4}, + "log.final.b.HEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.b.RRCriticalFlux": { + "value": 41.454587, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.b.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.b.FXUVCRITDRAG": { + "value": 0.000000, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.b.HREFFLUX": { + "value": 4.676165e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.b.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.b.HDiffFlux": { + "value": 0.000000, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.b.HRefODragMod": {"value": 0.000000, "rtol": 1e-4}, + "log.final.b.KTide": {"value": 0.753205, "rtol": 1e-4}, + "log.final.b.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, + "log.final.e.Mass": {"value": 4.138725e24, "unit": u.kg, "rtol": 1e-4}, + "log.final.e.Radius": {"value": 5.880608e06, "unit": u.m, "rtol": 1e-4}, + "log.final.e.RadGyra": {"value": 0.500000, "rtol": 1e-4}, + "log.final.e.BodyType": {"value": 0.000000, "rtol": 1e-4}, + "log.final.e.Density": { + "value": 4858.600773, + "unit": u.kg / u.m**3, + "rtol": 1e-4, + }, + "log.final.e.HZLimitDryRunaway": { + "value": 3.236329e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.e.HZLimRecVenus": {"value": 2.926998e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.HZLimRunaway": {"value": 3.845738e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.HZLimMoistGreenhouse": { + "value": 3.872909e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.e.HZLimMaxGreenhouse": { + "value": 7.519107e09, + "unit": u.m, + "rtol": 1e-4, + }, + "log.final.e.HZLimEarlyMars": {"value": 8.200586e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.Instellation": { + "value": 905.970378, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.e.MeanMotion": { + "value": 1.191967e-05, + "unit": 1 / u.sec, + "rtol": 1e-4, + }, + "log.final.e.OrbPeriod": {"value": 5.271275e05, "unit": u.sec, "rtol": 1e-4}, + "log.final.e.SemiMajorAxis": {"value": 4.380718e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.LXUVTot": { + "value": -1.000000, + "unit": u.kg / u.sec**3, + "rtol": 1e-4, + }, + "log.final.e.SurfWaterMass": {"value": 3.053414, "unit": u.TO, "rtol": 1e-4}, + "log.final.e.EnvelopeMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.e.OxygenMass": {"value": 1031.243434, "unit": u.bar, "rtol": 1e-4}, + "log.final.e.RGLimit": {"value": 3.765021e09, "unit": u.m, "rtol": 1e-4}, + "log.final.e.XO": {"value": 0.554278, "rtol": 1e-4}, + "log.final.e.EtaO": {"value": 0.000000, "rtol": 1e-4}, + "log.final.e.PlanetRadius": {"value": 5.880608e06, "unit": u.m, "rtol": 1e-4}, + "log.final.e.OxygenMantleMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.e.RadXUV": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.e.RadSolid": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.e.PresXUV": {"value": 5.000000, "rtol": 1e-4}, + "log.final.e.ScaleHeight": {"value": -1.000000, "unit": u.m, "rtol": 1e-4}, + "log.final.e.ThermTemp": {"value": 400.000000, "unit": u.K, "rtol": 1e-4}, + "log.final.e.AtmGasConst": {"value": 4124.000000, "rtol": 1e-4}, + "log.final.e.PresSurf": {"value": -1.000000, "unit": u.Pa, "rtol": 1e-4}, + "log.final.e.DEnvMassDt": { + "value": 0.000000, + "unit": u.kg / u.sec, + "rtol": 1e-4, + }, + "log.final.e.FXUV": {"value": 0.905970, "unit": u.W / u.m**2, "rtol": 1e-4}, + "log.final.e.AtmXAbsEffH2O": {"value": 0.073282, "rtol": 1e-4}, + "log.final.e.RocheRadius": {"value": 8.653872e07, "unit": u.m, "rtol": 1e-4}, + "log.final.e.BondiRadius": {"value": 3.142135e08, "unit": u.m, "rtol": 1e-4}, + "log.final.e.HEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.e.RRCriticalFlux": { + "value": 26.551159, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.e.CrossoverMass": {"value": 0.000000, "unit": u.kg, "rtol": 1e-4}, + "log.final.e.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.e.FXUVCRITDRAG": { + "value": 0.297807, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.e.HREFFLUX": { + "value": 2.112525e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.e.XO2": {"value": 0.426458, "rtol": 1e-4}, + "log.final.e.XH2O": {"value": 0.573542, "rtol": 1e-4}, + "log.final.e.HDiffFlux": { + "value": 6.894041e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.e.HRefODragMod": {"value": 0.003131, "rtol": 1e-4}, + "log.final.e.KTide": {"value": 0.898227, "rtol": 1e-4}, + "log.final.e.RGDuration": {"value": 3.80352e08, "unit": u.yr, "rtol": 1e-4}, + } ) -class Test_DiffLimWaterEscape(Benchmark): - pass +class Test_DiffLimWaterEscape(Benchmark): + pass diff --git a/tests/AtmescStellar/HabEvapCore/test_HabEvapCore.py b/tests/AtmescStellar/HabEvapCore/test_HabEvapCore.py index 06351ad0c..02583b418 100644 --- a/tests/AtmescStellar/HabEvapCore/test_HabEvapCore.py +++ b/tests/AtmescStellar/HabEvapCore/test_HabEvapCore.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -112,6 +111,23 @@ "value": 27.771659, "unit": u.W / u.m**2, }, + "log.initial.ProxCenELim.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.ProxCenELim.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.ProxCenELim.FXUVCRITDRAG": { + "value": 0.109027, + "unit": u.W / u.m**2, + }, + "log.initial.ProxCenELim.HREFFLUX": { + "value": 2.720240e19, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.ProxCenELim.XO2": {"value": 0.000000}, + "log.initial.ProxCenELim.XH2O": {"value": 1.000000}, + "log.initial.ProxCenELim.HDiffFlux": { + "value": 8.437534e16, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.ProxCenELim.HRefODragMod": {"value": 0.007752}, "log.initial.ProxCenELim.KTide": {"value": 0.917709}, "log.initial.ProxCenELim.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.ProxCenRRLim.Mass": {"value": 7.584676e24, "unit": u.kg}, @@ -179,6 +195,23 @@ "value": 27.771659, "unit": u.W / u.m**2, }, + "log.initial.ProxCenRRLim.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.ProxCenRRLim.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.ProxCenRRLim.FXUVCRITDRAG": { + "value": 0.109027, + "unit": u.W / u.m**2, + }, + "log.initial.ProxCenRRLim.HREFFLUX": { + "value": 2.720240e19, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.ProxCenRRLim.XO2": {"value": 0.000000}, + "log.initial.ProxCenRRLim.XH2O": {"value": 1.000000}, + "log.initial.ProxCenRRLim.HDiffFlux": { + "value": 8.437534e16, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.ProxCenRRLim.HRefODragMod": {"value": 0.007752}, "log.initial.ProxCenRRLim.KTide": {"value": 0.917709}, "log.initial.ProxCenRRLim.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.ProxCenAuto.Mass": {"value": 7.584676e24, "unit": u.kg}, @@ -243,6 +276,23 @@ "value": 27.771659, "unit": u.W / u.m**2, }, + "log.initial.ProxCenAuto.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.ProxCenAuto.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.ProxCenAuto.FXUVCRITDRAG": { + "value": 0.109027, + "unit": u.W / u.m**2, + }, + "log.initial.ProxCenAuto.HREFFLUX": { + "value": 2.720240e19, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.ProxCenAuto.XO2": {"value": 0.000000}, + "log.initial.ProxCenAuto.XH2O": {"value": 1.000000}, + "log.initial.ProxCenAuto.HDiffFlux": { + "value": 8.437534e16, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.ProxCenAuto.HRefODragMod": {"value": 0.007752}, "log.initial.ProxCenAuto.KTide": {"value": 0.917709}, "log.initial.ProxCenAuto.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.LC17ELim.Mass": {"value": 7.584676e24, "unit": u.kg}, @@ -295,6 +345,23 @@ "value": 0.139129, "unit": u.W / u.m**2, }, + "log.initial.LC17ELim.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.LC17ELim.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.LC17ELim.FXUVCRITDRAG": { + "value": 0.001151, + "unit": u.W / u.m**2, + }, + "log.initial.LC17ELim.HREFFLUX": { + "value": 1.799959e20, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.LC17ELim.XO2": {"value": 0.000000}, + "log.initial.LC17ELim.XH2O": {"value": 1.000000}, + "log.initial.LC17ELim.HDiffFlux": { + "value": 4.059461e15, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.LC17ELim.HRefODragMod": {"value": 0.007752}, "log.initial.LC17ELim.KTide": {"value": 0.632300}, "log.initial.LC17ELim.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.LC17RRLim.Mass": {"value": 7.584676e24, "unit": u.kg}, @@ -350,6 +417,23 @@ "value": 0.139129, "unit": u.W / u.m**2, }, + "log.initial.LC17RRLim.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.LC17RRLim.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.LC17RRLim.FXUVCRITDRAG": { + "value": 0.001151, + "unit": u.W / u.m**2, + }, + "log.initial.LC17RRLim.HREFFLUX": { + "value": 1.799959e20, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.LC17RRLim.XO2": {"value": 0.000000}, + "log.initial.LC17RRLim.XH2O": {"value": 1.000000}, + "log.initial.LC17RRLim.HDiffFlux": { + "value": 4.059461e15, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.LC17RRLim.HRefODragMod": {"value": 0.007752}, "log.initial.LC17RRLim.KTide": {"value": 0.632300}, "log.initial.LC17RRLim.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.initial.LC17Auto.Mass": {"value": 7.584676e24, "unit": u.kg}, @@ -402,6 +486,23 @@ "value": 0.139129, "unit": u.W / u.m**2, }, + "log.initial.LC17Auto.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.LC17Auto.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.LC17Auto.FXUVCRITDRAG": { + "value": 0.001151, + "unit": u.W / u.m**2, + }, + "log.initial.LC17Auto.HREFFLUX": { + "value": 1.799959e20, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.LC17Auto.XO2": {"value": 0.000000}, + "log.initial.LC17Auto.XH2O": {"value": 1.000000}, + "log.initial.LC17Auto.HDiffFlux": { + "value": 4.059461e15, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.LC17Auto.HRefODragMod": {"value": 0.007752}, "log.initial.LC17Auto.KTide": {"value": 0.632300}, "log.initial.LC17Auto.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 3.155760e14, "unit": u.sec, "rtol": 1e-4}, @@ -426,11 +527,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 6.887448e09, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 2.346331e29, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Radius": {"value": 3.221903e08, "unit": u.m, "rtol": 1e-4}, "log.final.star.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -667,6 +763,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.ProxCenELim.CrossoverMass": { + "value": 0.000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.ProxCenELim.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.ProxCenELim.FXUVCRITDRAG": { + "value": 0.119919, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.ProxCenELim.HREFFLUX": { + "value": 6.265011e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.ProxCenELim.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.ProxCenELim.XH2O": {"value": 1.000000, "rtol": 1e-4}, + "log.final.ProxCenELim.HDiffFlux": { + "value": 8.991769e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.ProxCenELim.HRefODragMod": {"value": 0.007752, "rtol": 1e-4}, "log.final.ProxCenELim.KTide": {"value": 0.920286, "rtol": 1e-4}, "log.final.ProxCenELim.RGDuration": { "value": 0.00000e00, @@ -831,6 +951,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.ProxCenRRLim.CrossoverMass": { + "value": 0.000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.ProxCenRRLim.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.ProxCenRRLim.FXUVCRITDRAG": { + "value": 0.119063, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.ProxCenRRLim.HREFFLUX": { + "value": 6.281581e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.ProxCenRRLim.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.ProxCenRRLim.XH2O": {"value": 1.000000, "rtol": 1e-4}, + "log.final.ProxCenRRLim.HDiffFlux": { + "value": 8.949330e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.ProxCenRRLim.HRefODragMod": {"value": 0.007752, "rtol": 1e-4}, "log.final.ProxCenRRLim.KTide": {"value": 0.920099, "rtol": 1e-4}, "log.final.ProxCenRRLim.RGDuration": { "value": 0.00000e00, @@ -991,6 +1135,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.ProxCenAuto.CrossoverMass": { + "value": 0.000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.ProxCenAuto.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.ProxCenAuto.FXUVCRITDRAG": { + "value": 0.119950, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.ProxCenAuto.HREFFLUX": { + "value": 6.264427e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.ProxCenAuto.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.ProxCenAuto.XH2O": {"value": 1.000000, "rtol": 1e-4}, + "log.final.ProxCenAuto.HDiffFlux": { + "value": 8.993271e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.ProxCenAuto.HRefODragMod": {"value": 0.007752, "rtol": 1e-4}, "log.final.ProxCenAuto.KTide": {"value": 0.920292, "rtol": 1e-4}, "log.final.ProxCenAuto.RGDuration": { "value": 0.00000e00, @@ -1139,6 +1307,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.LC17ELim.CrossoverMass": { + "value": 1.175870e-25, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.LC17ELim.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.LC17ELim.FXUVCRITDRAG": { + "value": 0.234853, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.LC17ELim.HREFFLUX": { + "value": 4.901362e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.LC17ELim.XO2": {"value": 0.018014, "rtol": 1e-4}, + "log.final.LC17ELim.XH2O": {"value": 0.981986, "rtol": 1e-4}, + "log.final.LC17ELim.HDiffFlux": { + "value": 1.401989e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.LC17ELim.HRefODragMod": {"value": 0.133128, "rtol": 1e-4}, "log.final.LC17ELim.KTide": {"value": 0.936530, "rtol": 1e-4}, "log.final.LC17ELim.RGDuration": { "value": 0.00000e00, @@ -1291,6 +1483,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.LC17RRLim.CrossoverMass": { + "value": 1.178880e-25, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.LC17RRLim.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.LC17RRLim.FXUVCRITDRAG": { + "value": 0.235341, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.LC17RRLim.HREFFLUX": { + "value": 4.901362e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.LC17RRLim.XO2": {"value": 0.014965, "rtol": 1e-4}, + "log.final.LC17RRLim.XH2O": {"value": 0.985035, "rtol": 1e-4}, + "log.final.LC17RRLim.HDiffFlux": { + "value": 1.404905e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.LC17RRLim.HRefODragMod": {"value": 0.133751, "rtol": 1e-4}, "log.final.LC17RRLim.KTide": {"value": 0.936530, "rtol": 1e-4}, "log.final.LC17RRLim.RGDuration": { "value": 0.00000e00, @@ -1439,6 +1655,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.LC17Auto.CrossoverMass": { + "value": 1.178858e-25, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.LC17Auto.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.LC17Auto.FXUVCRITDRAG": { + "value": 0.235337, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.LC17Auto.HREFFLUX": { + "value": 4.901362e18, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.LC17Auto.XO2": {"value": 0.014987, "rtol": 1e-4}, + "log.final.LC17Auto.XH2O": {"value": 0.985013, "rtol": 1e-4}, + "log.final.LC17Auto.HDiffFlux": { + "value": 1.404884e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.LC17Auto.HRefODragMod": {"value": 0.133747, "rtol": 1e-4}, "log.final.LC17Auto.KTide": {"value": 0.936530, "rtol": 1e-4}, "log.final.LC17Auto.RGDuration": { "value": 0.00000e00, @@ -1447,5 +1687,5 @@ }, } ) -class TestHabEvapCore(Benchmark): +class Test_HabEvapCore(Benchmark): pass diff --git a/tests/AtmescStellar/MiniNeptuneEvapDyn/test_MiniNeptuneEvapDyn.py b/tests/AtmescStellar/MiniNeptuneEvapDyn/test_MiniNeptuneEvapDyn.py index 2e318a4b9..2e9d65022 100644 --- a/tests/AtmescStellar/MiniNeptuneEvapDyn/test_MiniNeptuneEvapDyn.py +++ b/tests/AtmescStellar/MiniNeptuneEvapDyn/test_MiniNeptuneEvapDyn.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -94,6 +93,23 @@ "value": 0.018709, "unit": u.W / u.m**2, }, + "log.initial.planet.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.planet.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.planet.FXUVCRITDRAG": { + "value": 4.123757e-05, + "unit": u.W / u.m**2, + }, + "log.initial.planet.HREFFLUX": { + "value": 2.824302e21, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.planet.XO2": {"value": 0.000000}, + "log.initial.planet.XH2O": {"value": 0.000000}, + "log.initial.planet.HDiffFlux": { + "value": 4.341873e14, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.planet.HRefODragMod": {"value": 1.000000}, "log.initial.planet.KTide": {"value": 1.000000}, "log.initial.planet.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 6.311520e13, "unit": u.sec, "rtol": 1e-4}, @@ -118,11 +134,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 4.328295e09, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Radius": {"value": 1.334689e09, "unit": u.m, "rtol": 1e-4}, "log.final.star.RadGyra": {"value": 0.451302, "rtol": 1e-4}, @@ -331,6 +342,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.planet.CrossoverMass": { + "value": 0.000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.planet.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.planet.FXUVCRITDRAG": { + "value": 4.066770e-05, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.planet.HREFFLUX": { + "value": 1.746834e21, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.planet.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.planet.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.planet.HDiffFlux": { + "value": 4.321780e14, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.planet.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.planet.KTide": {"value": 1.000000, "rtol": 1e-4}, "log.final.planet.RGDuration": { "value": 0.00000e00, @@ -339,5 +374,5 @@ }, } ) -class TestMiniNeptuneEvapDyn(Benchmark): +class Test_MiniNeptuneEvapDyn(Benchmark): pass diff --git a/tests/AtmescStellar/MiniNeptuneEvapLC17/test_MiniNeptuneEvapLC17.py b/tests/AtmescStellar/MiniNeptuneEvapLC17/test_MiniNeptuneEvapLC17.py index e66719547..bafd1d151 100644 --- a/tests/AtmescStellar/MiniNeptuneEvapLC17/test_MiniNeptuneEvapLC17.py +++ b/tests/AtmescStellar/MiniNeptuneEvapLC17/test_MiniNeptuneEvapLC17.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -94,6 +93,20 @@ "value": 2.366968, "unit": u.W / u.m**2, }, + "log.initial.planet.CrossoverMass": {"value": 0.000000, "unit": u.kg}, + "log.initial.planet.WaterEscapeRegime": {"value": 8.000000}, + "log.initial.planet.FXUVCRITDRAG": {"value": 0.009163, "unit": u.W / u.m**2}, + "log.initial.planet.HREFFLUX": { + "value": 1.278604e20, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.planet.XO2": {"value": 0.000000}, + "log.initial.planet.XH2O": {"value": 0.000000}, + "log.initial.planet.HDiffFlux": { + "value": 1.592792e16, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.planet.HRefODragMod": {"value": 1.000000}, "log.initial.planet.KTide": {"value": 0.754594}, "log.initial.planet.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 3.471336e14, "unit": u.sec, "rtol": 1e-4}, @@ -118,11 +131,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 7.123612e10, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Radius": {"value": 6.378100e06, "unit": u.m, "rtol": 1e-4}, "log.final.star.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -331,6 +339,30 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.planet.CrossoverMass": { + "value": 0.000000, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.planet.WaterEscapeRegime": {"value": 8.000000, "rtol": 1e-4}, + "log.final.planet.FXUVCRITDRAG": { + "value": 0.013259, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.planet.HREFFLUX": { + "value": 1.094993e20, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.planet.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.planet.XH2O": {"value": 0.000000, "rtol": 1e-4}, + "log.final.planet.HDiffFlux": { + "value": 2.050727e16, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.planet.HRefODragMod": {"value": 1.000000, "rtol": 1e-4}, "log.final.planet.KTide": {"value": 0.783955, "rtol": 1e-4}, "log.final.planet.RGDuration": { "value": 0.00000e00, @@ -339,5 +371,5 @@ }, } ) -class TestMiniNeptuneEvapLC17(Benchmark): +class Test_MiniNeptuneEvapLC17(Benchmark): pass diff --git a/tests/AtmescStellar/VenusWaterLoss/test_VenusWaterLoss.py b/tests/AtmescStellar/VenusWaterLoss/test_VenusWaterLoss.py index 41a0392e8..3b636d529 100644 --- a/tests/AtmescStellar/VenusWaterLoss/test_VenusWaterLoss.py +++ b/tests/AtmescStellar/VenusWaterLoss/test_VenusWaterLoss.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -91,6 +90,20 @@ "value": 40.876539, "unit": u.W / u.m**2, }, + "log.initial.venus.CrossoverMass": {"value": 3.124418e-26, "unit": u.kg}, + "log.initial.venus.WaterEscapeRegime": {"value": 3.000000}, + "log.initial.venus.FXUVCRITDRAG": {"value": 0.674582, "unit": u.W / u.m**2}, + "log.initial.venus.HREFFLUX": { + "value": 3.072602e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.venus.XO2": {"value": 0.000000}, + "log.initial.venus.XH2O": {"value": 1.000000}, + "log.initial.venus.HDiffFlux": { + "value": 1.142481e17, + "unit": 1 / u.m**2 / u.sec, + }, + "log.initial.venus.HRefODragMod": {"value": 0.441625}, "log.initial.venus.KTide": {"value": 0.991008}, "log.initial.venus.RGDuration": {"value": 0.00000e00, "unit": u.yr}, "log.final.system.Age": {"value": 4.733640e15, "unit": u.sec, "rtol": 1e-4}, @@ -115,11 +128,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 2.608066e13, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.sun.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.sun.Radius": {"value": 98.773624, "unit": u.Rearth, "rtol": 1e-4}, "log.final.sun.RadGyra": {"value": 0.296157, "rtol": 1e-4}, @@ -320,9 +328,33 @@ "unit": u.W / u.m**2, "rtol": 1e-4, }, + "log.final.venus.CrossoverMass": { + "value": 2.912488e-26, + "unit": u.kg, + "rtol": 1e-4, + }, + "log.final.venus.WaterEscapeRegime": {"value": 3.000000, "rtol": 1e-4}, + "log.final.venus.FXUVCRITDRAG": { + "value": 0.594047, + "unit": u.W / u.m**2, + "rtol": 1e-4, + }, + "log.final.venus.HREFFLUX": { + "value": 2.197731e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.venus.XO2": {"value": 0.000000, "rtol": 1e-4}, + "log.final.venus.XH2O": {"value": 1.000000, "rtol": 1e-4}, + "log.final.venus.HDiffFlux": { + "value": 1.142481e17, + "unit": 1 / u.m**2 / u.sec, + "rtol": 1e-4, + }, + "log.final.venus.HRefODragMod": {"value": 0.573196, "rtol": 1e-4}, "log.final.venus.KTide": {"value": 0.991008, "rtol": 1e-4}, "log.final.venus.RGDuration": {"value": 0.00000e00, "unit": u.yr, "rtol": 1e-4}, } ) -class TestVenusWaterLoss(Benchmark): +class Test_VenusWaterLoss(Benchmark): pass diff --git a/tests/Binary/CircumbinaryOrbit/test_CircumbinaryOrbit.py b/tests/Binary/CircumbinaryOrbit/test_CircumbinaryOrbit.py index 2b7874eba..d96625a21 100644 --- a/tests/Binary/CircumbinaryOrbit/test_CircumbinaryOrbit.py +++ b/tests/Binary/CircumbinaryOrbit/test_CircumbinaryOrbit.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -186,7 +185,6 @@ "log.final.system.TotEnergy": {"value": -1.273028e43, "unit": u.Joule}, "log.final.system.PotEnergy": {"value": -1.171413e43, "unit": u.Joule}, "log.final.system.KinEnergy": {"value": 1.071113e34, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 3.155760e07, "unit": u.sec}, "log.final.primary.Mass": {"value": 1.365913e30, "unit": u.kg}, "log.final.primary.Radius": {"value": 6.378100e06, "unit": u.m}, "log.final.primary.RadGyra": {"value": 0.270000}, @@ -345,5 +343,5 @@ "log.final.cbp.BinSecPhi": {"value": 2.974140, "unit": u.rad}, } ) -class TestCircumbinaryOrbit(Benchmark): +class Test_CircumbinaryOrbit(Benchmark): pass diff --git a/tests/BinaryEqtideStellar/STEEP_CBP_CPL/test_STEEP_CBP_CPL.py b/tests/BinaryEqtideStellar/STEEP_CBP_CPL/test_STEEP_CBP_CPL.py index 0893dcb11..84986e5f5 100644 --- a/tests/BinaryEqtideStellar/STEEP_CBP_CPL/test_STEEP_CBP_CPL.py +++ b/tests/BinaryEqtideStellar/STEEP_CBP_CPL/test_STEEP_CBP_CPL.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -365,11 +364,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 4.545895e09, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.primary.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.primary.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.primary.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -624,14 +618,14 @@ }, "log.final.primary.R0": {"value": 0.000000, "unit": u.m, "rtol": 1e-4}, "log.final.primary.CBPInsol": {"value": -1.000000, "rtol": 1e-4}, - "log.final.primary.BinPriR": {"value": 6.421338e09, "unit": u.m, "rtol": 1e-4}, + "log.final.primary.BinPriR": {"value": 6.421344e09, "unit": u.m, "rtol": 1e-4}, "log.final.primary.BinPriPhi": { - "value": -2.915592, + "value": -2.915610, "unit": u.rad, "rtol": 1e-4, }, - "log.final.primary.BinSecR": {"value": 6.421338e09, "unit": u.m, "rtol": 1e-4}, - "log.final.primary.BinSecPhi": {"value": 0.226000, "unit": u.rad, "rtol": 1e-4}, + "log.final.primary.BinSecR": {"value": 6.421344e09, "unit": u.m, "rtol": 1e-4}, + "log.final.primary.BinSecPhi": {"value": 0.225983, "unit": u.rad, "rtol": 1e-4}, "log.final.secondary.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.secondary.Obliquity": { "value": 0.000000, @@ -967,22 +961,22 @@ "log.final.secondary.R0": {"value": 0.000000, "unit": u.m, "rtol": 1e-4}, "log.final.secondary.CBPInsol": {"value": -1.000000, "rtol": 1e-4}, "log.final.secondary.BinPriR": { - "value": 6.421338e09, + "value": 6.421344e09, "unit": u.m, "rtol": 1e-4, }, "log.final.secondary.BinPriPhi": { - "value": -2.915592, + "value": -2.915610, "unit": u.rad, "rtol": 1e-4, }, "log.final.secondary.BinSecR": { - "value": 6.421338e09, + "value": 6.421344e09, "unit": u.m, "rtol": 1e-4, }, "log.final.secondary.BinSecPhi": { - "value": 0.226000, + "value": 0.225983, "unit": u.rad, "rtol": 1e-4, }, @@ -1027,7 +1021,7 @@ "rtol": 1e-4, }, "log.final.cbp.Instellation": { - "value": 6561.097981, + "value": 6561.097947, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1075,15 +1069,15 @@ "log.final.cbp.LL13K0": {"value": 4.787701e-07, "unit": u.sec, "rtol": 1e-4}, "log.final.cbp.LL13V0": {"value": 4.801833e-07, "unit": u.sec, "rtol": 1e-4}, "log.final.cbp.CBPR": {"value": 1.045308e11, "unit": u.m, "rtol": 1e-4}, - "log.final.cbp.CBPZ": {"value": 3.846762e08, "unit": u.m, "rtol": 1e-4}, - "log.final.cbp.CBPPhi": {"value": 0.259277, "unit": u.rad, "rtol": 1e-4}, + "log.final.cbp.CBPZ": {"value": 3.846763e08, "unit": u.m, "rtol": 1e-4}, + "log.final.cbp.CBPPhi": {"value": 0.259278, "unit": u.rad, "rtol": 1e-4}, "log.final.cbp.CBPRDot": { - "value": -1493.596153, + "value": -1493.596117, "unit": u.m / u.sec, "rtol": 1e-4, }, "log.final.cbp.CBPZDot": { - "value": 198.555074, + "value": 198.555026, "unit": u.m / u.sec, "rtol": 1e-4, }, @@ -1094,11 +1088,11 @@ }, "log.final.cbp.R0": {"value": 1.049579e11, "unit": u.m, "rtol": 1e-4}, "log.final.cbp.CBPInsol": {"value": 4.858289, "rtol": 1e-4}, - "log.final.cbp.BinPriR": {"value": 6.421338e09, "unit": u.m, "rtol": 1e-4}, - "log.final.cbp.BinPriPhi": {"value": -2.915592, "unit": u.rad, "rtol": 1e-4}, - "log.final.cbp.BinSecR": {"value": 6.421338e09, "unit": u.m, "rtol": 1e-4}, - "log.final.cbp.BinSecPhi": {"value": 0.226000, "unit": u.rad, "rtol": 1e-4}, + "log.final.cbp.BinPriR": {"value": 6.421344e09, "unit": u.m, "rtol": 1e-4}, + "log.final.cbp.BinPriPhi": {"value": -2.915610, "unit": u.rad, "rtol": 1e-4}, + "log.final.cbp.BinSecR": {"value": 6.421344e09, "unit": u.m, "rtol": 1e-4}, + "log.final.cbp.BinSecPhi": {"value": 0.225983, "unit": u.rad, "rtol": 1e-4}, } ) -class TestSTEEP_CBP_CPL(Benchmark): +class Test_STEEP_CBP_CPL(Benchmark): pass diff --git a/tests/BinaryEqtideStellar/STEEP_CBP_CTL/test_STEEP_CBP_CTL.py b/tests/BinaryEqtideStellar/STEEP_CBP_CTL/test_STEEP_CBP_CTL.py index ede007e61..ec0434676 100644 --- a/tests/BinaryEqtideStellar/STEEP_CBP_CTL/test_STEEP_CBP_CTL.py +++ b/tests/BinaryEqtideStellar/STEEP_CBP_CTL/test_STEEP_CBP_CTL.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -347,11 +346,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 4.390928e09, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.primary.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.primary.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.primary.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -588,14 +582,14 @@ }, "log.final.primary.R0": {"value": 0.000000, "unit": u.m, "rtol": 1e-4}, "log.final.primary.CBPInsol": {"value": -1.000000, "rtol": 1e-4}, - "log.final.primary.BinPriR": {"value": 5.235216e09, "unit": u.m, "rtol": 1e-4}, + "log.final.primary.BinPriR": {"value": 5.235229e09, "unit": u.m, "rtol": 1e-4}, "log.final.primary.BinPriPhi": { - "value": -0.732894, + "value": -0.732909, "unit": u.rad, "rtol": 1e-4, }, - "log.final.primary.BinSecR": {"value": 5.235216e09, "unit": u.m, "rtol": 1e-4}, - "log.final.primary.BinSecPhi": {"value": 2.408699, "unit": u.rad, "rtol": 1e-4}, + "log.final.primary.BinSecR": {"value": 5.235229e09, "unit": u.m, "rtol": 1e-4}, + "log.final.primary.BinSecPhi": {"value": 2.408684, "unit": u.rad, "rtol": 1e-4}, "log.final.secondary.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.secondary.Obliquity": { "value": 0.000000, @@ -905,22 +899,22 @@ "log.final.secondary.R0": {"value": 0.000000, "unit": u.m, "rtol": 1e-4}, "log.final.secondary.CBPInsol": {"value": -1.000000, "rtol": 1e-4}, "log.final.secondary.BinPriR": { - "value": 5.235216e09, + "value": 5.235229e09, "unit": u.m, "rtol": 1e-4, }, "log.final.secondary.BinPriPhi": { - "value": -0.732894, + "value": -0.732909, "unit": u.rad, "rtol": 1e-4, }, "log.final.secondary.BinSecR": { - "value": 5.235216e09, + "value": 5.235229e09, "unit": u.m, "rtol": 1e-4, }, "log.final.secondary.BinSecPhi": { - "value": 2.408699, + "value": 2.408684, "unit": u.rad, "rtol": 1e-4, }, @@ -965,7 +959,7 @@ "rtol": 1e-4, }, "log.final.cbp.Instellation": { - "value": 6612.162975, + "value": 6612.163368, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -980,7 +974,7 @@ "unit": 1 / u.sec, "rtol": 1e-4, }, - "log.final.cbp.OrbPeriod": {"value": 1.309995e07, "unit": u.sec, "rtol": 1e-4}, + "log.final.cbp.OrbPeriod": {"value": 1.309994e07, "unit": u.sec, "rtol": 1e-4}, "log.final.cbp.SemiMajorAxis": { "value": 1.048835e11, "unit": u.m, @@ -997,10 +991,10 @@ "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, - "log.final.cbp.ArgP": {"value": 2.250610, "unit": u.rad, "rtol": 1e-4}, + "log.final.cbp.ArgP": {"value": 2.250609, "unit": u.rad, "rtol": 1e-4}, "log.final.cbp.Inc": {"value": 0.005259, "unit": u.rad, "rtol": 1e-4}, "log.final.cbp.LongA": {"value": 5.841417, "unit": u.rad, "rtol": 1e-4}, - "log.final.cbp.LongP": {"value": 1.808842, "unit": u.rad, "rtol": 1e-4}, + "log.final.cbp.LongP": {"value": 1.808841, "unit": u.rad, "rtol": 1e-4}, "log.final.cbp.TotOrbEnergy": { "value": -9.211934e39, "unit": u.Joule, @@ -1020,12 +1014,12 @@ "log.final.cbp.CBPZ": {"value": -5.638753e08, "unit": u.m, "rtol": 1e-4}, "log.final.cbp.CBPPhi": {"value": 4.232754, "unit": u.rad, "rtol": 1e-4}, "log.final.cbp.CBPRDot": { - "value": 1029.298159, + "value": 1029.297122, "unit": u.m / u.sec, "rtol": 1e-4, }, "log.final.cbp.CBPZDot": { - "value": -15.195432, + "value": -15.195466, "unit": u.m / u.sec, "rtol": 1e-4, }, @@ -1036,11 +1030,11 @@ }, "log.final.cbp.R0": {"value": 1.049579e11, "unit": u.m, "rtol": 1e-4}, "log.final.cbp.CBPInsol": {"value": 4.611149, "rtol": 1e-4}, - "log.final.cbp.BinPriR": {"value": 5.235216e09, "unit": u.m, "rtol": 1e-4}, - "log.final.cbp.BinPriPhi": {"value": -0.732894, "unit": u.rad, "rtol": 1e-4}, - "log.final.cbp.BinSecR": {"value": 5.235216e09, "unit": u.m, "rtol": 1e-4}, - "log.final.cbp.BinSecPhi": {"value": 2.408699, "unit": u.rad, "rtol": 1e-4}, + "log.final.cbp.BinPriR": {"value": 5.235229e09, "unit": u.m, "rtol": 1e-4}, + "log.final.cbp.BinPriPhi": {"value": -0.732909, "unit": u.rad, "rtol": 1e-4}, + "log.final.cbp.BinSecR": {"value": 5.235229e09, "unit": u.m, "rtol": 1e-4}, + "log.final.cbp.BinSecPhi": {"value": 2.408684, "unit": u.rad, "rtol": 1e-4}, } ) -class TestSTEEP_CBP_CTL(Benchmark): +class Test_STEEP_CBP_CTL(Benchmark): pass diff --git a/tests/DistorbDistrot/SSDistOrbDistRot/test_SSDistOrbDistRot.py b/tests/DistorbDistrot/SSDistOrbDistRot/test_SSDistOrbDistRot.py index 04d20e8dc..109866d54 100644 --- a/tests/DistorbDistrot/SSDistOrbDistRot/test_SSDistOrbDistRot.py +++ b/tests/DistorbDistrot/SSDistOrbDistRot/test_SSDistOrbDistRot.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -626,7 +625,6 @@ "log.final.system.TotEnergy": {"value": -7.839546e41, "unit": u.Joule}, "log.final.system.PotEnergy": {"value": -7.839908e41, "unit": u.Joule}, "log.final.system.KinEnergy": {"value": 5.361272e37, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 1.415139e09, "unit": u.sec}, "log.final.sun.Mass": {"value": 1.988416e30, "unit": u.kg}, "log.final.sun.Radius": {"value": 2.019571e08, "unit": u.m}, "log.final.sun.RadGyra": {"value": 0.500000}, @@ -1153,5 +1151,5 @@ "log.final.Neptune.DQincDtDistOrb": {"value": 3.613980e-17, "unit": 1 / u.sec}, } ) -class TestSSDistOrbDistRot(Benchmark): +class Test_SSDistOrbDistRot(Benchmark): pass diff --git a/tests/DistorbDistrotEqtide/CassiniMulti/test_CassiniMulti.py b/tests/DistorbDistrotEqtide/CassiniMulti/test_CassiniMulti.py index 724c5bd45..ee0601098 100644 --- a/tests/DistorbDistrotEqtide/CassiniMulti/test_CassiniMulti.py +++ b/tests/DistorbDistrotEqtide/CassiniMulti/test_CassiniMulti.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -409,11 +408,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 4.628368e04, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.TGstar.Mass": {"value": 1.590733e29, "unit": u.kg, "rtol": 1e-4}, "log.final.TGstar.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.TGstar.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -1320,5 +1314,5 @@ }, } ) -class TestCassiniMulti(Benchmark): +class Test_CassiniMulti(Benchmark): pass diff --git a/tests/DistorbDistrotEqtide/CassiniStates/test_CassiniStates.py b/tests/DistorbDistrotEqtide/CassiniStates/test_CassiniStates.py index c8d805751..0f5ed84dd 100644 --- a/tests/DistorbDistrotEqtide/CassiniStates/test_CassiniStates.py +++ b/tests/DistorbDistrotEqtide/CassiniStates/test_CassiniStates.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -279,7 +278,6 @@ "log.final.system.TotEnergy": {"value": -2.276496e41, "unit": u.Joule}, "log.final.system.PotEnergy": {"value": -2.276504e41, "unit": u.Joule}, "log.final.system.KinEnergy": {"value": 1.103902e36, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 1.139264e07, "unit": u.sec}, "log.final.star.Mass": {"value": 1.988416e30, "unit": u.kg}, "log.final.star.Obliquity": {"value": 0.000000, "unit": u.rad}, "log.final.star.PrecA": {"value": 0.000000, "unit": u.rad}, @@ -525,5 +523,5 @@ "log.final.c.DQincDtDistOrb": {"value": -1.383556e-15, "unit": 1 / u.sec}, } ) -class TestCassiniStates(Benchmark): +class Test_CassiniStates(Benchmark): pass diff --git a/tests/DistorbDistrotPoise/EarthClimate/test_EarthClimate.py b/tests/DistorbDistrotPoise/EarthClimate/test_EarthClimate.py index 395191cd2..be97d9877 100644 --- a/tests/DistorbDistrotPoise/EarthClimate/test_EarthClimate.py +++ b/tests/DistorbDistrotPoise/EarthClimate/test_EarthClimate.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -661,11 +660,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 3.155760e07, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.sun.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.sun.Radius": {"value": 2.019571e08, "unit": u.m, "rtol": 1e-4}, "log.final.sun.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -2135,5 +2129,5 @@ }, } ) -class TestEarthClimate(Benchmark): +class Test_EarthClimate(Benchmark): pass diff --git a/tests/DistorbEqtide/ApseLock/test_ApseLock.py b/tests/DistorbEqtide/ApseLock/test_ApseLock.py index 92314a6c6..ba05eacf9 100644 --- a/tests/DistorbEqtide/ApseLock/test_ApseLock.py +++ b/tests/DistorbEqtide/ApseLock/test_ApseLock.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -351,11 +350,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 8.573338e04, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": {"value": 1.849227e30, "unit": u.kg, "rtol": 1e-4}, "log.final.star.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.star.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -1038,5 +1032,5 @@ }, } ) -class TestApseLock(Benchmark): +class Test_ApseLock(Benchmark): pass diff --git a/tests/Eqtide/IoHeat/test_IoHeat.py b/tests/Eqtide/IoHeat/test_IoHeat.py index 47c437ac2..3cddd1da0 100644 --- a/tests/Eqtide/IoHeat/test_IoHeat.py +++ b/tests/Eqtide/IoHeat/test_IoHeat.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -186,7 +185,7 @@ "log.initial.io.EqRotRateCont": {"value": 4.109421e-05, "unit": 1 / u.sec}, "log.initial.io.EqRotPerCont": {"value": 1.528971e05, "unit": u.sec}, "log.initial.io.EqRotPer": {"value": 1.529215e05, "unit": u.sec}, - "log.initial.io.EqTidePower": {"value": -1.600324e-314, "unit": 1 / u.sec}, + "log.initial.io.EqTidePower": {"value": -0.000000, "unit": 1 / u.sec}, "log.initial.io.GammaRot": {"value": -1.000000, "unit": u.sec}, "log.initial.io.GammaOrb": {"value": -1.000000, "unit": u.sec}, "log.initial.io.OceanK2": {"value": 0.010000}, @@ -203,5 +202,5 @@ }, } ) -class TestIoHeat(Benchmark): +class Test_IoHeat(Benchmark): pass diff --git a/tests/Eqtide/TideLockCPL/test_TideLockCPL.py b/tests/Eqtide/TideLockCPL/test_TideLockCPL.py index 2bb1b53f4..aed690520 100644 --- a/tests/Eqtide/TideLockCPL/test_TideLockCPL.py +++ b/tests/Eqtide/TideLockCPL/test_TideLockCPL.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -160,11 +159,11 @@ "unit": u.kg / u.sec**3, }, "log.initial.d.Mass": {"value": 3.3444241599999997e25, "unit": u.kg}, - "log.initial.d.Obliquity": {"value": 0.4101523742069445, "unit": u.rad}, + "log.initial.d.Obliquity": {"value": 0.4101523742069444, "unit": u.rad}, "log.initial.d.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, "log.initial.d.Xobl": {"value": 0.3987490689144955}, "log.initial.d.Yobl": {"value": 0.0000000000000000}, - "log.initial.d.Zobl": {"value": 0.9170600743897985}, + "log.initial.d.Zobl": {"value": 0.9170600743897986}, "log.initial.d.Radius": {"value": 1.0190569786845941e07, "unit": u.m}, "log.initial.d.RadGyra": {"value": 0.5000000000000000}, "log.initial.d.RotAngMom": { @@ -256,14 +255,14 @@ }, "log.initial.d.DYoblDtEqtide": {"value": 0.0000000000000000, "unit": 1 / u.sec}, "log.initial.d.DZoblDtEqtide": { - "value": -1.2956511188029881e-17, + "value": -1.2956511188029876e-17, "unit": 1 / u.sec, }, "log.initial.d.LockTime": {"value": -1.0000000000000000, "unit": u.sec}, "log.initial.d.BodyDsemiDtEqtide": {"value": -1.0000000000000000}, "log.initial.d.BodyDeccDt": {"value": -1.0000000000000000}, "log.initial.d.DOblDtEqtide": { - "value": 3.2492893897661155e-17, + "value": 3.2492893897661149e-17, "unit": u.rad / u.sec, }, "log.initial.d.DRotPerDtEqtide": {"value": 2.9330699849868684e-11}, @@ -285,10 +284,7 @@ }, "log.initial.d.EqRotPerCont": {"value": 2.4402210592177450e06, "unit": u.sec}, "log.initial.d.EqRotPer": {"value": 3.8584775388350980e06, "unit": u.sec}, - "log.initial.d.EqTidePower": { - "value": 7.2762727727987500e-310, - "unit": 1 / u.sec, - }, + "log.initial.d.EqTidePower": {"value": 0.0000000000000000, "unit": 1 / u.sec}, "log.initial.d.GammaRot": {"value": -1.0000000000000000, "unit": u.sec}, "log.initial.d.GammaOrb": {"value": -1.0000000000000000, "unit": u.sec}, "log.initial.d.OceanK2": {"value": 0.0100000000000000}, @@ -318,7 +314,6 @@ "unit": u.Joule, }, "log.final.system.KinEnergy": {"value": 1.7636110753935293e33, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 6.7720171673819739e11, "unit": u.sec}, "log.final.gl581.Mass": {"value": 6.1640895999999998e29, "unit": u.kg}, "log.final.gl581.Obliquity": {"value": 0.0000000000000000, "unit": u.rad}, "log.final.gl581.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, @@ -434,11 +429,11 @@ "unit": u.kg / u.sec**3, }, "log.final.d.Mass": {"value": 3.3444241599999997e25, "unit": u.kg}, - "log.final.d.Obliquity": {"value": 0.3288131817722898, "unit": u.rad}, + "log.final.d.Obliquity": {"value": 0.3288131817722896, "unit": u.rad}, "log.final.d.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, - "log.final.d.Xobl": {"value": 0.3229200843552366}, + "log.final.d.Xobl": {"value": 0.3229200843552365}, "log.final.d.Yobl": {"value": 0.0000000000000000}, - "log.final.d.Zobl": {"value": 0.9464264455249324}, + "log.final.d.Zobl": {"value": 0.9464264455249325}, "log.final.d.Radius": {"value": 1.0190569786845941e07, "unit": u.m}, "log.final.d.RadGyra": {"value": 0.5000000000000000}, "log.final.d.RotAngMom": { @@ -496,7 +491,7 @@ "log.final.d.LostEnergy": {"value": 2.2047728231388356e30, "unit": u.Joule}, "log.final.d.TidalRadius": {"value": 1.0190569786845941e07, "unit": u.m}, "log.final.d.DsemiDtEqtide": { - "value": -1.9341295712977497e-11, + "value": -1.9341295712977494e-11, "unit": u.m / u.sec, }, "log.final.d.DeccDtEqtide": { @@ -504,31 +499,31 @@ "unit": 1 / u.sec, }, "log.final.d.DMeanMotionDtEqtide": { - "value": 9.6366864093756151e-28, + "value": 9.6366864093756133e-28, "unit": 1 / u.sec**2, }, - "log.final.d.DOrbPerDtEqtide": {"value": -5.1376881622162712e-15}, + "log.final.d.DOrbPerDtEqtide": {"value": -5.1376881622162704e-15}, "log.final.d.EccTimeEqtide": {"value": 2.7407372728149895e21, "unit": u.sec}, - "log.final.d.SemiTimeEqtide": {"value": 1.6897928164056302e21, "unit": u.sec}, + "log.final.d.SemiTimeEqtide": {"value": 1.6897928164056307e21, "unit": u.sec}, "log.final.d.DHEccDtEqtide": {"value": -0.0000000000000000, "unit": 1 / u.sec}, "log.final.d.DKEccDtEqtide": { "value": -1.3864931530303800e-22, "unit": 1 / u.sec, }, "log.final.d.DXoblDtEqtide": { - "value": -1.1121550382088371e-15, + "value": -1.1121550382088367e-15, "unit": 1 / u.sec, }, "log.final.d.DYoblDtEqtide": {"value": 0.0000000000000000, "unit": 1 / u.sec}, "log.final.d.DZoblDtEqtide": { - "value": 3.7946657181087617e-16, + "value": 3.7946657181087587e-16, "unit": 1 / u.sec, }, "log.final.d.LockTime": {"value": 2.8873488943231490e15, "unit": u.sec}, "log.final.d.BodyDsemiDtEqtide": {"value": -1.0000000000000000}, "log.final.d.BodyDeccDt": {"value": -1.0000000000000000}, "log.final.d.DOblDtEqtide": { - "value": -1.1751100834114218e-15, + "value": -1.1751100834114214e-15, "unit": u.rad / u.sec, }, "log.final.d.DRotPerDtEqtide": {"value": -1.3180805030182819e-296}, @@ -547,10 +542,7 @@ }, "log.final.d.EqRotPerCont": {"value": 2.4402262612929139e06, "unit": u.sec}, "log.final.d.EqRotPer": {"value": 3.8585015775312437e06, "unit": u.sec}, - "log.final.d.EqTidePower": { - "value": 7.2763608177238376e-310, - "unit": 1 / u.sec, - }, + "log.final.d.EqTidePower": {"value": 0.0000000000000000, "unit": 1 / u.sec}, "log.final.d.GammaRot": {"value": -1.0000000000000000, "unit": u.sec}, "log.final.d.GammaOrb": {"value": -1.0000000000000000, "unit": u.sec}, "log.final.d.OceanK2": {"value": 0.0100000000000000}, @@ -560,12 +552,12 @@ "log.final.d.RotTimeEqtide": {"value": 2.9273641243426581e302, "unit": u.sec}, "log.final.d.EnvK2": {"value": 0.0100000000000000}, "log.final.d.OblTimeEqtide": {"value": -1.0000000000000000}, - "log.final.d.PowerEqtide": {"value": 3.7483793016212109e12, "unit": u.W}, + "log.final.d.PowerEqtide": {"value": 3.7483793016212100e12, "unit": u.W}, "log.final.d.SurfEnFluxEqtide": { "value": 0.0028723458591997, "unit": u.kg / u.sec**3, }, } ) -class TestTideLockCPL(Benchmark): +class Test_TideLockCPL(Benchmark): pass diff --git a/tests/Eqtide/TideLockCTL/test_TideLockCTL.py b/tests/Eqtide/TideLockCTL/test_TideLockCTL.py index 026bb5c62..d23c5be5e 100644 --- a/tests/Eqtide/TideLockCTL/test_TideLockCTL.py +++ b/tests/Eqtide/TideLockCTL/test_TideLockCTL.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -142,11 +141,11 @@ "unit": u.kg / u.sec**3, }, "log.initial.d.Mass": {"value": 3.3444241599999997e25, "unit": u.kg}, - "log.initial.d.Obliquity": {"value": 0.4101523742069445, "unit": u.rad}, + "log.initial.d.Obliquity": {"value": 0.4101523742069444, "unit": u.rad}, "log.initial.d.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, "log.initial.d.Xobl": {"value": 0.3987490689144955}, "log.initial.d.Yobl": {"value": 0.0000000000000000}, - "log.initial.d.Zobl": {"value": 0.9170600743897985}, + "log.initial.d.Zobl": {"value": 0.9170600743897986}, "log.initial.d.Radius": {"value": 1.0190569786845941e07, "unit": u.m}, "log.initial.d.RadGyra": {"value": 0.5000000000000000}, "log.initial.d.RotAngMom": { @@ -216,7 +215,7 @@ "unit": u.m / u.sec, }, "log.initial.d.DeccDtEqtide": { - "value": 1.2001735209303158e-20, + "value": 1.2001735209303161e-20, "unit": 1 / u.sec, }, "log.initial.d.DMeanMotionDtEqtide": { @@ -224,11 +223,11 @@ "unit": 1 / u.sec**2, }, "log.initial.d.DOrbPerDtEqtide": {"value": 2.1190495536733452e-13}, - "log.initial.d.EccTimeEqtide": {"value": 3.1662088304151437e19, "unit": u.sec}, + "log.initial.d.EccTimeEqtide": {"value": 3.1662088304151429e19, "unit": u.sec}, "log.initial.d.SemiTimeEqtide": {"value": 4.0969190396371681e19, "unit": u.sec}, "log.initial.d.DHEccDtEqtide": {"value": 0.0000000000000000, "unit": 1 / u.sec}, "log.initial.d.DKEccDtEqtide": { - "value": 1.2001735209303158e-20, + "value": 1.2001735209303161e-20, "unit": 1 / u.sec, }, "log.initial.d.DXoblDtEqtide": { @@ -237,32 +236,32 @@ }, "log.initial.d.DYoblDtEqtide": {"value": 0.0000000000000000, "unit": 1 / u.sec}, "log.initial.d.DZoblDtEqtide": { - "value": -3.0037795340759649e-16, + "value": -3.0037795340759644e-16, "unit": 1 / u.sec, }, "log.initial.d.LockTime": {"value": -1.0000000000000000, "unit": u.sec}, "log.initial.d.BodyDsemiDtEqtide": {"value": -1.0000000000000000}, "log.initial.d.BodyDeccDt": {"value": -1.0000000000000000}, "log.initial.d.DOblDtEqtide": { - "value": 7.5330070168015126e-16, + "value": 7.5330070168015116e-16, "unit": u.rad / u.sec, }, - "log.initial.d.DRotPerDtEqtide": {"value": 3.3960621583699772e-10}, + "log.initial.d.DRotPerDtEqtide": {"value": 3.3960621583699787e-10}, "log.initial.d.DRotRateDtEqtide": { - "value": -2.8584329796460842e-19, + "value": -2.8584329796460852e-19, "unit": 1 / u.sec**2, }, - "log.initial.d.EqRotPer": {"value": 3.0098413956196331e06, "unit": u.sec}, + "log.initial.d.EqRotPer": {"value": 3.0098413956196341e06, "unit": u.sec}, "log.initial.d.EqTidePower": {"value": -1.0000000000000000, "unit": 1 / u.sec}, "log.initial.d.OceanK2": {"value": 0.0100000000000000}, "log.initial.d.EnvTidalQ": {"value": -1.0000000000000000}, "log.initial.d.OceanTidalQ": {"value": -1.0000000000000000}, "log.initial.d.TidalTau": {"value": 638.0000000000000000, "unit": u.sec}, "log.initial.d.TideLock": {"value": 0.0000000000000000}, - "log.initial.d.RotTimeEqtide": {"value": 2.5441230451880125e14, "unit": u.sec}, + "log.initial.d.RotTimeEqtide": {"value": 2.5441230451880116e14, "unit": u.sec}, "log.initial.d.EnvK2": {"value": 0.0100000000000000}, "log.initial.d.OblTimeEqtide": {"value": -1.0000000000000000}, - "log.initial.d.PowerEqtide": {"value": 1.7535174955124216e16, "unit": u.W}, + "log.initial.d.PowerEqtide": {"value": 1.7535174955124218e16, "unit": u.W}, "log.initial.d.SurfEnFluxEqtide": { "value": 13.4370305456838217, "unit": u.kg / u.sec**3, @@ -282,7 +281,6 @@ "unit": u.Joule, }, "log.final.system.KinEnergy": {"value": 1.7636110755774171e33, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 4.4635926449787836e11, "unit": u.sec}, "log.final.gl581.Mass": {"value": 6.1640895999999998e29, "unit": u.kg}, "log.final.gl581.Obliquity": {"value": 0.0000000000000000, "unit": u.rad}, "log.final.gl581.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, @@ -351,7 +349,7 @@ "unit": u.Joule, }, "log.final.gl581.OrbPotEnergy": {"value": -1.0000000000000000, "unit": u.Joule}, - "log.final.gl581.LostEnergy": {"value": 6.0975289728579189e23, "unit": u.Joule}, + "log.final.gl581.LostEnergy": {"value": 6.0975289728579176e23, "unit": u.Joule}, "log.final.gl581.LockTime": {"value": -1.0000000000000000, "unit": u.sec}, "log.final.gl581.BodyDsemiDtEqtide": {"value": -1.0000000000000000}, "log.final.gl581.BodyDeccDt": {"value": -1.0000000000000000}, @@ -386,11 +384,11 @@ "unit": u.kg / u.sec**3, }, "log.final.d.Mass": {"value": 3.3444241599999997e25, "unit": u.kg}, - "log.final.d.Obliquity": {"value": 0.0133141672841390, "unit": u.rad}, + "log.final.d.Obliquity": {"value": 0.0133141672841391, "unit": u.rad}, "log.final.d.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, "log.final.d.Xobl": {"value": 0.0133137739309212}, "log.final.d.Yobl": {"value": 0.0000000000000000}, - "log.final.d.Zobl": {"value": 0.9999113680711937}, + "log.final.d.Zobl": {"value": 0.9999113680711940}, "log.final.d.Radius": {"value": 1.0190569786845941e07, "unit": u.m}, "log.final.d.RadGyra": {"value": 0.5000000000000000}, "log.final.d.RotAngMom": { @@ -444,7 +442,7 @@ "log.final.d.LongP": {"value": 0.0000000000000000, "unit": u.rad}, "log.final.d.TotOrbEnergy": {"value": -2.1049668641216730e34, "unit": u.Joule}, "log.final.d.OrbPotEnergy": {"value": -4.2099337282433460e34, "unit": u.Joule}, - "log.final.d.LostEnergy": {"value": 2.1855604508345265e30, "unit": u.Joule}, + "log.final.d.LostEnergy": {"value": 2.1855604508345268e30, "unit": u.Joule}, "log.final.d.TidalRadius": {"value": 1.0190569786845941e07, "unit": u.m}, "log.final.d.DsemiDtEqtide": { "value": -4.4551229434587589e-12, @@ -467,19 +465,19 @@ "unit": 1 / u.sec, }, "log.final.d.DXoblDtEqtide": { - "value": -2.9265157775333850e-17, + "value": -2.9265157775333874e-17, "unit": 1 / u.sec, }, "log.final.d.DYoblDtEqtide": {"value": 0.0000000000000000, "unit": 1 / u.sec}, "log.final.d.DZoblDtEqtide": { - "value": 3.8966423136594794e-19, + "value": 3.8966423136594857e-19, "unit": 1 / u.sec, }, "log.final.d.LockTime": {"value": 2.1482696656454892e15, "unit": u.sec}, "log.final.d.BodyDsemiDtEqtide": {"value": -1.0000000000000000}, "log.final.d.BodyDeccDt": {"value": -1.0000000000000000}, "log.final.d.DOblDtEqtide": { - "value": -2.9267751841034685e-17, + "value": -2.9267751841034710e-17, "unit": u.rad / u.sec, }, "log.final.d.DRotPerDtEqtide": {"value": -7.9605163347943121e-297}, @@ -504,5 +502,5 @@ }, } ) -class TestTideLockCTL(Benchmark): +class Test_TideLockCTL(Benchmark): pass diff --git a/tests/EqtidePoise/CPL_POISE/test_CPL_POISE.py b/tests/EqtidePoise/CPL_POISE/test_CPL_POISE.py index 6fa1033ba..149dd323b 100644 --- a/tests/EqtidePoise/CPL_POISE/test_CPL_POISE.py +++ b/tests/EqtidePoise/CPL_POISE/test_CPL_POISE.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -186,11 +185,11 @@ "log.initial.gl514.RossbyNumber": {"value": 0.6873965284599931}, "log.initial.gl514.DRotPerDtStellar": {"value": 2.3504479341501690e-10}, "log.initial.gl514b.Mass": {"value": 3.1053088098643201e25, "unit": u.kg}, - "log.initial.gl514b.Obliquity": {"value": 0.4101523742069445, "unit": u.rad}, + "log.initial.gl514b.Obliquity": {"value": 0.4101523742069444, "unit": u.rad}, "log.initial.gl514b.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, "log.initial.gl514b.Xobl": {"value": 0.3987490689144955}, "log.initial.gl514b.Yobl": {"value": 0.0000000000000000}, - "log.initial.gl514b.Zobl": {"value": 0.9170600743897985}, + "log.initial.gl514b.Zobl": {"value": 0.9170600743897986}, "log.initial.gl514b.Radius": {"value": 1.3394010000000000e07, "unit": u.m}, "log.initial.gl514b.RadGyra": {"value": 0.5000000000000000}, "log.initial.gl514b.RotAngMom": { @@ -330,14 +329,14 @@ "unit": 1 / u.sec, }, "log.initial.gl514b.DZoblDtEqtide": { - "value": -1.3757926086469334e-17, + "value": -1.3757926086469330e-17, "unit": 1 / u.sec, }, "log.initial.gl514b.LockTime": {"value": -1.0000000000000000, "unit": u.sec}, "log.initial.gl514b.BodyDsemiDtEqtide": {"value": -1.0000000000000000}, "log.initial.gl514b.BodyDeccDt": {"value": -1.0000000000000000}, "log.initial.gl514b.DOblDtEqtide": { - "value": 3.4502716517739303e-17, + "value": 3.4502716517739296e-17, "unit": u.rad / u.sec, }, "log.initial.gl514b.DRotPerDtEqtide": {"value": 3.7660240995856781e-11}, @@ -383,7 +382,7 @@ "value": 1.4096431035620620, "unit": u.kg / u.sec**3, }, - "log.initial.gl514b.TGlobal": {"value": 676.2679353212223532, "unit": u.sec}, + "log.initial.gl514b.TGlobal": {"value": 676.2679353212224669, "unit": u.sec}, "log.initial.gl514b.AlbedoGlobal": {"value": 0.2996778493802214}, "log.initial.gl514b.FluxInGlobal": { "value": 1046.1316028565233864, @@ -399,26 +398,26 @@ "log.initial.gl514b.SkipSeas": {"value": 0.0000000000000000}, "log.initial.gl514b.AreaIceCov": {"value": 0.0000000000000000}, "log.initial.gl514b.Latitude": {"value": -1.4552620265106593, "unit": u.rad}, - "log.initial.gl514b.TempLat": {"value": 557.2247797713517912, "unit": u.sec}, + "log.initial.gl514b.TempLat": {"value": 557.2247797713516775, "unit": u.sec}, "log.initial.gl514b.AlbedoLat": {"value": 0.3675649878041329}, "log.initial.gl514b.AnnInsol": { - "value": 755.3407450595735781, + "value": 755.3407450595734645, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.FluxMerid": { - "value": -2.0352457824211096e16, + "value": -2.0352457824211124e16, "unit": u.Joule, }, "log.initial.gl514b.FluxIn": { - "value": 486.1623336259239636, + "value": 486.1623336259239068, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.FluxOut": { - "value": 797.3297897221252697, + "value": 797.3297897221251560, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.DivFlux": { - "value": -311.1690738881308107, + "value": -311.1690738881313223, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.IceMass": {"value": 0.0000000000000000}, @@ -426,11 +425,11 @@ "log.initial.gl514b.DIceMassDt": {"value": 0.0000000000000000, "unit": u.m}, "log.initial.gl514b.IceFlow": {"value": 0.0000000000000000}, "log.initial.gl514b.EnergyResL": { - "value": -4.7634785005357116e-11, + "value": -4.0699887904338539e-11, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.EnergyResW": { - "value": 4.0836312109604478e-10, + "value": 4.9863047024700791e-10, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.BedrockH": {"value": 0.0000000000000000, "unit": u.m}, @@ -444,14 +443,14 @@ }, "log.initial.gl514b.AlbedoLandLat": {"value": 0.4335649878041328}, "log.initial.gl514b.AlbedoWaterLat": {"value": 0.3335649878041328}, - "log.initial.gl514b.TempMinLat": {"value": 520.6583069986143073, "unit": u.sec}, + "log.initial.gl514b.TempMinLat": {"value": 520.6583069986141936, "unit": u.sec}, "log.initial.gl514b.TempMaxLat": {"value": 598.1727520370602633, "unit": u.sec}, "log.initial.gl514b.Snowball": {"value": 0.0000000000000000}, "log.initial.gl514b.PlanckBAvg": {"value": 2.0899999999999990}, "log.initial.gl514b.IceAccum": {"value": 0.0000000000000000}, "log.initial.gl514b.IceAblate": {"value": 0.0000000000000000}, "log.initial.gl514b.TempMaxLand": { - "value": 657.9976852023412448, + "value": 657.9976852023411311, "unit": u.sec, }, "log.initial.gl514b.TempMaxWater": { @@ -459,7 +458,7 @@ "unit": u.sec, }, "log.initial.gl514b.PeakInsol": { - "value": 4243.8792145061070187, + "value": 4243.8792145061061092, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.IceCapNorthLand": {"value": 0.0000000000000000}, @@ -533,11 +532,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 3.1557600000000000e07, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.gl514.Mass": { "value": 1.0140921600000001e30, "unit": u.kg, @@ -594,7 +588,7 @@ "rtol": 1e-4, }, "log.final.gl514.SurfEnFluxTotal": { - "value": 5.6927005606372488e-10, + "value": 5.6927005606372457e-10, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -719,36 +713,36 @@ "rtol": 1e-4, }, "log.final.gl514.DRotPerDtEqtide": { - "value": 2.3670446957670796e-20, + "value": 2.3670446957670787e-20, "rtol": 1e-4, }, "log.final.gl514.DRotRateDtEqtide": { - "value": -2.1346978387082101e-32, + "value": -2.1346978387082093e-32, "unit": 1 / u.sec**2, "rtol": 1e-4, }, "log.final.gl514.EqRotRateDiscrete": { - "value": 7.7800437205928774e-07, + "value": 7.7800437205928784e-07, "unit": 1 / u.sec, "rtol": 1e-4, }, "log.final.gl514.EqRotPerDiscrete": { - "value": 8.0760282754564993e06, + "value": 8.0760282754564984e06, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514.EqRotRateCont": { - "value": 1.5164601885389766e-06, + "value": 1.5164601885389768e-06, "unit": 1 / u.sec, "rtol": 1e-4, }, "log.final.gl514.EqRotPerCont": { - "value": 4.1433236128889602e06, + "value": 4.1433236128889597e06, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514.EqRotPer": { - "value": 4.1433236128889602e06, + "value": 4.1433236128889597e06, "unit": u.sec, "rtol": 1e-4, }, @@ -772,19 +766,19 @@ "log.final.gl514.OceanTidalQ": {"value": -1.0000000000000000, "rtol": 1e-4}, "log.final.gl514.TideLock": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514.RotTimeEqtide": { - "value": 1.1151120264596733e26, + "value": 1.1151120264596737e26, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514.EnvK2": {"value": 0.0100000000000000, "rtol": 1e-4}, "log.final.gl514.OblTimeEqtide": {"value": -1.0000000000000000, "rtol": 1e-4}, "log.final.gl514.PowerEqtide": { - "value": 1.2346074026431728e10, + "value": 1.2346074026431721e10, "unit": u.W, "rtol": 1e-4, }, "log.final.gl514.SurfEnFluxEqtide": { - "value": 5.6927005606372488e-10, + "value": 5.6927005606372457e-10, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -826,7 +820,7 @@ }, "log.final.gl514b.Xobl": {"value": 0.3987490699130116, "rtol": 1e-4}, "log.final.gl514b.Yobl": {"value": 0.0000000000000000, "rtol": 1e-4}, - "log.final.gl514b.Zobl": {"value": 0.9170600739556314, "rtol": 1e-4}, + "log.final.gl514b.Zobl": {"value": 0.9170600739556315, "rtol": 1e-4}, "log.final.gl514b.Radius": { "value": 1.3394010000000000e07, "unit": u.m, @@ -865,7 +859,7 @@ "rtol": 1e-4, }, "log.final.gl514b.SurfEnFluxTotal": { - "value": 1.4096430839727192, + "value": 1.4096430839727183, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -919,7 +913,7 @@ "rtol": 1e-4, }, "log.final.gl514b.MeanMotion": { - "value": 5.1866958137285849e-07, + "value": 5.1866958137285860e-07, "unit": 1 / u.sec, "rtol": 1e-4, }, @@ -970,31 +964,31 @@ "rtol": 1e-4, }, "log.final.gl514b.DsemiDtEqtide": { - "value": 1.2351242905112557e-10, + "value": 1.2351242905112555e-10, "unit": u.m / u.sec, "rtol": 1e-4, }, "log.final.gl514b.DeccDtEqtide": { - "value": 5.8376560316535877e-22, + "value": 5.8376560316535848e-22, "unit": 1 / u.sec, "rtol": 1e-4, }, "log.final.gl514b.DMeanMotionDtEqtide": { - "value": -1.5221408360256703e-27, + "value": -1.5221408360256705e-27, "unit": 1 / u.sec**2, "rtol": 1e-4, }, "log.final.gl514b.DOrbPerDtEqtide": { - "value": 3.5551108660833406e-14, + "value": 3.5551108660833393e-14, "rtol": 1e-4, }, "log.final.gl514b.EccTimeEqtide": { - "value": 7.7085733993229202e20, + "value": 7.7085733993229242e20, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.SemiTimeEqtide": { - "value": 5.1112509016620781e20, + "value": 5.1112509016620787e20, "unit": u.sec, "rtol": 1e-4, }, @@ -1004,12 +998,12 @@ "rtol": 1e-4, }, "log.final.gl514b.DKEccDtEqtide": { - "value": 5.8376560316535877e-22, + "value": 5.8376560316535848e-22, "unit": 1 / u.sec, "rtol": 1e-4, }, "log.final.gl514b.DXoblDtEqtide": { - "value": 3.1641064275885809e-17, + "value": 3.1641064275885797e-17, "unit": 1 / u.sec, "rtol": 1e-4, }, @@ -1019,7 +1013,7 @@ "rtol": 1e-4, }, "log.final.gl514b.DZoblDtEqtide": { - "value": -1.3757926344613390e-17, + "value": -1.3757926344613379e-17, "unit": 1 / u.sec, "rtol": 1e-4, }, @@ -1034,41 +1028,41 @@ }, "log.final.gl514b.BodyDeccDt": {"value": -1.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.DOblDtEqtide": { - "value": 3.4502717078725040e-17, + "value": 3.4502717078725021e-17, "unit": u.rad / u.sec, "rtol": 1e-4, }, "log.final.gl514b.DRotPerDtEqtide": { - "value": 3.7660242031908298e-11, + "value": 3.7660242031908285e-11, "rtol": 1e-4, }, "log.final.gl514b.DRotRateDtEqtide": { - "value": -3.1698264008103682e-20, + "value": -3.1698264008103670e-20, "unit": 1 / u.sec**2, "rtol": 1e-4, }, "log.final.gl514b.EqRotRateDiscrete": { - "value": 7.7800437205928774e-07, + "value": 7.7800437205928784e-07, "unit": 1 / u.sec, "rtol": 1e-4, }, "log.final.gl514b.EqRotPerDiscrete": { - "value": 8.0760282754564993e06, + "value": 8.0760282754564984e06, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.EqRotRateCont": { - "value": 1.5164601885389766e-06, + "value": 1.5164601885389768e-06, "unit": 1 / u.sec, "rtol": 1e-4, }, "log.final.gl514b.EqRotPerCont": { - "value": 4.1433236128889602e06, + "value": 4.1433236128889597e06, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.EqRotPer": { - "value": 4.1433236128889602e06, + "value": 4.1433236128889597e06, "unit": u.sec, "rtol": 1e-4, }, @@ -1092,24 +1086,24 @@ "log.final.gl514b.OceanTidalQ": {"value": -1.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.TideLock": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.RotTimeEqtide": { - "value": 2.2941966521421430e15, + "value": 2.2941966521421440e15, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.EnvK2": {"value": 0.0100000000000000, "rtol": 1e-4}, "log.final.gl514b.OblTimeEqtide": {"value": -1.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.PowerEqtide": { - "value": 3.1779002901179495e15, + "value": 3.1779002901179475e15, "unit": u.W, "rtol": 1e-4, }, "log.final.gl514b.SurfEnFluxEqtide": { - "value": 1.4096430839727192, + "value": 1.4096430839727183, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, "log.final.gl514b.TGlobal": { - "value": 676.2684488390327715, + "value": 676.2684488390486877, "unit": u.sec, "rtol": 1e-4, }, @@ -1120,7 +1114,7 @@ "rtol": 1e-4, }, "log.final.gl514b.FluxOutGlobal": { - "value": 1046.1310580735782878, + "value": 1046.1310580736117117, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1147,7 +1141,7 @@ "rtol": 1e-4, }, "log.final.gl514b.TempLat": { - "value": 557.2252934226596608, + "value": 557.2252934226637535, "unit": u.sec, "rtol": 1e-4, }, @@ -1158,22 +1152,22 @@ "rtol": 1e-4, }, "log.final.gl514b.FluxMerid": { - "value": -2.0352457779997064e16, + "value": -2.0352457779998284e16, "unit": u.Joule, "rtol": 1e-4, }, "log.final.gl514b.FluxIn": { - "value": 486.1623348490650187, + "value": 486.1623348490649050, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, "log.final.gl514b.FluxOut": { - "value": 797.3308632533586433, + "value": 797.3308632533672835, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, "log.final.gl514b.DivFlux": { - "value": -311.1690732121418819, + "value": -311.1690732121606970, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1190,12 +1184,12 @@ }, "log.final.gl514b.IceFlow": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.EnergyResL": { - "value": 7.9239725891966373e-11, + "value": 7.6965989137534052e-11, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, "log.final.gl514b.EnergyResW": { - "value": 6.8553163146134466e-11, + "value": 8.5833562479820102e-11, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1205,24 +1199,24 @@ "rtol": 1e-4, }, "log.final.gl514b.TempLandLat": { - "value": 545.8665750487834885, + "value": 545.8665750487864443, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.TempWaterLat": { - "value": 563.0767544031414218, + "value": 563.0767544031458556, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.AlbedoLandLat": {"value": 0.4335649877648788, "rtol": 1e-4}, "log.final.gl514b.AlbedoWaterLat": {"value": 0.3335649877648789, "rtol": 1e-4}, "log.final.gl514b.TempMinLat": { - "value": 520.6587997956662548, + "value": 520.6587997956706886, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.TempMaxLat": { - "value": 598.1732888468328611, + "value": 598.1732888468366127, "unit": u.sec, "rtol": 1e-4, }, @@ -1231,17 +1225,17 @@ "log.final.gl514b.IceAccum": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.IceAblate": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.TempMaxLand": { - "value": 657.9980332140321480, + "value": 657.9980332140348764, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.TempMaxWater": { - "value": 568.6092758126177387, + "value": 568.6092758126221725, "unit": u.sec, "rtol": 1e-4, }, "log.final.gl514b.PeakInsol": { - "value": 4243.8792251330132785, + "value": 4243.8792251330123690, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1296,5 +1290,5 @@ }, } ) -class TestCPL_POISE(Benchmark): +class Test_CPL_POISE(Benchmark): pass diff --git a/tests/EqtidePoise/CTL_POISE/test_CTL_POISE.py b/tests/EqtidePoise/CTL_POISE/test_CTL_POISE.py index 9e54caae2..0ee483a6e 100644 --- a/tests/EqtidePoise/CTL_POISE/test_CTL_POISE.py +++ b/tests/EqtidePoise/CTL_POISE/test_CTL_POISE.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -168,11 +167,11 @@ "log.initial.gl514.RossbyNumber": {"value": 0.6873965284599931}, "log.initial.gl514.DRotPerDtStellar": {"value": 2.3504479341501690e-10}, "log.initial.gl514b.Mass": {"value": 3.1053088098643201e25, "unit": u.kg}, - "log.initial.gl514b.Obliquity": {"value": 0.4101523742069445, "unit": u.rad}, + "log.initial.gl514b.Obliquity": {"value": 0.4101523742069444, "unit": u.rad}, "log.initial.gl514b.PrecA": {"value": 0.0000000000000000, "unit": u.rad}, "log.initial.gl514b.Xobl": {"value": 0.3987490689144955}, "log.initial.gl514b.Yobl": {"value": 0.0000000000000000}, - "log.initial.gl514b.Zobl": {"value": 0.9170600743897985}, + "log.initial.gl514b.Zobl": {"value": 0.9170600743897986}, "log.initial.gl514b.Radius": {"value": 1.3394010000000000e07, "unit": u.m}, "log.initial.gl514b.RadGyra": {"value": 0.5000000000000000}, "log.initial.gl514b.RotAngMom": { @@ -198,7 +197,7 @@ "unit": u.kg / u.m**3, }, "log.initial.gl514b.SurfEnFluxTotal": { - "value": 2.5164492816849116, + "value": 2.5164492816849120, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.ImK2": {"value": -0.0250000000000000}, @@ -274,7 +273,7 @@ }, "log.initial.gl514b.TidalRadius": {"value": 1.3394010000000000e07, "unit": u.m}, "log.initial.gl514b.DsemiDtEqtide": { - "value": 3.6833472670881283e-10, + "value": 3.6833472670881294e-10, "unit": u.m / u.sec, }, "log.initial.gl514b.DeccDtEqtide": { @@ -282,16 +281,16 @@ "unit": 1 / u.sec, }, "log.initial.gl514b.DMeanMotionDtEqtide": { - "value": -4.5392786228651742e-27, + "value": -4.5392786228651756e-27, "unit": 1 / u.sec**2, }, - "log.initial.gl514b.DOrbPerDtEqtide": {"value": 1.0601935362604418e-13}, + "log.initial.gl514b.DOrbPerDtEqtide": {"value": 1.0601935362604420e-13}, "log.initial.gl514b.EccTimeEqtide": { "value": 1.6483819592430168e20, "unit": u.sec, }, "log.initial.gl514b.SemiTimeEqtide": { - "value": 1.7139383516588075e20, + "value": 1.7139383516588071e20, "unit": u.sec, }, "log.initial.gl514b.DHEccDtEqtide": { @@ -303,7 +302,7 @@ "unit": 1 / u.sec, }, "log.initial.gl514b.DXoblDtEqtide": { - "value": 1.3978299777162946e-16, + "value": 1.3978299777162944e-16, "unit": 1 / u.sec, }, "log.initial.gl514b.DYoblDtEqtide": { @@ -311,22 +310,22 @@ "unit": 1 / u.sec, }, "log.initial.gl514b.DZoblDtEqtide": { - "value": -6.0779377238292621e-17, + "value": -6.0779377238292596e-17, "unit": 1 / u.sec, }, "log.initial.gl514b.LockTime": {"value": -1.0000000000000000, "unit": u.sec}, "log.initial.gl514b.BodyDsemiDtEqtide": {"value": -1.0000000000000000}, "log.initial.gl514b.BodyDeccDt": {"value": -1.0000000000000000}, "log.initial.gl514b.DOblDtEqtide": { - "value": 1.5242512641785164e-16, + "value": 1.5242512641785159e-16, "unit": u.rad / u.sec, }, - "log.initial.gl514b.DRotPerDtEqtide": {"value": 6.7687224755314529e-11}, + "log.initial.gl514b.DRotPerDtEqtide": {"value": 6.7687224755314555e-11}, "log.initial.gl514b.DRotRateDtEqtide": { - "value": -5.6971688537695393e-20, + "value": -5.6971688537695405e-20, "unit": 1 / u.sec**2, }, - "log.initial.gl514b.EqRotPer": {"value": 5.1067830269352868e06, "unit": u.sec}, + "log.initial.gl514b.EqRotPer": {"value": 5.1067830269352887e06, "unit": u.sec}, "log.initial.gl514b.EqTidePower": { "value": -1.0000000000000000, "unit": 1 / u.sec, @@ -337,17 +336,17 @@ "log.initial.gl514b.TidalTau": {"value": 638.0000000000000000, "unit": u.sec}, "log.initial.gl514b.TideLock": {"value": 0.0000000000000000}, "log.initial.gl514b.RotTimeEqtide": { - "value": 1.2764594842280960e15, + "value": 1.2764594842280958e15, "unit": u.sec, }, "log.initial.gl514b.EnvK2": {"value": 0.0100000000000000}, "log.initial.gl514b.OblTimeEqtide": {"value": -1.0000000000000000}, - "log.initial.gl514b.PowerEqtide": {"value": 5.6730849058585900e15, "unit": u.W}, + "log.initial.gl514b.PowerEqtide": {"value": 5.6730849058585910e15, "unit": u.W}, "log.initial.gl514b.SurfEnFluxEqtide": { - "value": 2.5164492816849116, + "value": 2.5164492816849120, "unit": u.kg / u.sec**3, }, - "log.initial.gl514b.TGlobal": {"value": 676.2679353212223532, "unit": u.sec}, + "log.initial.gl514b.TGlobal": {"value": 676.2679353212224669, "unit": u.sec}, "log.initial.gl514b.AlbedoGlobal": {"value": 0.2996778493802214}, "log.initial.gl514b.FluxInGlobal": { "value": 1046.1316028565233864, @@ -363,26 +362,26 @@ "log.initial.gl514b.SkipSeas": {"value": 0.0000000000000000}, "log.initial.gl514b.AreaIceCov": {"value": 0.0000000000000000}, "log.initial.gl514b.Latitude": {"value": -1.4552620265106593, "unit": u.rad}, - "log.initial.gl514b.TempLat": {"value": 557.2247797713517912, "unit": u.sec}, + "log.initial.gl514b.TempLat": {"value": 557.2247797713516775, "unit": u.sec}, "log.initial.gl514b.AlbedoLat": {"value": 0.3675649878041329}, "log.initial.gl514b.AnnInsol": { - "value": 755.3407450595735781, + "value": 755.3407450595734645, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.FluxMerid": { - "value": -2.0352457824211096e16, + "value": -2.0352457824211124e16, "unit": u.Joule, }, "log.initial.gl514b.FluxIn": { - "value": 486.1623336259239636, + "value": 486.1623336259239068, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.FluxOut": { - "value": 797.3297897221252697, + "value": 797.3297897221251560, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.DivFlux": { - "value": -311.1690738881308107, + "value": -311.1690738881313223, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.IceMass": {"value": 0.0000000000000000}, @@ -390,11 +389,11 @@ "log.initial.gl514b.DIceMassDt": {"value": 0.0000000000000000, "unit": u.m}, "log.initial.gl514b.IceFlow": {"value": 0.0000000000000000}, "log.initial.gl514b.EnergyResL": { - "value": -4.7634785005357116e-11, + "value": -4.0699887904338539e-11, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.EnergyResW": { - "value": 4.0836312109604478e-10, + "value": 4.9863047024700791e-10, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.BedrockH": {"value": 0.0000000000000000, "unit": u.m}, @@ -408,14 +407,14 @@ }, "log.initial.gl514b.AlbedoLandLat": {"value": 0.4335649878041328}, "log.initial.gl514b.AlbedoWaterLat": {"value": 0.3335649878041328}, - "log.initial.gl514b.TempMinLat": {"value": 520.6583069986143073, "unit": u.sec}, + "log.initial.gl514b.TempMinLat": {"value": 520.6583069986141936, "unit": u.sec}, "log.initial.gl514b.TempMaxLat": {"value": 598.1727520370602633, "unit": u.sec}, "log.initial.gl514b.Snowball": {"value": 0.0000000000000000}, "log.initial.gl514b.PlanckBAvg": {"value": 2.0899999999999990}, "log.initial.gl514b.IceAccum": {"value": 0.0000000000000000}, "log.initial.gl514b.IceAblate": {"value": 0.0000000000000000}, "log.initial.gl514b.TempMaxLand": { - "value": 657.9976852023412448, + "value": 657.9976852023411311, "unit": u.sec, }, "log.initial.gl514b.TempMaxWater": { @@ -423,7 +422,7 @@ "unit": u.sec, }, "log.initial.gl514b.PeakInsol": { - "value": 4243.8792145061070187, + "value": 4243.8792145061061092, "unit": u.kg / u.sec**3, }, "log.initial.gl514b.IceCapNorthLand": {"value": 0.0000000000000000}, @@ -497,11 +496,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 3.1557600000000000e07, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.gl514.Mass": { "value": 1.0140921600000001e30, "unit": u.kg, @@ -753,7 +747,7 @@ "rtol": 1e-4, }, "log.final.gl514b.Obliquity": { - "value": 0.4101523790171157, + "value": 0.4101523790171156, "unit": u.rad, "rtol": 1e-4, }, @@ -764,7 +758,7 @@ }, "log.final.gl514b.Xobl": {"value": 0.3987490733257115, "rtol": 1e-4}, "log.final.gl514b.Yobl": {"value": 0.0000000000000000, "rtol": 1e-4}, - "log.final.gl514b.Zobl": {"value": 0.9170600724717473, "rtol": 1e-4}, + "log.final.gl514b.Zobl": {"value": 0.9170600724717474, "rtol": 1e-4}, "log.final.gl514b.Radius": { "value": 1.3394010000000000e07, "unit": u.m, @@ -946,7 +940,7 @@ "rtol": 1e-4, }, "log.final.gl514b.DXoblDtEqtide": { - "value": 1.3978299858905663e-16, + "value": 1.3978299858905660e-16, "unit": 1 / u.sec, "rtol": 1e-4, }, @@ -956,7 +950,7 @@ "rtol": 1e-4, }, "log.final.gl514b.DZoblDtEqtide": { - "value": -6.0779378393221619e-17, + "value": -6.0779378393221594e-17, "unit": 1 / u.sec, "rtol": 1e-4, }, @@ -971,7 +965,7 @@ }, "log.final.gl514b.BodyDeccDt": {"value": -1.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.DOblDtEqtide": { - "value": 1.5242512762800832e-16, + "value": 1.5242512762800829e-16, "unit": u.rad / u.sec, "rtol": 1e-4, }, @@ -1032,7 +1026,7 @@ "rtol": 1e-4, }, "log.final.gl514b.FluxOutGlobal": { - "value": 1046.1310580793265217, + "value": 1046.1310580793267491, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1065,12 +1059,12 @@ }, "log.final.gl514b.AlbedoLat": {"value": 0.3675649876307175, "rtol": 1e-4}, "log.final.gl514b.AnnInsol": { - "value": 755.3407530704208739, + "value": 755.3407530704207602, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, "log.final.gl514b.FluxMerid": { - "value": -2.0352457616350744e16, + "value": -2.0352457616350760e16, "unit": u.Joule, "rtol": 1e-4, }, @@ -1085,7 +1079,7 @@ "rtol": 1e-4, }, "log.final.gl514b.DivFlux": { - "value": -311.1690707101504927, + "value": -311.1690707101508337, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1102,12 +1096,12 @@ }, "log.final.gl514b.IceFlow": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.EnergyResL": { - "value": 4.1836756281554699e-11, + "value": 4.1382008930668235e-11, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, "log.final.gl514b.EnergyResW": { - "value": -3.7482550396816805e-10, + "value": -3.7528025131905451e-10, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -1126,7 +1120,7 @@ "unit": u.sec, "rtol": 1e-4, }, - "log.final.gl514b.AlbedoLandLat": {"value": 0.4335649876307174, "rtol": 1e-4}, + "log.final.gl514b.AlbedoLandLat": {"value": 0.4335649876307175, "rtol": 1e-4}, "log.final.gl514b.AlbedoWaterLat": {"value": 0.3335649876307175, "rtol": 1e-4}, "log.final.gl514b.TempMinLat": { "value": 520.6588002187510256, @@ -1143,7 +1137,7 @@ "log.final.gl514b.IceAccum": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.IceAblate": {"value": 0.0000000000000000, "rtol": 1e-4}, "log.final.gl514b.TempMaxLand": { - "value": 657.9980346867481558, + "value": 657.9980346867480421, "unit": u.sec, "rtol": 1e-4, }, @@ -1208,5 +1202,5 @@ }, } ) -class TestCTL_POISE(Benchmark): +class Test_CTL_POISE(Benchmark): pass diff --git a/tests/EqtideRadheatThermint/TidalEarth/test_TidalEarth.py b/tests/EqtideRadheatThermint/TidalEarth/test_TidalEarth.py index 4069ca0e4..d9f660037 100644 --- a/tests/EqtideRadheatThermint/TidalEarth/test_TidalEarth.py +++ b/tests/EqtideRadheatThermint/TidalEarth/test_TidalEarth.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -380,11 +379,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 7.842346e09, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.sun.Mass": {"value": 1.988416e29, "unit": u.kg, "rtol": 1e-4}, "log.final.sun.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.sun.PrecA": {"value": 0.785398, "unit": u.rad, "rtol": 1e-4}, @@ -1044,5 +1038,5 @@ }, } ) -class TestTidalEarth(Benchmark): +class Test_TidalEarth(Benchmark): pass diff --git a/tests/EqtideStellar/BinaryTides/test_BinaryTides.py b/tests/EqtideStellar/BinaryTides/test_BinaryTides.py index 04ac9e022..50da14dd8 100644 --- a/tests/EqtideStellar/BinaryTides/test_BinaryTides.py +++ b/tests/EqtideStellar/BinaryTides/test_BinaryTides.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -272,11 +271,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 1.180297e09, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.primary.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.primary.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.primary.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -815,5 +809,5 @@ "log.final.secondary.DRotPerDtStellar": {"value": -3.122954e-09, "rtol": 1e-4}, } ) -class TestBinaryTides(Benchmark): +class Test_BinaryTides(Benchmark): pass diff --git a/tests/Galhabit/GalaxyEffects/test_GalaxyEffects.py b/tests/Galhabit/GalaxyEffects/test_GalaxyEffects.py index c3c855c69..383136368 100644 --- a/tests/Galhabit/GalaxyEffects/test_GalaxyEffects.py +++ b/tests/Galhabit/GalaxyEffects/test_GalaxyEffects.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -117,5 +116,5 @@ "log.final.comp.NBadImpulse": {"value": 0.0000000000}, } ) -class TestGalaxyEffects(Benchmark): +class Test_GalaxyEffects(Benchmark): pass diff --git a/tests/Poise/ForceEccObl/test_ForceEccObl.py b/tests/Poise/ForceEccObl/test_ForceEccObl.py index 1159d6637..1e206da1e 100644 --- a/tests/Poise/ForceEccObl/test_ForceEccObl.py +++ b/tests/Poise/ForceEccObl/test_ForceEccObl.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -97,11 +96,11 @@ "log.initial.earth.DIceMassDt": {"value": 0.000000, "unit": u.m}, "log.initial.earth.IceFlow": {"value": 0.000000, "unit": u.m / u.sec}, "log.initial.earth.EnergyResL": { - "value": 7.638334e-13, + "value": 5.506706e-13, "unit": u.kg / u.sec**3, }, "log.initial.earth.EnergyResW": { - "value": 2.335909e-12, + "value": 5.169198e-13, "unit": u.kg / u.sec**3, }, "log.initial.earth.BedrockH": {"value": 0.000000, "unit": u.m}, @@ -160,11 +159,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 3.155760e10, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.sun.Mass": {"value": 1.630501e30, "unit": u.kg, "rtol": 1e-4}, "log.final.sun.Radius": {"value": 2.019571e08, "unit": u.m, "rtol": 1e-4}, "log.final.sun.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -466,5 +460,5 @@ }, } ) -class TestForceEccObl(Benchmark): +class Test_ForceEccObl(Benchmark): pass diff --git a/tests/Poise/IceBelts/test_IceBelts.py b/tests/Poise/IceBelts/test_IceBelts.py index 9af46d20a..9a4117c82 100644 --- a/tests/Poise/IceBelts/test_IceBelts.py +++ b/tests/Poise/IceBelts/test_IceBelts.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -160,11 +159,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 3.155760e07, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.sun.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.sun.Radius": {"value": 2.019571e08, "unit": u.m, "rtol": 1e-4}, "log.final.sun.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -470,5 +464,5 @@ }, } ) -class TestIceBelts(Benchmark): +class Test_IceBelts(Benchmark): pass diff --git a/tests/RadHeat/InertEarth/test_RadHeat.py b/tests/RadHeat/InertEarth/test_InertEarth.py similarity index 97% rename from tests/RadHeat/InertEarth/test_RadHeat.py rename to tests/RadHeat/InertEarth/test_InertEarth.py index 21455c738..650ac3ad1 100644 --- a/tests/RadHeat/InertEarth/test_RadHeat.py +++ b/tests/RadHeat/InertEarth/test_InertEarth.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -58,7 +57,6 @@ "log.final.system.TotEnergy": {"value": -2.237790e32, "unit": u.Joule}, "log.final.system.PotEnergy": {"value": -2.239397e32, "unit": u.Joule}, "log.final.system.KinEnergy": {"value": 1.606047e29, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 2.874680e14, "unit": u.sec}, "log.final.earth.Mass": {"value": 5.972186e24, "unit": u.kg}, "log.final.earth.Radius": {"value": 6.378100e06, "unit": u.m}, "log.final.earth.RadGyra": {"value": 0.500000}, @@ -92,5 +90,5 @@ }, } ) -class TestRadHeat(Benchmark): +class Test_InertEarth(Benchmark): pass diff --git a/tests/RadheatThermint/EarthInterior/test_EarthInterior.py b/tests/RadheatThermint/EarthInterior/test_EarthInterior.py index d850f8bc9..abef2667a 100644 --- a/tests/RadheatThermint/EarthInterior/test_EarthInterior.py +++ b/tests/RadheatThermint/EarthInterior/test_EarthInterior.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -187,11 +186,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 6.298922e11, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.sun.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.sun.Radius": {"value": 2.019571e08, "unit": u.m, "rtol": 1e-4}, "log.final.sun.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -486,5 +480,5 @@ }, } ) -class TestEarthInterior(Benchmark): +class Test_EarthInterior(Benchmark): pass diff --git a/tests/RadheatThermint/VenusApproxInterior/test_VenusApproxInterior.py b/tests/RadheatThermint/VenusApproxInterior/test_VenusApproxInterior.py index 2c498b169..219097aca 100644 --- a/tests/RadheatThermint/VenusApproxInterior/test_VenusApproxInterior.py +++ b/tests/RadheatThermint/VenusApproxInterior/test_VenusApproxInterior.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -187,11 +186,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 6.700127e11, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.sun.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.sun.Radius": {"value": 2.019571e08, "unit": u.m, "rtol": 1e-4}, "log.final.sun.RadGyra": {"value": 0.500000, "rtol": 1e-4}, @@ -490,5 +484,5 @@ }, } ) -class TestVenusApproxInterior(Benchmark): +class Test_VenusApproxInterior(Benchmark): pass diff --git a/tests/Spinbody/ChaoticResonances/test_ChaoticResonances.py b/tests/Spinbody/ChaoticResonances/test_ChaoticResonances.py index 0db0a0fbb..fc70b9128 100644 --- a/tests/Spinbody/ChaoticResonances/test_ChaoticResonances.py +++ b/tests/Spinbody/ChaoticResonances/test_ChaoticResonances.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -293,11 +292,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 458.4461618920332171, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.star.Mass": { "value": 1.9884160000000000e30, "unit": u.kg, @@ -570,17 +564,17 @@ "rtol": 1e-4, }, "log.final.earth.ArgP": { - "value": 1.7388411561743455, + "value": 1.7388411561743453, "unit": u.rad, "rtol": 1e-4, }, "log.final.earth.MeanAnomaly": { - "value": 3.8474870280350597, + "value": 3.8474870280350593, "unit": u.rad, "rtol": 1e-4, }, "log.final.earth.Inc": { - "value": 0.7616663331648604, + "value": 0.7616663331648603, "unit": u.rad, "rtol": 1e-4, }, @@ -590,7 +584,7 @@ "rtol": 1e-4, }, "log.final.earth.MeanLongitude": { - "value": 3.8495586940389401, + "value": 3.8495586940389397, "unit": u.rad, "rtol": 1e-4, }, @@ -625,7 +619,7 @@ "log.final.earth.VelYSpiNBody": {"value": -2.0495887004595304e04, "rtol": 1e-4}, "log.final.earth.VelZSpiNBody": {"value": 1.2959382255760662e04, "rtol": 1e-4}, "log.final.earth.SpiNBodyInc": { - "value": 0.7616663331648604, + "value": 0.7616663331648603, "unit": u.rad, "rtol": 1e-4, }, @@ -702,19 +696,19 @@ "unit": u.m, "rtol": 1e-4, }, - "log.final.outer.COPP": {"value": 4.9414297148998368e-06, "rtol": 1e-4}, + "log.final.outer.COPP": {"value": 4.9414297150159201e-06, "rtol": 1e-4}, "log.final.outer.OrbAngMom": { "value": 8.1896514223697359e41, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.outer.ArgP": { - "value": 1.7362790073768688, + "value": 1.7362790073768690, "unit": u.rad, "rtol": 1e-4, }, "log.final.outer.MeanAnomaly": { - "value": 2.2114076505371290, + "value": 2.2114076505371294, "unit": u.rad, "rtol": 1e-4, }, @@ -729,12 +723,12 @@ "rtol": 1e-4, }, "log.final.outer.MeanLongitude": { - "value": 2.2114454584262906, + "value": 2.2114454584262919, "unit": u.rad, "rtol": 1e-4, }, "log.final.outer.LongP": { - "value": 3.7807889161634023e-05, + "value": 3.7807889162522201e-05, "unit": u.rad, "rtol": 1e-4, }, @@ -775,5 +769,5 @@ }, } ) -class TestChaoticResonances(Benchmark): +class Test_ChaoticResonances(Benchmark): pass diff --git a/tests/Spinbody/SS_SpiNBody/test_SS_SpiNBody.py b/tests/Spinbody/SS_SpiNBody/test_SS_SpiNBody.py index c54d15c14..e3eef947e 100644 --- a/tests/Spinbody/SS_SpiNBody/test_SS_SpiNBody.py +++ b/tests/Spinbody/SS_SpiNBody/test_SS_SpiNBody.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -8,7 +7,7 @@ "log.initial.system.Age": {"value": 0.0000000000000000, "unit": u.sec}, "log.initial.system.Time": {"value": 0.0000000000000000, "unit": u.sec}, "log.initial.system.TotAngMom": { - "value": 4.9405684954906744e40, + "value": 4.9405684954906725e40, "unit": (u.kg * u.m**2) / u.sec, }, "log.initial.system.TotEnergy": { @@ -135,11 +134,11 @@ "value": -1.6734887233371770e27, "unit": u.Joule, }, - "log.initial.Mercury.PositionXSpiNBody": {"value": -1.9460729480525383e10}, + "log.initial.Mercury.PositionXSpiNBody": {"value": -1.9460729480525391e10}, "log.initial.Mercury.PositionYSpiNBody": {"value": -6.6914040443213783e10}, "log.initial.Mercury.PositionZSpiNBody": {"value": -3.6797570861737509e09}, "log.initial.Mercury.VelXSpiNBody": {"value": 3.6995108268405180e04}, - "log.initial.Mercury.VelYSpiNBody": {"value": -1.1164070038032818e04}, + "log.initial.Mercury.VelYSpiNBody": {"value": -1.1164070038032824e04}, "log.initial.Mercury.VelZSpiNBody": {"value": -4307.5569771203754499}, "log.initial.Mercury.SpiNBodyInc": {"value": 0.1222580451706808, "unit": u.rad}, "log.initial.Mercury.SpiNBodyLongA": { @@ -199,9 +198,9 @@ "log.initial.Venus.PositionXSpiNBody": {"value": -1.0745862317120734e11}, "log.initial.Venus.PositionYSpiNBody": {"value": -4.8950065818498812e09}, "log.initial.Venus.PositionZSpiNBody": {"value": 6.1358940673992805e09}, - "log.initial.Venus.VelXSpiNBody": {"value": 1383.6855202680835646}, + "log.initial.Venus.VelXSpiNBody": {"value": 1383.6855202680806087}, "log.initial.Venus.VelYSpiNBody": {"value": -3.5139320872477445e04}, - "log.initial.Venus.VelZSpiNBody": {"value": -560.0632256368628532}, + "log.initial.Venus.VelZSpiNBody": {"value": -560.0632256368627395}, "log.initial.Venus.SpiNBodyInc": {"value": 0.0592488666486833, "unit": u.rad}, "log.initial.Venus.SpiNBodyLongA": {"value": 1.3383305131628385, "unit": u.rad}, "log.initial.Earth.Mass": {"value": 5.9721859999999998e24, "unit": u.kg}, @@ -237,7 +236,7 @@ }, "log.initial.Earth.COPP": {"value": 0.0064781433321986}, "log.initial.Earth.OrbAngMom": { - "value": 2.6606583190350616e40, + "value": 2.6606583190350611e40, "unit": (u.kg * u.m**2) / u.sec, }, "log.initial.Earth.ArgP": {"value": 0.0000000000000000, "unit": u.rad}, @@ -254,11 +253,11 @@ "value": -9.2006090724902290e26, "unit": u.Joule, }, - "log.initial.Earth.PositionXSpiNBody": {"value": -2.6549739061807007e10}, + "log.initial.Earth.PositionXSpiNBody": {"value": -2.6549739061807003e10}, "log.initial.Earth.PositionYSpiNBody": {"value": 1.4445683679635303e11}, "log.initial.Earth.PositionZSpiNBody": {"value": 8.1090710842026081e09}, "log.initial.Earth.VelXSpiNBody": {"value": -2.9782610455354614e04}, - "log.initial.Earth.VelYSpiNBody": {"value": -5459.1654954847226691}, + "log.initial.Earth.VelYSpiNBody": {"value": -5459.1654954847208501}, "log.initial.Earth.VelZSpiNBody": {"value": -663.6106761971726655}, "log.initial.Earth.SpiNBodyInc": {"value": 0.0593411945661111, "unit": u.rad}, "log.initial.Earth.SpiNBodyLongA": {"value": 6.0866500631238427, "unit": u.rad}, @@ -292,7 +291,7 @@ "log.initial.Mars.SemiMajorAxis": {"value": 2.2793663724184332e11, "unit": u.m}, "log.initial.Mars.COPP": {"value": -0.0161452572136818}, "log.initial.Mars.OrbAngMom": { - "value": 3.4992832768748895e39, + "value": 3.4992832768748888e39, "unit": (u.kg * u.m**2) / u.sec, }, "log.initial.Mars.ArgP": {"value": 0.0000000000000000, "unit": u.rad}, @@ -307,17 +306,17 @@ }, "log.initial.Mars.OrbPotEnergy": {"value": 0.0000000000000000, "unit": u.Joule}, "log.initial.Mars.PositionXSpiNBody": {"value": 2.0803448047941187e11}, - "log.initial.Mars.PositionYSpiNBody": {"value": -1.9601556499888902e09}, + "log.initial.Mars.PositionYSpiNBody": {"value": -1.9601556499889069e09}, "log.initial.Mars.PositionZSpiNBody": {"value": -5.1582818987714539e09}, "log.initial.Mars.VelXSpiNBody": {"value": 1160.3534380638780021}, - "log.initial.Mars.VelYSpiNBody": {"value": 2.6297809759394790e04}, + "log.initial.Mars.VelYSpiNBody": {"value": 2.6297809759394786e04}, "log.initial.Mars.VelZSpiNBody": {"value": 522.4080685981735996}, "log.initial.Mars.SpiNBodyInc": {"value": 0.0322992376694091, "unit": u.rad}, "log.initial.Mars.SpiNBodyLongA": {"value": 0.8653087613069771, "unit": u.rad}, "log.final.system.Age": {"value": 1.0000000000000000e09, "unit": u.sec}, "log.final.system.Time": {"value": 1.0000000000000000e09, "unit": u.sec}, "log.final.system.TotAngMom": { - "value": 4.9405680894478367e40, + "value": 4.9405680894478657e40, "unit": (u.kg * u.m**2) / u.sec, }, "log.final.system.TotEnergy": { @@ -329,7 +328,6 @@ "unit": u.Joule, }, "log.final.system.KinEnergy": {"value": 5.3472690917973792e38, "unit": u.Joule}, - "log.final.system.DeltaTime": {"value": 5.9826503140891415e04, "unit": u.sec}, "log.final.Star.Mass": {"value": 1.9884154399559999e30, "unit": u.kg}, "log.final.Star.Radius": {"value": 6.3781000000000000e09, "unit": u.m}, "log.final.Star.RadGyra": {"value": 0.5000000000000000}, @@ -354,7 +352,7 @@ "log.final.Star.SemiMajorAxis": {"value": -1.0000000000000000, "unit": u.m}, "log.final.Star.COPP": {"value": 0.0000000000000000}, "log.final.Star.OrbAngMom": { - "value": 2.5470730912517566e35, + "value": 2.5470730912583034e35, "unit": (u.kg * u.m**2) / u.sec, }, "log.final.Star.ArgP": {"value": 0.0000000000000000, "unit": u.rad}, @@ -364,16 +362,16 @@ "log.final.Star.MeanLongitude": {"value": -1.0000000000000000, "unit": u.rad}, "log.final.Star.LongP": {"value": 0.0000000000000000, "unit": u.rad}, "log.final.Star.TotOrbEnergy": { - "value": -6.1982903940958659e33, + "value": -6.1982903940957783e33, "unit": u.Joule, }, "log.final.Star.OrbPotEnergy": {"value": -1.0000000000000000, "unit": u.Joule}, - "log.final.Star.PositionXSpiNBody": {"value": -7.2996044877326745e05}, - "log.final.Star.PositionYSpiNBody": {"value": 1.4037087233830852e05}, - "log.final.Star.PositionZSpiNBody": {"value": 1.7226497595690369e04}, - "log.final.Star.VelXSpiNBody": {"value": -0.0106736151348654}, - "log.final.Star.VelYSpiNBody": {"value": -0.1732430416841375}, - "log.final.Star.VelZSpiNBody": {"value": -0.0074053647089663}, + "log.final.Star.PositionXSpiNBody": {"value": -7.2996044877420436e05}, + "log.final.Star.PositionYSpiNBody": {"value": 1.4037087234040390e05}, + "log.final.Star.PositionZSpiNBody": {"value": 1.7226497595667850e04}, + "log.final.Star.VelXSpiNBody": {"value": -0.0106736151354555}, + "log.final.Star.VelYSpiNBody": {"value": -0.1732430416842238}, + "log.final.Star.VelZSpiNBody": {"value": -0.0074053647089199}, "log.final.Star.SpiNBodyInc": {"value": 0.0000000000000000, "unit": u.rad}, "log.final.Star.SpiNBodyLongA": {"value": 0.0000000000000000, "unit": u.rad}, "log.final.Mercury.Mass": {"value": 3.3026188579999998e23, "unit": u.kg}, @@ -397,43 +395,43 @@ "value": -1.0000000000000000, "unit": u.kg / u.sec**3, }, - "log.final.Mercury.Eccentricity": {"value": 0.2056310160605732}, + "log.final.Mercury.Eccentricity": {"value": 0.2056310160605702}, "log.final.Mercury.MeanMotion": { - "value": 8.2668331941002145e-07, + "value": 8.2668331941003606e-07, "unit": 1 / u.sec, }, - "log.final.Mercury.OrbPeriod": {"value": 7.6004742803613152e06, "unit": u.sec}, + "log.final.Mercury.OrbPeriod": {"value": 7.6004742803611811e06, "unit": u.sec}, "log.final.Mercury.SemiMajorAxis": { - "value": 5.7908781130334373e10, + "value": 5.7908781130333694e10, "unit": u.m, }, "log.final.Mercury.COPP": {"value": 0.0001191262369582}, "log.final.Mercury.OrbAngMom": { - "value": 8.9600009443843100e38, + "value": 8.9600009443842632e38, "unit": (u.kg * u.m**2) / u.sec, }, - "log.final.Mercury.ArgP": {"value": 0.5092924420823122, "unit": u.rad}, - "log.final.Mercury.MeanAnomaly": {"value": 0.3482401511992885, "unit": u.rad}, + "log.final.Mercury.ArgP": {"value": 0.5092924420823016, "unit": u.rad}, + "log.final.Mercury.MeanAnomaly": {"value": 0.3482401512006217, "unit": u.rad}, "log.final.Mercury.Inc": {"value": 0.1222430915966452, "unit": u.rad}, - "log.final.Mercury.LongA": {"value": 0.8431407868342529, "unit": u.rad}, - "log.final.Mercury.MeanLongitude": {"value": 1.7006733801158536, "unit": u.rad}, - "log.final.Mercury.LongP": {"value": 1.3524332289165650, "unit": u.rad}, + "log.final.Mercury.LongA": {"value": 0.8431407868342509, "unit": u.rad}, + "log.final.Mercury.MeanLongitude": {"value": 1.7006733801171741, "unit": u.rad}, + "log.final.Mercury.LongP": {"value": 1.3524332289165524, "unit": u.rad}, "log.final.Mercury.TotOrbEnergy": { - "value": -6.1982903940958659e33, + "value": -6.1982903940957783e33, "unit": u.Joule, }, "log.final.Mercury.OrbPotEnergy": { - "value": -1.6243570021016668e27, + "value": -1.6243570020988150e27, "unit": u.Joule, }, - "log.final.Mercury.PositionXSpiNBody": {"value": -1.4284864976318579e10}, - "log.final.Mercury.PositionYSpiNBody": {"value": 4.4617202242123146e10}, - "log.final.Mercury.PositionZSpiNBody": {"value": 4.9562860799520254e09}, - "log.final.Mercury.VelXSpiNBody": {"value": -5.6172594401899907e04}, - "log.final.Mercury.VelYSpiNBody": {"value": -1.3055052637623558e04}, - "log.final.Mercury.VelZSpiNBody": {"value": 4086.5414331442589173}, + "log.final.Mercury.PositionXSpiNBody": {"value": -1.4284864976408028e10}, + "log.final.Mercury.PositionYSpiNBody": {"value": 4.4617202242102043e10}, + "log.final.Mercury.PositionZSpiNBody": {"value": 4.9562860799585018e09}, + "log.final.Mercury.VelXSpiNBody": {"value": -5.6172594401871094e04}, + "log.final.Mercury.VelYSpiNBody": {"value": -1.3055052637713810e04}, + "log.final.Mercury.VelZSpiNBody": {"value": 4086.5414331342203695}, "log.final.Mercury.SpiNBodyInc": {"value": 0.1222430915966452, "unit": u.rad}, - "log.final.Mercury.SpiNBodyLongA": {"value": 0.8431407868342529, "unit": u.rad}, + "log.final.Mercury.SpiNBodyLongA": {"value": 0.8431407868342509, "unit": u.rad}, "log.final.Venus.Mass": {"value": 4.8673315899999993e24, "unit": u.kg}, "log.final.Venus.Radius": {"value": 6.0528168999999994e06, "unit": u.m}, "log.final.Venus.RadGyra": {"value": 0.5000000000000000}, @@ -455,40 +453,40 @@ "value": -1.0000000000000000, "unit": u.kg / u.sec**3, }, - "log.final.Venus.Eccentricity": {"value": 0.0067654968650054}, + "log.final.Venus.Eccentricity": {"value": 0.0067654968649808}, "log.final.Venus.MeanMotion": { - "value": 3.2363398042052219e-07, + "value": 3.2363398042050488e-07, "unit": 1 / u.sec, }, - "log.final.Venus.OrbPeriod": {"value": 1.9414479588995468e07, "unit": u.sec}, - "log.final.Venus.SemiMajorAxis": {"value": 1.0821018201844737e11, "unit": u.m}, + "log.final.Venus.OrbPeriod": {"value": 1.9414479588996507e07, "unit": u.sec}, + "log.final.Venus.SemiMajorAxis": {"value": 1.0821018201845123e11, "unit": u.m}, "log.final.Venus.COPP": {"value": 0.0000000000000000}, "log.final.Venus.OrbAngMom": { - "value": 1.8444477639687681e40, + "value": 1.8444477639688015e40, "unit": (u.kg * u.m**2) / u.sec, }, - "log.final.Venus.ArgP": {"value": 0.9555745530151282, "unit": u.rad}, - "log.final.Venus.MeanAnomaly": {"value": 4.0769944731995524, "unit": u.rad}, - "log.final.Venus.Inc": {"value": 0.0593149665160429, "unit": u.rad}, - "log.final.Venus.LongA": {"value": 1.3373158524982236, "unit": u.rad}, - "log.final.Venus.MeanLongitude": {"value": 6.3698848787129041, "unit": u.rad}, - "log.final.Venus.LongP": {"value": 2.2928904055133517, "unit": u.rad}, + "log.final.Venus.ArgP": {"value": 0.9555745530153139, "unit": u.rad}, + "log.final.Venus.MeanAnomaly": {"value": 4.0769944731872148, "unit": u.rad}, + "log.final.Venus.Inc": {"value": 0.0593149665160410, "unit": u.rad}, + "log.final.Venus.LongA": {"value": 1.3373158524982263, "unit": u.rad}, + "log.final.Venus.MeanLongitude": {"value": 6.3698848787007547, "unit": u.rad}, + "log.final.Venus.LongP": {"value": 2.2928904055135400, "unit": u.rad}, "log.final.Venus.TotOrbEnergy": { - "value": -6.1982903940958659e33, + "value": -6.1982903940957783e33, "unit": u.Joule, }, "log.final.Venus.OrbPotEnergy": { - "value": -3.4289361517490209e28, + "value": -3.4289361518076816e28, "unit": u.Joule, }, - "log.final.Venus.PositionXSpiNBody": {"value": 1.0815757144988359e11}, - "log.final.Venus.PositionYSpiNBody": {"value": 8.2767987284221296e09}, - "log.final.Venus.PositionZSpiNBody": {"value": -6.1349323261703272e09}, - "log.final.Venus.VelXSpiNBody": {"value": -2813.6433688321417321}, - "log.final.Venus.VelYSpiNBody": {"value": 3.4759390241093402e04}, - "log.final.Venus.VelZSpiNBody": {"value": 640.1253385313910940}, - "log.final.Venus.SpiNBodyInc": {"value": 0.0593149665160429, "unit": u.rad}, - "log.final.Venus.SpiNBodyLongA": {"value": 1.3373158524982236, "unit": u.rad}, + "log.final.Venus.PositionXSpiNBody": {"value": 1.0815757144996898e11}, + "log.final.Venus.PositionYSpiNBody": {"value": 8.2767987274169598e09}, + "log.final.Venus.PositionZSpiNBody": {"value": -6.1349323261889391e09}, + "log.final.Venus.VelXSpiNBody": {"value": -2813.6433685082974989}, + "log.final.Venus.VelYSpiNBody": {"value": 3.4759390241117522e04}, + "log.final.Venus.VelZSpiNBody": {"value": 640.1253385129933804}, + "log.final.Venus.SpiNBodyInc": {"value": 0.0593149665160410, "unit": u.rad}, + "log.final.Venus.SpiNBodyLongA": {"value": 1.3373158524982263, "unit": u.rad}, "log.final.Earth.Mass": {"value": 5.9721859999999998e24, "unit": u.kg}, "log.final.Earth.Radius": {"value": 6.3781000000000000e06, "unit": u.m}, "log.final.Earth.RadGyra": {"value": 0.5000000000000000}, @@ -510,40 +508,40 @@ "value": -1.0000000000000000, "unit": u.kg / u.sec**3, }, - "log.final.Earth.Eccentricity": {"value": 0.0167040607934320}, + "log.final.Earth.Eccentricity": {"value": 0.0167040607934187}, "log.final.Earth.MeanMotion": { - "value": 1.9909898045534224e-07, + "value": 1.9909898045534430e-07, "unit": 1 / u.sec, }, - "log.final.Earth.OrbPeriod": {"value": 3.1558098855201822e07, "unit": u.sec}, - "log.final.Earth.SemiMajorAxis": {"value": 1.4959770364503329e11, "unit": u.m}, - "log.final.Earth.COPP": {"value": 0.0064749041550423}, + "log.final.Earth.OrbPeriod": {"value": 3.1558098855201498e07, "unit": u.sec}, + "log.final.Earth.SemiMajorAxis": {"value": 1.4959770364503226e11, "unit": u.m}, + "log.final.Earth.COPP": {"value": 0.0064749041550378}, "log.final.Earth.OrbAngMom": { - "value": 2.6606451888126178e40, + "value": 2.6606451888126087e40, "unit": (u.kg * u.m**2) / u.sec, }, - "log.final.Earth.ArgP": {"value": 1.9946317274699901, "unit": u.rad}, - "log.final.Earth.MeanAnomaly": {"value": 4.2793278732657036, "unit": u.rad}, - "log.final.Earth.Inc": {"value": 0.0592958228450282, "unit": u.rad}, - "log.final.Earth.LongA": {"value": 6.0858921788479794, "unit": u.rad}, - "log.final.Earth.MeanLongitude": {"value": 6.0766664724040869, "unit": u.rad}, - "log.final.Earth.LongP": {"value": 1.7973385991383832, "unit": u.rad}, + "log.final.Earth.ArgP": {"value": 1.9946317274695722, "unit": u.rad}, + "log.final.Earth.MeanAnomaly": {"value": 4.2793278732686302, "unit": u.rad}, + "log.final.Earth.Inc": {"value": 0.0592958228450263, "unit": u.rad}, + "log.final.Earth.LongA": {"value": 6.0858921788479803, "unit": u.rad}, + "log.final.Earth.MeanLongitude": {"value": 6.0766664724065960, "unit": u.rad}, + "log.final.Earth.LongP": {"value": 1.7973385991379658, "unit": u.rad}, "log.final.Earth.TotOrbEnergy": { - "value": -6.1982903940958659e33, + "value": -6.1982903940957783e33, "unit": u.Joule, }, "log.final.Earth.OrbPotEnergy": { - "value": -1.5075691558931523e27, + "value": -1.5075691558881020e27, "unit": u.Joule, }, - "log.final.Earth.PositionXSpiNBody": {"value": 1.4648471525389093e11}, - "log.final.Earth.PositionYSpiNBody": {"value": -3.5305272424263519e10}, - "log.final.Earth.PositionZSpiNBody": {"value": -3.5065836082528394e08}, - "log.final.Earth.VelXSpiNBody": {"value": 6486.6780380224217879}, - "log.final.Earth.VelYSpiNBody": {"value": 2.8796295693817417e04}, - "log.final.Earth.VelZSpiNBody": {"value": 1751.8263488512127424}, - "log.final.Earth.SpiNBodyInc": {"value": 0.0592958228450282, "unit": u.rad}, - "log.final.Earth.SpiNBodyLongA": {"value": 6.0858921788479794, "unit": u.rad}, + "log.final.Earth.PositionXSpiNBody": {"value": 1.4648471525396915e11}, + "log.final.Earth.PositionYSpiNBody": {"value": -3.5305272423903084e10}, + "log.final.Earth.PositionZSpiNBody": {"value": -3.5065836080340111e08}, + "log.final.Earth.VelXSpiNBody": {"value": 6486.6780379518304471}, + "log.final.Earth.VelYSpiNBody": {"value": 2.8796295693834920e04}, + "log.final.Earth.VelZSpiNBody": {"value": 1751.8263488514137407}, + "log.final.Earth.SpiNBodyInc": {"value": 0.0592958228450263, "unit": u.rad}, + "log.final.Earth.SpiNBodyLongA": {"value": 6.0858921788479803, "unit": u.rad}, "log.final.Mars.Mass": {"value": 6.3902390200000002e23, "unit": u.kg}, "log.final.Mars.Radius": {"value": 3.3931492000000002e06, "unit": u.m}, "log.final.Mars.RadGyra": {"value": 0.5000000000000000}, @@ -562,38 +560,38 @@ "value": -1.0000000000000000, "unit": u.kg / u.sec**3, }, - "log.final.Mars.Eccentricity": {"value": 0.0934396712499139}, + "log.final.Mars.Eccentricity": {"value": 0.0934396712499128}, "log.final.Mars.MeanMotion": { - "value": 1.0585624532113172e-07, + "value": 1.0585624532112784e-07, "unit": 1 / u.sec, }, - "log.final.Mars.OrbPeriod": {"value": 5.9355830051581249e07, "unit": u.sec}, - "log.final.Mars.SemiMajorAxis": {"value": 2.2794298912143616e11, "unit": u.m}, - "log.final.Mars.COPP": {"value": -0.0161366204391489}, + "log.final.Mars.OrbPeriod": {"value": 5.9355830051583417e07, "unit": u.sec}, + "log.final.Mars.SemiMajorAxis": {"value": 2.2794298912144171e11, "unit": u.m}, + "log.final.Mars.COPP": {"value": -0.0161366204391474}, "log.final.Mars.OrbAngMom": { - "value": 3.4992868389766110e39, + "value": 3.4992868389766533e39, "unit": (u.kg * u.m**2) / u.sec, }, - "log.final.Mars.ArgP": {"value": 5.0000685133399330, "unit": u.rad}, - "log.final.Mars.MeanAnomaly": {"value": 5.6682441835210717, "unit": u.rad}, + "log.final.Mars.ArgP": {"value": 5.0000685133399596, "unit": u.rad}, + "log.final.Mars.MeanAnomaly": {"value": 5.6682441835199748, "unit": u.rad}, "log.final.Mars.Inc": {"value": 0.0323141352804722, "unit": u.rad}, - "log.final.Mars.LongA": {"value": 0.8653182087158210, "unit": u.rad}, - "log.final.Mars.MeanLongitude": {"value": 11.5336309055768247, "unit": u.rad}, - "log.final.Mars.LongP": {"value": 5.8653867220557538, "unit": u.rad}, + "log.final.Mars.LongA": {"value": 0.8653182087158294, "unit": u.rad}, + "log.final.Mars.MeanLongitude": {"value": 11.5336309055757642, "unit": u.rad}, + "log.final.Mars.LongP": {"value": 5.8653867220557894, "unit": u.rad}, "log.final.Mars.TotOrbEnergy": { - "value": -6.1982903940958659e33, + "value": -6.1982903940957783e33, "unit": u.Joule, }, "log.final.Mars.OrbPotEnergy": {"value": 0.0000000000000000, "unit": u.Joule}, - "log.final.Mars.PositionXSpiNBody": {"value": 8.5927370326399353e10}, - "log.final.Mars.PositionYSpiNBody": {"value": -1.9293056341057376e11}, - "log.final.Mars.PositionZSpiNBody": {"value": -6.1583914211730099e09}, - "log.final.Mars.VelXSpiNBody": {"value": 2.3051619090597345e04}, - "log.final.Mars.VelYSpiNBody": {"value": 1.1937602122605942e04}, - "log.final.Mars.VelZSpiNBody": {"value": -317.0811459411227702}, + "log.final.Mars.PositionXSpiNBody": {"value": 8.5927370326167511e10}, + "log.final.Mars.PositionYSpiNBody": {"value": -1.9293056341070020e11}, + "log.final.Mars.PositionZSpiNBody": {"value": -6.1583914211697931e09}, + "log.final.Mars.VelXSpiNBody": {"value": 2.3051619090609282e04}, + "log.final.Mars.VelYSpiNBody": {"value": 1.1937602122578213e04}, + "log.final.Mars.VelZSpiNBody": {"value": -317.0811459419970788}, "log.final.Mars.SpiNBodyInc": {"value": 0.0323141352804722, "unit": u.rad}, - "log.final.Mars.SpiNBodyLongA": {"value": 0.8653182087158210, "unit": u.rad}, + "log.final.Mars.SpiNBodyLongA": {"value": 0.8653182087158294, "unit": u.rad}, } ) -class TestSS_SpiNBody(Benchmark): +class Test_SS_SpiNBody(Benchmark): pass diff --git a/tests/Stellar/HZBinary/test_HZBinary.py b/tests/Stellar/HZBinary/test_HZBinary.py index 6dcf1e690..0215f812f 100644 --- a/tests/Stellar/HZBinary/test_HZBinary.py +++ b/tests/Stellar/HZBinary/test_HZBinary.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -254,11 +253,6 @@ "unit": u.Joule, "rtol": 1e-4, }, - "log.final.system.DeltaTime": { - "value": 5.447540e07, - "unit": u.sec, - "rtol": 1e-4, - }, "log.final.primary.Mass": {"value": 5.965248e29, "unit": u.kg, "rtol": 1e-4}, "log.final.primary.Obliquity": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, "log.final.primary.PrecA": {"value": 0.000000, "unit": u.rad, "rtol": 1e-4}, @@ -737,5 +731,5 @@ "log.final.secondary.DRotPerDtStellar": {"value": -1.697172e-09, "rtol": 1e-4}, } ) -class TestHZBinary(Benchmark): +class Test_HZBinary(Benchmark): pass diff --git a/tests/Stellar/HZSingle/test_HZSingle.py b/tests/Stellar/HZSingle/test_HZSingle.py index 18121e858..fe9e2064c 100644 --- a/tests/Stellar/HZSingle/test_HZSingle.py +++ b/tests/Stellar/HZSingle/test_HZSingle.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -49,5 +48,5 @@ "log.initial.a.DRotPerDtStellar": {"value": 4.420158e-10}, } ) -class TestHZSingle(Benchmark): +class Test_HZSingle(Benchmark): pass diff --git a/tests/Stellar/MagneticBraking/test_MagneticBraking.py b/tests/Stellar/MagneticBraking/test_MagneticBraking.py index 83138360e..725aec6e7 100644 --- a/tests/Stellar/MagneticBraking/test_MagneticBraking.py +++ b/tests/Stellar/MagneticBraking/test_MagneticBraking.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -120,44 +119,43 @@ "log.final.system.Age": {"value": 1.735668e15, "unit": u.sec, "rtol": 1e-4}, "log.final.system.Time": {"value": 1.577880e15, "unit": u.sec, "rtol": 1e-4}, "log.final.system.TotAngMom": { - "value": 8.715561e43, + "value": 8.715570e43, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.system.TotEnergy": { - "value": -4.729780e41, + "value": -4.729764e41, "unit": u.erg, "rtol": 1e-4, }, "log.final.system.PotEnergy": { - "value": -2.539333e41, + "value": -2.539332e41, "unit": u.Joule, "rtol": 1e-4, }, "log.final.system.KinEnergy": { - "value": 2.876226e39, + "value": 2.876242e39, "unit": u.Joule, "rtol": 1e-4, }, - # "log.final.system.DeltaTime": {"value": 3.356549e+10, "unit": u.sec, "rtol": 1e-4}, "log.final.matt.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, - "log.final.matt.Radius": {"value": 97.759566, "unit": u.Rearth, "rtol": 1e-4}, + "log.final.matt.Radius": {"value": 97.759576, "unit": u.Rearth, "rtol": 1e-4}, "log.final.matt.RadGyra": {"value": 0.299433, "rtol": 1e-4}, "log.final.matt.RotAngMom": { - "value": 1.996783e43, + "value": 1.996789e43, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.matt.RotVel": { - "value": 1.796274e05, + "value": 1.796279e05, "unit": u.m / u.sec, "rtol": 1e-4, }, "log.final.matt.BodyType": {"value": 0.000000, "rtol": 1e-4}, "log.final.matt.RotRate": {"value": 0.000288, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.matt.RotPer": {"value": 0.252432, "unit": u.day, "rtol": 1e-4}, + "log.final.matt.RotPer": {"value": 0.252431, "unit": u.day, "rtol": 1e-4}, "log.final.matt.Density": { - "value": 1958.244305, + "value": 1958.243703, "unit": u.kg / u.m**3, "rtol": 1e-4, }, @@ -203,43 +201,43 @@ }, "log.final.matt.LXUVTot": {"value": 0.000678, "unit": u.LSUN, "rtol": 1e-4}, "log.final.matt.LostEnergy": { - "value": 9.339763e40, + "value": 9.339815e40, "unit": u.Joule, "rtol": 1e-4, }, "log.final.matt.LostAngMom": { - "value": 9.083480e42, + "value": 9.083485e42, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.matt.Luminosity": {"value": 0.677642, "unit": u.LSUN, "rtol": 1e-4}, "log.final.matt.LXUVStellar": {"value": 2.606209e23, "unit": u.W, "rtol": 1e-4}, - "log.final.matt.Temperature": {"value": 5533.500103, "unit": u.K, "rtol": 1e-4}, + "log.final.matt.Temperature": {"value": 5533.499918, "unit": u.K, "rtol": 1e-4}, "log.final.matt.LXUVFrac": {"value": 0.001000, "rtol": 1e-4}, "log.final.matt.RossbyNumber": {"value": 0.015282, "rtol": 1e-4}, - "log.final.matt.DRotPerDtStellar": {"value": 5.922573e-12, "rtol": 1e-4}, + "log.final.matt.DRotPerDtStellar": {"value": 5.922558e-12, "rtol": 1e-4}, "log.final.sk.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, - "log.final.sk.Radius": {"value": 97.759566, "unit": u.Rearth, "rtol": 1e-4}, + "log.final.sk.Radius": {"value": 97.759576, "unit": u.Rearth, "rtol": 1e-4}, "log.final.sk.RadGyra": {"value": 0.299433, "rtol": 1e-4}, "log.final.sk.RotAngMom": { - "value": 3.390977e42, + "value": 3.390981e42, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.sk.RotVel": { - "value": 3.050468e04, + "value": 3.050471e04, "unit": u.m / u.sec, "rtol": 1e-4, }, "log.final.sk.BodyType": {"value": 0.000000, "rtol": 1e-4}, "log.final.sk.RotRate": { - "value": 4.892331e-05, + "value": 4.892336e-05, "unit": 1 / u.sec, "rtol": 1e-4, }, - "log.final.sk.RotPer": {"value": 1.486450, "unit": u.day, "rtol": 1e-4}, + "log.final.sk.RotPer": {"value": 1.486448, "unit": u.day, "rtol": 1e-4}, "log.final.sk.Density": { - "value": 1958.244305, + "value": 1958.243703, "unit": u.kg / u.m**3, "rtol": 1e-4, }, @@ -277,47 +275,47 @@ }, "log.final.sk.LXUVTot": {"value": 0.000678, "unit": u.LSUN, "rtol": 1e-4}, "log.final.sk.LostEnergy": { - "value": 9.619099e40, + "value": 9.619152e40, "unit": u.Joule, "rtol": 1e-4, }, "log.final.sk.LostAngMom": { - "value": 2.566130e43, + "value": 2.566131e43, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.sk.Luminosity": {"value": 0.677642, "unit": u.LSUN, "rtol": 1e-4}, "log.final.sk.LXUVStellar": {"value": 2.606209e23, "unit": u.W, "rtol": 1e-4}, - "log.final.sk.Temperature": {"value": 5533.500103, "unit": u.K, "rtol": 1e-4}, + "log.final.sk.Temperature": {"value": 5533.499918, "unit": u.K, "rtol": 1e-4}, "log.final.sk.LXUVFrac": {"value": 0.001000, "rtol": 1e-4}, "log.final.sk.RossbyNumber": {"value": 0.089986, "rtol": 1e-4}, - "log.final.sk.DRotPerDtStellar": {"value": 6.265857e-11, "rtol": 1e-4}, + "log.final.sk.DRotPerDtStellar": {"value": 6.265864e-11, "rtol": 1e-4}, "log.final.reiners.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, "log.final.reiners.Radius": { - "value": 97.759566, + "value": 97.759576, "unit": u.Rearth, "rtol": 1e-4, }, "log.final.reiners.RadGyra": {"value": 0.299433, "rtol": 1e-4}, "log.final.reiners.RotAngMom": { - "value": 4.758831e42, + "value": 4.758849e42, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.reiners.RotVel": { - "value": 4.280968e04, + "value": 4.280982e04, "unit": u.m / u.sec, "rtol": 1e-4, }, "log.final.reiners.BodyType": {"value": 0.000000, "rtol": 1e-4}, "log.final.reiners.RotRate": { - "value": 6.865803e-05, + "value": 6.865826e-05, "unit": 1 / u.sec, "rtol": 1e-4, }, - "log.final.reiners.RotPer": {"value": 1.059192, "unit": u.day, "rtol": 1e-4}, + "log.final.reiners.RotPer": {"value": 1.059189, "unit": u.day, "rtol": 1e-4}, "log.final.reiners.Density": { - "value": 1958.244305, + "value": 1958.243703, "unit": u.kg / u.m**3, "rtol": 1e-4, }, @@ -363,7 +361,7 @@ }, "log.final.reiners.LXUVTot": {"value": 0.000678, "unit": u.LSUN, "rtol": 1e-4}, "log.final.reiners.LostEnergy": { - "value": 9.611056e40, + "value": 9.611108e40, "unit": u.Joule, "rtol": 1e-4, }, @@ -383,14 +381,14 @@ "rtol": 1e-4, }, "log.final.reiners.Temperature": { - "value": 5533.500103, + "value": 5533.499918, "unit": u.K, "rtol": 1e-4, }, "log.final.reiners.LXUVFrac": {"value": 0.001000, "rtol": 1e-4}, "log.final.reiners.RossbyNumber": {"value": 0.064121, "rtol": 1e-4}, - "log.final.reiners.DRotPerDtStellar": {"value": 8.507272e-11, "rtol": 1e-4}, + "log.final.reiners.DRotPerDtStellar": {"value": 8.507246e-11, "rtol": 1e-4}, } ) -class TestMagneticBraking(Benchmark): +class Test_MagneticBraking(Benchmark): pass diff --git a/tests/Stellar/StellarEvol/test_StellarEvol.py b/tests/Stellar/StellarEvol/test_StellarEvol.py index c272dd8ff..21827442f 100644 --- a/tests/Stellar/StellarEvol/test_StellarEvol.py +++ b/tests/Stellar/StellarEvol/test_StellarEvol.py @@ -1,5 +1,4 @@ import astropy.units as u -import pytest from benchmark import Benchmark, benchmark @@ -82,52 +81,51 @@ "log.final.system.Age": {"value": 3.218875e15, "unit": u.sec, "rtol": 1e-4}, "log.final.system.Time": {"value": 3.155760e15, "unit": u.sec, "rtol": 1e-4}, "log.final.system.TotAngMom": { - "value": 5.362484e43, + "value": 5.362476e43, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.system.TotEnergy": { - "value": -1.191823e41, + "value": -1.191824e41, "unit": u.erg, "rtol": 1e-4, }, "log.final.system.PotEnergy": { - "value": -1.234478e40, + "value": -1.234474e40, "unit": u.Joule, "rtol": 1e-4, }, "log.final.system.KinEnergy": { - "value": 2.087487e37, + "value": 2.087500e37, "unit": u.Joule, "rtol": 1e-4, }, - # "log.final.system.DeltaTime": {"value": 2.677436e+10, "unit": u.sec, "rtol": 1e-4}, "log.final.a.Mass": {"value": 1.988416e29, "unit": u.kg, "rtol": 1e-4}, - "log.final.a.Radius": {"value": 20.109235, "unit": u.Rearth, "rtol": 1e-4}, + "log.final.a.Radius": {"value": 20.109293, "unit": u.Rearth, "rtol": 1e-4}, "log.final.a.RadGyra": {"value": 0.464900, "rtol": 1e-4}, "log.final.a.RotAngMom": { - "value": 1.718013e41, + "value": 1.718023e41, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, - "log.final.a.RotVel": {"value": 3.116837e04, "unit": u.m / u.sec, "rtol": 1e-4}, + "log.final.a.RotVel": {"value": 3.116847e04, "unit": u.m / u.sec, "rtol": 1e-4}, "log.final.a.BodyType": {"value": 0.000000, "rtol": 1e-4}, "log.final.a.RotRate": {"value": 0.000243, "unit": 1 / u.sec, "rtol": 1e-4}, "log.final.a.RotPer": {"value": 0.299253, "unit": u.day, "rtol": 1e-4}, "log.final.a.Density": { - "value": 2.249873e04, + "value": 2.249854e04, "unit": u.kg / u.m**3, "rtol": 1e-4, }, "log.final.a.HZLimitDryRunaway": { - "value": 6.713518e09, + "value": 6.713543e09, "unit": u.m, "rtol": 1e-4, }, "log.final.a.HZLimRecVenus": {"value": 1.015610e11, "unit": u.m, "rtol": 1e-4}, "log.final.a.HZLimRunaway": {"value": 1.336981e11, "unit": u.m, "rtol": 1e-4}, "log.final.a.HZLimMoistGreenhouse": { - "value": 1.343821e11, + "value": 1.343820e11, "unit": u.m, "rtol": 1e-4, }, @@ -136,7 +134,7 @@ "unit": u.m, "rtol": 1e-4, }, - "log.final.a.HZLimEarlyMars": {"value": 2.808388e11, "unit": u.m, "rtol": 1e-4}, + "log.final.a.HZLimEarlyMars": {"value": 2.808387e11, "unit": u.m, "rtol": 1e-4}, "log.final.a.Instellation": { "value": -1.000000, "unit": u.kg / u.sec**3, @@ -148,48 +146,48 @@ "rtol": 1e-4, }, "log.final.a.LXUVTot": { - "value": 9.175718e20, + "value": 9.175786e20, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, - "log.final.a.LostEnergy": {"value": 9.808344e39, "unit": u.Joule, "rtol": 1e-4}, + "log.final.a.LostEnergy": {"value": 9.808340e39, "unit": u.Joule, "rtol": 1e-4}, "log.final.a.LostAngMom": { - "value": 9.438649e41, + "value": 9.438643e41, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.a.Luminosity": {"value": 0.002445, "unit": u.LSUN, "rtol": 1e-4}, - "log.final.a.LXUVStellar": {"value": 9.175718e20, "unit": u.W, "rtol": 1e-4}, - "log.final.a.Temperature": {"value": 2992.329951, "unit": u.K, "rtol": 1e-4}, + "log.final.a.LXUVStellar": {"value": 9.175786e20, "unit": u.W, "rtol": 1e-4}, + "log.final.a.Temperature": {"value": 2992.330456, "unit": u.K, "rtol": 1e-4}, "log.final.a.LXUVFrac": {"value": 0.000976, "rtol": 1e-4}, "log.final.a.RossbyNumber": {"value": 0.004409, "rtol": 1e-4}, - "log.final.a.DRotPerDtStellar": {"value": -3.016858e-12, "rtol": 1e-4}, + "log.final.a.DRotPerDtStellar": {"value": -3.016819e-12, "rtol": 1e-4}, "log.final.b.Mass": {"value": 1.988416e30, "unit": u.kg, "rtol": 1e-4}, - "log.final.b.Radius": {"value": 98.456448, "unit": u.Rearth, "rtol": 1e-4}, + "log.final.b.Radius": {"value": 98.456440, "unit": u.Rearth, "rtol": 1e-4}, "log.final.b.RadGyra": {"value": 0.298250, "rtol": 1e-4}, "log.final.b.RotAngMom": { - "value": 1.649165e42, + "value": 1.649160e42, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, - "log.final.b.RotVel": {"value": 1.484777e04, "unit": u.m / u.sec, "rtol": 1e-4}, + "log.final.b.RotVel": {"value": 1.484773e04, "unit": u.m / u.sec, "rtol": 1e-4}, "log.final.b.BodyType": {"value": 0.000000, "rtol": 1e-4}, - "log.final.b.RotRate": {"value": 2.364427e-05, "unit": 1 / u.sec, "rtol": 1e-4}, - "log.final.b.RotPer": {"value": 3.075674, "unit": u.day, "rtol": 1e-4}, + "log.final.b.RotRate": {"value": 2.364419e-05, "unit": 1 / u.sec, "rtol": 1e-4}, + "log.final.b.RotPer": {"value": 3.075683, "unit": u.day, "rtol": 1e-4}, "log.final.b.Density": { - "value": 1916.956147, + "value": 1916.956602, "unit": u.kg / u.m**3, "rtol": 1e-4, }, "log.final.b.HZLimitDryRunaway": { - "value": 6.713518e09, + "value": 6.713543e09, "unit": u.m, "rtol": 1e-4, }, "log.final.b.HZLimRecVenus": {"value": 1.015610e11, "unit": u.m, "rtol": 1e-4}, "log.final.b.HZLimRunaway": {"value": 1.336981e11, "unit": u.m, "rtol": 1e-4}, "log.final.b.HZLimMoistGreenhouse": { - "value": 1.343821e11, + "value": 1.343820e11, "unit": u.m, "rtol": 1e-4, }, @@ -198,9 +196,9 @@ "unit": u.m, "rtol": 1e-4, }, - "log.final.b.HZLimEarlyMars": {"value": 2.808388e11, "unit": u.m, "rtol": 1e-4}, + "log.final.b.HZLimEarlyMars": {"value": 2.808387e11, "unit": u.m, "rtol": 1e-4}, "log.final.b.Instellation": { - "value": 3.343163, + "value": 3.343188, "unit": u.kg / u.sec**3, "rtol": 1e-4, }, @@ -214,19 +212,19 @@ "unit": u.kg / u.sec**3, "rtol": 1e-4, }, - "log.final.b.LostEnergy": {"value": 1.354496e41, "unit": u.Joule, "rtol": 1e-4}, + "log.final.b.LostEnergy": {"value": 1.354495e41, "unit": u.Joule, "rtol": 1e-4}, "log.final.b.LostAngMom": { - "value": 5.086001e43, + "value": 5.085994e43, "unit": (u.kg * u.m**2) / u.sec, "rtol": 1e-4, }, "log.final.b.Luminosity": {"value": 0.689088, "unit": u.LSUN, "rtol": 1e-4}, "log.final.b.LXUVStellar": {"value": 2.586461e23, "unit": u.W, "rtol": 1e-4}, - "log.final.b.Temperature": {"value": 5539.190297, "unit": u.K, "rtol": 1e-4}, + "log.final.b.Temperature": {"value": 5539.189936, "unit": u.K, "rtol": 1e-4}, "log.final.b.LXUVFrac": {"value": 0.000976, "rtol": 1e-4}, "log.final.b.RossbyNumber": {"value": 0.187127, "rtol": 1e-4}, - "log.final.b.DRotPerDtStellar": {"value": 2.479928e-10, "rtol": 1e-4}, + "log.final.b.DRotPerDtStellar": {"value": 2.479934e-10, "rtol": 1e-4}, } ) -class TestStellarEvol(Benchmark): +class Test_StellarEvol(Benchmark): pass diff --git a/tests/maketest.py b/tests/maketest.py index 3060b9a57..1a60e7c2a 100644 --- a/tests/maketest.py +++ b/tests/maketest.py @@ -1,6 +1,8 @@ import argparse +import glob import os import pathlib +import subprocess import sys import pandas as pd @@ -15,25 +17,11 @@ def Main(dir, initial=False): initial_list = ["HZSingle", "IoHeat"] if dir == "all": - reply = None - question = "WARNING: Confirm that you will overwrite all tests" - while reply not in ("y", "n"): - reply = str(input(question + " (y/n): ")).lower().strip() - - if reply[:1] == "y": - top_list = sorted(next(os.walk("."))[1]) - for top in top_list: - dir_list = sorted(next(os.walk(top))[1]) - elif reply[:1] == "n": - print("Files NOT overwritten. Exiting.") - exit() - else: - print("User input was not valid. Exiting.") - exit() - + dir_list = CollectAllTests() else: dir_list = [dir] + # BuildVPLanet() for dirname in dir_list: if dirname in skip_list: continue @@ -50,9 +38,12 @@ def Main(dir, initial=False): infiles.append(file) # change to Dir and run vplanet + print("Creating test " + dirname, flush=True) os.chdir(dirname) - vplanet.run("vpl.in", quiet=True) + RemoveOldFiles() + vplanet.run("vpl.in", quiet=True, C=True) + stellar = False # Assume first, then it can be replaced with GetSNames SystemName, BodyName, logfile, outfile, forward, backward, stellar = GetSNames( infiles ) @@ -89,8 +80,53 @@ def Main(dir, initial=False): data = ProcessOutputfile(climate_name, data, body, GridOutputOrder) ProcessUnits(data) - WriteTest(data, dirname, stellar) - os.chdir("../") + WriteTestFile(data, dirname, stellar) + os.chdir("../../") + + +def BuildVPLanet(): + sys.stdout.write("Building VPLanet...") + sys.stdout.flush() + os.chdir("../") + subprocess.check_output(["make", "opt"]) + print("done.", flush=True) + os.chdir("tests") + + +def RemoveOldFiles(): + for file in glob.glob("*.log"): + os.remove(file) + for file in glob.glob("*.forward"): + os.remove(file) + for file in glob.glob("*.backward"): + os.remove(file) + + +def CollectAllTests(): + reply = None + question = "WARNING: Confirm that you will overwrite all tests" + while reply not in ("y", "n"): + reply = str(input(question + " (y/n): ")).lower().strip() + + if reply[:1] == "y": + top_list = sorted(next(os.walk("."))[1]) + dir_list = [] + for top in top_list: + subdirs = [ + os.path.join(top, subdir) + for subdir in sorted(next(os.walk(top))[1]) + ] + for subdir in subdirs: + if "pycache" not in subdir: + dir_list.append(subdir) + print(" ", flush=True) + elif reply[:1] == "n": + print("Files NOT overwritten. Exiting.") + exit() + else: + print("User input was not valid. Exiting.") + exit() + return dir_list def GetSNames(bodyfiles): @@ -136,9 +172,15 @@ def GetSNames(bodyfiles): for line in content: if line: if line[0] == "saModules": - if "stellar".casefold() in line or "stellar,".casefold() in line: + if ( + "stellar".casefold() in line + or "stellar,".casefold() in line + ): stellar = True - print("WARNING: Stellar module detected, rtol will be set to 1e-4 for all values.") + print( + "WARNING: Stellar module detected, rtol will be set to 1e-4 for all values.", + flush=True, + ) if line[0] == "sName": body_names.append(line[1]) @@ -431,7 +473,7 @@ def ProcessUnits(data): return data -def WriteTest(data, dirname, stellar): +def WriteTestFile(data, dirname, stellar): badchars = "- " for i in badchars: dirname = dirname.replace(i, "") @@ -439,18 +481,21 @@ def WriteTest(data, dirname, stellar): # Tests are two subdirs down dirs = dirname.split("/") + if stellar: + print("stellar") + test_file = "test_" + dirs[1] + ".py" t = open(test_file, "w") try: with open(test_file, "w") as t: t.write("from benchmark import Benchmark, benchmark \n") t.write("import astropy.units as u \n") - t.write("import pytest \n") t.write(" \n") t.write("@benchmark( \n") t.write(" { \n") for k, v in data.items(): + # print(k) if "Order" in k or v[1] == "inf": continue @@ -475,9 +520,11 @@ def WriteTest(data, dirname, stellar): ) if "log" in k and v[0] != "": + # print ("log, no v[0]") if "final" in k and stellar == True: + # print("final, no v[0]") if "DeltaTime" in k: - print("WARNING: Skipping final DeltaTime") + print("WARNING: Skipping final DeltaTime", flush=True) else: t.write( ' "' @@ -489,6 +536,7 @@ def WriteTest(data, dirname, stellar): + ', "rtol": 1e-4}, \n' ) else: + # print("not final") t.write( ' "' + k @@ -499,9 +547,11 @@ def WriteTest(data, dirname, stellar): + "}, \n" ) if "log" in k and v[0] == "": + # print ("log, w/ v[0]") if "final" in k and stellar == True: + # print("final, w v[0]") if "DeltaTime" in k: - print("WARNING: Skipping final DeltaTime") + print("WARNING: Skipping final DeltaTime", flush=True) else: t.write( ' "' @@ -511,6 +561,7 @@ def WriteTest(data, dirname, stellar): + ', "rtol": 1e-4}, \n' ) else: + # print("not final") t.write(' "' + k + '": {"value": ' + str(v[1]) + "}, \n") t.write(" } \n") @@ -522,7 +573,8 @@ def WriteTest(data, dirname, stellar): print("Unable to create file", test_file) exit(1) - print("Successfuly created new test file: " + dirname + "/" + test_file) + print("Successfuly created new test file: " + dirname + "/" + test_file, flush=True) + print(" ", flush=True) def Arguments():