From e98b78c31a5f7b579fec5b0c5796ee9d147d5521 Mon Sep 17 00:00:00 2001 From: Rory Barnes Date: Fri, 17 Nov 2023 17:38:42 -0800 Subject: [PATCH] Renamed Atmesc tests. Added test for WaterNoXUVLB15NoO2SinkBolmont16. --- src/output.c | 3 - tests/Atmesc/NoXUVFlux/test_NoXUVFlux.py | 117 ----------------- .../WaterNoXUVLB15NoO2SinkBolmont16/earth.in | 29 +++++ .../test_WaterNoXUVLB15NoO2SinkBolmont16.py | 120 ++++++++++++++++++ .../vpl.in | 0 .../earth.in | 0 ...test_WaterNoXUVLBExactNoO2SinkBolmont16.py | 120 ++++++++++++++++++ .../WaterNoXUVLBExactNoO2SinkBolmont16/vpl.in | 24 ++++ tests/maketest.py | 5 +- 9 files changed, 297 insertions(+), 121 deletions(-) delete mode 100644 tests/Atmesc/NoXUVFlux/test_NoXUVFlux.py create mode 100644 tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/earth.in create mode 100644 tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/test_WaterNoXUVLB15NoO2SinkBolmont16.py rename tests/Atmesc/{NoXUVFlux => WaterNoXUVLB15NoO2SinkBolmont16}/vpl.in (100%) rename tests/Atmesc/{NoXUVFlux => WaterNoXUVLBExactNoO2SinkBolmont16}/earth.in (100%) create mode 100644 tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/test_WaterNoXUVLBExactNoO2SinkBolmont16.py create mode 100644 tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/vpl.in diff --git a/src/output.c b/src/output.c index 8526ff5e8..487df799e 100644 --- a/src/output.c +++ b/src/output.c @@ -2166,11 +2166,8 @@ void WriteLog(BODY *body, CONTROL *control, FILES *files, MODULE *module, double dDt, dTotTime; /* Get derivatives */ - fprintf(stderr,"In WriteLog.\n"); PropertiesAuxiliary(body, control, system, update); - fprintf(stderr,"After PropsAux.\n"); dDt = fdGetTimeStep(body, control, system, update, fnUpdate); - fprintf(stderr,"After GetTimeStep.\n"); if (iEnd == 0) { sprintf(cTime, "Input"); diff --git a/tests/Atmesc/NoXUVFlux/test_NoXUVFlux.py b/tests/Atmesc/NoXUVFlux/test_NoXUVFlux.py deleted file mode 100644 index 8a27e9686..000000000 --- a/tests/Atmesc/NoXUVFlux/test_NoXUVFlux.py +++ /dev/null @@ -1,117 +0,0 @@ -import astropy.units as u -import pytest -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.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.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}, - "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.KTide": {"value": 0.999908}, - "log.final.earth.RGDuration": {"value": 1.00000e08, "unit": u.yr}, - } -) -class Test_NoXUVFlux(Benchmark): - pass diff --git a/tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/earth.in b/tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/earth.in new file mode 100644 index 000000000..852497a23 --- /dev/null +++ b/tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/earth.in @@ -0,0 +1,29 @@ +# Planet a parameters +sName earth # Body's name +saModules atmesc # Modules to apply, exact spelling required + +# Physical Properties +dMass -1 # Mass, negative -> Earth masses +dRadius -1 # Radius, negative -> Earth radii +dRotPeriod -1 # Rotation period, negative -> days +dObliquity 23.5 # Retrograde rotation +dRadGyra 0.5 # Radius of gyration (moment of inertia constant) + +# ATMESC Properties +dXFrac 1.0 # X-Ray/XUV absorption radius (fraction of planet radius) +dSurfWaterMass -3.0 # Initial surface water (Earth oceans) +dEnvelopeMass 0 # Initial envelope mass (Earth masses) +bHaltSurfaceDesiccated 0 # Halt when dry? +bHaltEnvelopeGone 0 # Halt when evaporated? +dMinSurfWaterMass -1.e-5 # Planet is desiccated when water content drops below this (Earth oceans) +sWaterLossModel lb15 +sPlanetRadiusModel none +bInstantO2Sink 0 +sAtmXAbsEffH2OModel bolmont16 + +# Orbital Properties +dSemi -1 # Semi-major axis, negative -> AU +dEcc 0.0167 # Eccentricity + +# Output +saOutputOrder Time -SurfWaterMass -RGLimit -OxygenMass diff --git a/tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/test_WaterNoXUVLB15NoO2SinkBolmont16.py b/tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/test_WaterNoXUVLB15NoO2SinkBolmont16.py new file mode 100644 index 000000000..a06dc8235 --- /dev/null +++ b/tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/test_WaterNoXUVLB15NoO2SinkBolmont16.py @@ -0,0 +1,120 @@ +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}, + } +) +class Test_WaterNoXUVLB15NoO2SinkBolmont16(Benchmark): + pass diff --git a/tests/Atmesc/NoXUVFlux/vpl.in b/tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/vpl.in similarity index 100% rename from tests/Atmesc/NoXUVFlux/vpl.in rename to tests/Atmesc/WaterNoXUVLB15NoO2SinkBolmont16/vpl.in diff --git a/tests/Atmesc/NoXUVFlux/earth.in b/tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/earth.in similarity index 100% rename from tests/Atmesc/NoXUVFlux/earth.in rename to tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/earth.in diff --git a/tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/test_WaterNoXUVLBExactNoO2SinkBolmont16.py b/tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/test_WaterNoXUVLBExactNoO2SinkBolmont16.py new file mode 100644 index 000000000..92bb5e6b9 --- /dev/null +++ b/tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/test_WaterNoXUVLBExactNoO2SinkBolmont16.py @@ -0,0 +1,120 @@ +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}, + } +) +class Test_WaterNoXUVLBExactNoO2SinkBolmont16(Benchmark): + pass diff --git a/tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/vpl.in b/tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/vpl.in new file mode 100644 index 000000000..f40cbe23e --- /dev/null +++ b/tests/Atmesc/WaterNoXUVLBExactNoO2SinkBolmont16/vpl.in @@ -0,0 +1,24 @@ +sSystemName solarsystem # System Name +iVerbose 5 # Verbosity level +bOverwrite 1 # Allow file overwrites? + +# List of "body files" that contain body-specific parameters +saBodyFiles earth.in + +# Input/Output Units +sUnitMass solar # Options: gram, kg, Earth, Neptune, Jupiter, solar +sUnitLength aU # Options: cm, m, km, Earth, Jupiter, solar, AU +sUnitTime YEARS # Options: sec, day, year, Myr, Gyr +sUnitAngle d # Options: deg, rad + +# Input/Output +bDoLog 1 # Write a log file? +iDigits 6 # Maximum number of digits to right of decimal +dMinValue 1e-10 # Minimum value of eccentricity/obliquity + +# Evolution Parameters +bDoForward 1 # Perform a forward evolution? +bVarDt 1 # Use variable timestepping? +dEta 0.1 # Coefficient for variable timestepping +dStopTime 1e8 # Stop time for evolution +dOutputTime 1e8 # Output timesteps (assuming in body files) diff --git a/tests/maketest.py b/tests/maketest.py index 3c4562e0b..d168b5e31 100644 --- a/tests/maketest.py +++ b/tests/maketest.py @@ -11,7 +11,7 @@ def Main(dir, initial=False): - skip_list = ["Conflicts", "__pycache__"] + skip_list = ["Conflicts", "__pycache__", "Help"] initial_list = ["HZSingle", "IoHeat"] if dir == "all": @@ -335,6 +335,9 @@ def ProcessUnits(data): if units == "m^2/s^3": v[0] = "u.m ** 2 / u.sec ** 3" + if units == "m^-2 s^-1": + v[0] = "1 / u.m ** 2 / u.sec" + # regular units if units == "TO": v[0] = "u.TO"