diff --git a/tests/CreateHDF5/__init__.py b/tests/CreateHDF5/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/CreateHDF5/__init__.py +++ b/tests/CreateHDF5/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/CreateHDF5/test_CreateHDF5.py b/tests/CreateHDF5/test_CreateHDF5.py index 4589c7e..c5aed4b 100644 --- a/tests/CreateHDF5/test_CreateHDF5.py +++ b/tests/CreateHDF5/test_CreateHDF5.py @@ -51,6 +51,11 @@ def test_CreateHDF5(): # checks if the bpl files exist assert os.path.isfile(file) == True + shutil.rmtree(path / "BP_CreateHDF5") + os.remove(path / ".BP_CreateHDF5") + os.remove(path / ".BP_CreateHDF5_BPL") + os.remove(path / "BP_CreateHDF5.bpa") + os.remove(path / "BP_CreateHDF5.md5") if __name__ == "__main__": test_CreateHDF5() diff --git a/tests/ExtractArchive/__init__.py b/tests/ExtractArchive/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/ExtractArchive/__init__.py +++ b/tests/ExtractArchive/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/ExtractArchive/test_ExtractArchive.py b/tests/ExtractArchive/test_ExtractArchive.py index aa2fc73..edbdcef 100644 --- a/tests/ExtractArchive/test_ExtractArchive.py +++ b/tests/ExtractArchive/test_ExtractArchive.py @@ -28,8 +28,6 @@ def test_ExtractArchive(): os.remove(path / ".BP_Extract_BPL") if (path / "BP_Extract.bpa").exists(): os.remove(path / "BP_Extract.bpa") - if (path / "../BP_Extract.md5").exists(): - os.remove(path / "../BP_Extract.md5") if (path / "BP_Extract.md5").exists(): os.remove(path / "BP_Extract.md5") @@ -46,9 +44,7 @@ def test_ExtractArchive(): # Run bigplanet print("Running BigPlanet.") sys.stdout.flush() - - ######## SOMETHING IS WRONG WITH MD5CHECKSUMS! ####### - subprocess.check_output(["bigplanet", "-ignorecorrupt", "bpl.in", "-a"], cwd=path) + subprocess.check_output(["bigplanet", "bpl.in", "-a"], cwd=path) file = bp.BPLFile(path / "BP_Extract.bpa") @@ -59,9 +55,13 @@ def test_ExtractArchive(): assert np.isclose(earth_Instellation_final[0], 1367.635318) assert np.isclose(earth_Instellation_final[1], 341.90883) - assert np.isclose(sun_RotPer_initial[0], 86400.0) + shutil.rmtree(path / "BP_Extract") + os.remove(path / ".BP_Extract") + os.remove(path / ".BP_Extract_BPL") + os.remove(path / "BP_Extract.bpa") + os.remove(path / "BP_Extract.md5") if __name__ == "__main__": test_ExtractArchive() diff --git a/tests/ExtractFilterArchive/__init__.py b/tests/ExtractFilterArchive/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/ExtractFilterArchive/__init__.py +++ b/tests/ExtractFilterArchive/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/ExtractFilterArchive/test_ExtractFilterArchive.py b/tests/ExtractFilterArchive/test_ExtractFilterArchive.py index bd390f4..6bb2cb2 100644 --- a/tests/ExtractFilterArchive/test_ExtractFilterArchive.py +++ b/tests/ExtractFilterArchive/test_ExtractFilterArchive.py @@ -30,8 +30,6 @@ def test_ExtractFilterArchive(): os.remove(path / "BP_Extract.bpa") if (path / "Test.bpf").exists(): os.remove(path / "Test.bpf") - if (path / "../BP_Extract.md5").exists(): - os.remove(path / "../BP_Extract.md5") if (path / "BP_Extract.md5").exists(): os.remove(path / "BP_Extract.md5") @@ -73,6 +71,12 @@ def test_ExtractFilterArchive(): assert np.isclose(vpl_stoptime_option[0], 4.5e9) assert np.isclose(earth_tman_forward[0][0], 3000.0) + shutil.rmtree(path / "BP_Extract") + os.remove(path / ".BP_Extract") + os.remove(path / ".BP_Extract_BPL") + os.remove(path / "BP_Extract.bpa") + os.remove(path / "Test.bpf") + os.remove(path / "BP_Extract.md5") if __name__ == "__main__": test_ExtractFilterArchive() diff --git a/tests/ExtractFilterRaw/.BP_Extract b/tests/ExtractFilterRaw/.BP_Extract deleted file mode 100644 index 9713030..0000000 --- a/tests/ExtractFilterRaw/.BP_Extract +++ /dev/null @@ -1,5 +0,0 @@ -Vspace File: /Users/rory/src/bigplanet/tests/ExtractFilterRaw/vspace.in -Total Number of Simulations: 2 -/Users/rory/src/bigplanet/tests/ExtractFilterRaw/BP_Extract/semi_a0 1 -/Users/rory/src/bigplanet/tests/ExtractFilterRaw/BP_Extract/semi_a1 1 -THE END diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/earth.in b/tests/ExtractFilterRaw/BP_Extract/semi_a0/earth.in deleted file mode 100644 index 5daa0f4..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a0/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.0 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/sun.in b/tests/ExtractFilterRaw/BP_Extract/semi_a0/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a0/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/vpl.in b/tests/ExtractFilterRaw/BP_Extract/semi_a0/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a0/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/vplanet_log b/tests/ExtractFilterRaw/BP_Extract/semi_a0/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a0/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a1/earth.in b/tests/ExtractFilterRaw/BP_Extract/semi_a1/earth.in deleted file mode 100644 index f2c0f8b..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a1/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 2.0 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a1/sun.in b/tests/ExtractFilterRaw/BP_Extract/semi_a1/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a1/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a1/vpl.in b/tests/ExtractFilterRaw/BP_Extract/semi_a1/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a1/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a1/vplanet_log b/tests/ExtractFilterRaw/BP_Extract/semi_a1/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/ExtractFilterRaw/BP_Extract/semi_a1/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/ExtractFilterRaw/__init__.py b/tests/ExtractFilterRaw/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/ExtractFilterRaw/__init__.py +++ b/tests/ExtractFilterRaw/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/ExtractFilterRaw/test_ExtractFilterRaw.py b/tests/ExtractFilterRaw/test_ExtractFilterRaw.py index 9471ab2..5ebe534 100644 --- a/tests/ExtractFilterRaw/test_ExtractFilterRaw.py +++ b/tests/ExtractFilterRaw/test_ExtractFilterRaw.py @@ -63,6 +63,10 @@ def test_ExtractFilterRaw(): assert np.isclose(vpl_stoptime_option[0], 4.5e9) assert np.isclose(earth_tman_forward[0][0], 3000.0) + shutil.rmtree(path / "BP_Extract") + os.remove(path / ".BP_Extract") + os.remove(path / "Test.bpf") + if __name__ == "__main__": test_ExtractFilterRaw() diff --git a/tests/MD5CheckSum/__init__.py b/tests/MD5CheckSum/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/MD5CheckSum/__init__.py +++ b/tests/MD5CheckSum/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/MD5CheckSum/test_MD5CheckSum.py b/tests/MD5CheckSum/test_MD5CheckSum.py index ba4a9bf..c2c6de3 100644 --- a/tests/MD5CheckSum/test_MD5CheckSum.py +++ b/tests/MD5CheckSum/test_MD5CheckSum.py @@ -20,6 +20,8 @@ def test_MD5CheckSum(): # If present, remove files from previous run if (path / "BP_Extract").exists(): shutil.rmtree(path / "BP_Extract") + if (path / "BP_Extract.bpa").exists(): + os.remove(path / "BP_Extract.bpa") if (path / ".BP_Extract").exists(): os.remove(path / ".BP_Extract") if (path / ".BP_Extract_BPL").exists(): @@ -55,6 +57,11 @@ def test_MD5CheckSum(): new_md5 = file_hash.hexdigest() assert md5_old == new_md5 + shutil.rmtree(path / "BP_Extract") + os.remove(path / "BP_Extract.bpa") + os.remove(path / ".BP_Extract") + os.remove(path / ".BP_Extract_BPL") + os.remove(path / "BP_Extract.md5") if __name__ == "__main__": test_MD5CheckSum() diff --git a/tests/SingleSim/__init__.py b/tests/SingleSim/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/SingleSim/__init__.py +++ b/tests/SingleSim/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/SingleSim/test_singlesim.py b/tests/SingleSim/test_singlesim.py index 91abfba..faef962 100644 --- a/tests/SingleSim/test_singlesim.py +++ b/tests/SingleSim/test_singlesim.py @@ -23,10 +23,8 @@ def test_SingleSim(): shutil.rmtree(path / "BP_Extract") if (path / ".BP_Extract").exists(): os.remove(path / ".BP_Extract") - if (path / ".BP_Extract_BPL").exists(): - os.remove(path / ".BP_Extract_BPL") - if (path / "BP_Extract.md5").exists(): - os.remove(path / "BP_Extract.md5") + if (path / "Test.bpf").exists(): + os.remove(path / "Test.bpf") # Run vspace print("Running vspace") @@ -52,5 +50,9 @@ def test_SingleSim(): assert np.isclose(earth_Tcore_inital[0], 6000.00000) + shutil.rmtree(path / "BP_Extract") + os.remove(path / ".BP_Extract") + os.remove(path / "Test.bpf") + if __name__ == "__main__": test_SingleSim() diff --git a/tests/Stats/__init__.py b/tests/Stats/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/Stats/__init__.py +++ b/tests/Stats/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/Stats/test_Stats.py b/tests/Stats/test_Stats.py index 074f770..f041dd2 100644 --- a/tests/Stats/test_Stats.py +++ b/tests/Stats/test_Stats.py @@ -50,7 +50,8 @@ def test_Stats(): # Run bigplanet print("Running BigPlanet") sys.stdout.flush() - subprocess.check_output(["bigplanet", "-ignorecorrupt", "bpl.in", "-a"], cwd=path) +# subprocess.check_output(["bigplanet", "-ignorecorrupt", "bpl.in", "-a"], cwd=path) + subprocess.check_output(["bigplanet", "bpl.in", "-a"], cwd=path) file = bp.BPLFile(path / "BP_Stats.bpa") @@ -68,6 +69,11 @@ def test_Stats(): assert np.isclose(earth_FMeltUMan_geomean[0], 0.20819565439935903) assert np.isclose(earth_BLUMan_stddev[0], 18.285373298439122) + shutil.rmtree(path / "BP_Stats") + os.remove(path / ".BP_Stats") + os.remove(path / ".BP_Stats_BPL") + os.remove(path / "BP_Stats.bpa") + os.remove(path / "BP_Stats.md5") if __name__ == "__main__": test_Stats() diff --git a/tests/Status/.BP_Status b/tests/Status/.BP_Status deleted file mode 100644 index 08d2763..0000000 --- a/tests/Status/.BP_Status +++ /dev/null @@ -1,11 +0,0 @@ -Vspace File: /Users/rory/src/bigplanet/tests/Status/vspace.in -Total Number of Simulations: 8 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a0 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a1 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a2 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a3 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a4 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a5 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a6 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a7 1 -THE END diff --git a/tests/Status/.BP_Status_BPL b/tests/Status/.BP_Status_BPL deleted file mode 100644 index a1df0ff..0000000 --- a/tests/Status/.BP_Status_BPL +++ /dev/null @@ -1,11 +0,0 @@ -Vspace File: /Users/rory/src/bigplanet/tests/Status/bpl.in -Total Number of Simulations: 8 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a0 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a1 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a2 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a3 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a4 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a5 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a6 1 -/Users/rory/src/bigplanet/tests/Status/BP_Status/semi_a7 1 -THE END diff --git a/tests/Status/BP_Status/semi_a0/earth.in b/tests/Status/BP_Status/semi_a0/earth.in deleted file mode 100644 index 5daa0f4..0000000 --- a/tests/Status/BP_Status/semi_a0/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.0 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a0/sun.in b/tests/Status/BP_Status/semi_a0/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a0/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a0/vpl.in b/tests/Status/BP_Status/semi_a0/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a0/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a0/vplanet_log b/tests/Status/BP_Status/semi_a0/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a0/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/BP_Status/semi_a1/earth.in b/tests/Status/BP_Status/semi_a1/earth.in deleted file mode 100644 index 75ae07c..0000000 --- a/tests/Status/BP_Status/semi_a1/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.1428571428571428 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a1/sun.in b/tests/Status/BP_Status/semi_a1/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a1/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a1/vpl.in b/tests/Status/BP_Status/semi_a1/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a1/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a1/vplanet_log b/tests/Status/BP_Status/semi_a1/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a1/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/BP_Status/semi_a2/earth.in b/tests/Status/BP_Status/semi_a2/earth.in deleted file mode 100644 index 81b76e5..0000000 --- a/tests/Status/BP_Status/semi_a2/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.2857142857142856 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a2/sun.in b/tests/Status/BP_Status/semi_a2/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a2/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a2/vpl.in b/tests/Status/BP_Status/semi_a2/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a2/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a2/vplanet_log b/tests/Status/BP_Status/semi_a2/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a2/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/BP_Status/semi_a3/earth.in b/tests/Status/BP_Status/semi_a3/earth.in deleted file mode 100644 index 2270190..0000000 --- a/tests/Status/BP_Status/semi_a3/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.4285714285714286 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a3/sun.in b/tests/Status/BP_Status/semi_a3/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a3/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a3/vpl.in b/tests/Status/BP_Status/semi_a3/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a3/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a3/vplanet_log b/tests/Status/BP_Status/semi_a3/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a3/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/BP_Status/semi_a4/earth.in b/tests/Status/BP_Status/semi_a4/earth.in deleted file mode 100644 index de81902..0000000 --- a/tests/Status/BP_Status/semi_a4/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.5714285714285714 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a4/sun.in b/tests/Status/BP_Status/semi_a4/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a4/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a4/vpl.in b/tests/Status/BP_Status/semi_a4/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a4/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a4/vplanet_log b/tests/Status/BP_Status/semi_a4/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a4/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/BP_Status/semi_a5/earth.in b/tests/Status/BP_Status/semi_a5/earth.in deleted file mode 100644 index 9125a3f..0000000 --- a/tests/Status/BP_Status/semi_a5/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.7142857142857142 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a5/sun.in b/tests/Status/BP_Status/semi_a5/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a5/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a5/vpl.in b/tests/Status/BP_Status/semi_a5/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a5/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a5/vplanet_log b/tests/Status/BP_Status/semi_a5/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a5/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/BP_Status/semi_a6/earth.in b/tests/Status/BP_Status/semi_a6/earth.in deleted file mode 100644 index f4660ab..0000000 --- a/tests/Status/BP_Status/semi_a6/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 1.8571428571428572 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a6/sun.in b/tests/Status/BP_Status/semi_a6/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a6/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a6/vpl.in b/tests/Status/BP_Status/semi_a6/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a6/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a6/vplanet_log b/tests/Status/BP_Status/semi_a6/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a6/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/BP_Status/semi_a7/earth.in b/tests/Status/BP_Status/semi_a7/earth.in deleted file mode 100644 index f2c0f8b..0000000 --- a/tests/Status/BP_Status/semi_a7/earth.in +++ /dev/null @@ -1,55 +0,0 @@ -# Earthlike parameters -sName earth # Body's name -saModules radheat thermint - -# Physical Properties -dMass -1.5 # Mass, negative -> Earth masses -dRadius -1.0 # Radius, negative -> Earth radii -dRotPeriod -1.0 # Rotation period, negative -> days -dObliquity 30 -dRadGyra 0.5 -# Orbital Properties -dEcc 0.01 # Eccentricity -dSemi 2.0 - - -# RADHEAT Parameters -# *Num* are in numbers of atoms, negative -> Earth vals -### 40K -d40KPowerMan -1 -d40KPowerCore -1 -d40KPowerCrust -1 -### 232Th -d232ThPowerMan -1 -d232ThPowerCore -1 -d232ThPowerCrust -1 -### 235U -d235UPowerMan -1 -d235UPowerCore -1 -d235UPowerCrust -1 -### 238U -d238UPowerMan -1 -d238UPowerCore -1 -d238UPowerCrust -1 - -### THERMINT inputs. -dTMan 3000 -dTCore 6000 -#dViscJumpMan 2.40 - -saOutputOrder -Time -TMan -TUMan -TLMan -TCMB -TCore $ - -HflowUMan -HflowMeltMan -RadPowerMan -RadPowerCore -RadPowerCrust $ - -HflowCMB -HflowSecMan $ - -TDotMan -TDotCore -TJumpLMan -TJumpUMan -RIC -RayleighMan -ViscUMan -ViscLMan $ - -MeltMassFluxMan -FMeltUMan $ - -MagMom -CoreBuoyTherm -CoreBuoyCompo -CoreBuoyTotal -MagPauseRad $ - -BLUMan -BLLMan $ - -238UPowerMan -238UNumMan -238UMassMan -238UPowerCore -238UNumCore -238UMassCore $ - -238UPowerCrust -238UNumCrust -238UMassCrust $ - -235UPowerMan -235UNumMan -235UMassMan -235UPowerCore -235UNumCore -235UMassCore $ - -235UPowerCrust -235UNumCrust -235UMassCrust $ - -232ThPowerMan -232ThNumMan -232ThMassMan -232ThPowerCore -232ThNumCore -232ThMassCore $ - -232ThPowerCrust -232ThNumCrust -232ThMassCrust $ - -40KPowerMan -40KNumMan -40KMassMan -40KPowerCore -40KNumCore -40KMassCore $ - -40KPowerCrust -40KNumCrust -40KMassCrust ChiOC ChiIC MassChiOC MassChiIC MassOC MassIC $ - -RadPowerTotal diff --git a/tests/Status/BP_Status/semi_a7/sun.in b/tests/Status/BP_Status/semi_a7/sun.in deleted file mode 100644 index 70903ec..0000000 --- a/tests/Status/BP_Status/semi_a7/sun.in +++ /dev/null @@ -1,9 +0,0 @@ -# sun parameters -sName sun -dMass 1 -dSemi 0 -dEcc 0 -dRadius 0.00135 -dLuminosity 3.846e26 -sStellarModel none -saModules stellar diff --git a/tests/Status/BP_Status/semi_a7/vpl.in b/tests/Status/BP_Status/semi_a7/vpl.in deleted file mode 100644 index c8ca318..0000000 --- a/tests/Status/BP_Status/semi_a7/vpl.in +++ /dev/null @@ -1,44 +0,0 @@ -# Example primary input file for VPLANET -sSystemName earth # System Name -iVerbose 5 # Verbosity level -bOverwrite 1 # Allow file overwrites? - -# All space after a # is ignored, as is white space -# The first lowercase letter(s) denote the cast: b=boolean, i=int, d=double, -# s=string. An "a" indicates an array and multiple arguments are allowed/expected. - -# List of "body files" that contain body-specific parameters -saBodyFiles sun.in $ # The host star - earth.in # Earth - - -# Array options can continue to the next line with a terminating "$". The $ can be -# at the end of the string or not. Comments are allowed afterwards. - -# 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 -sUnitTemp K - -# Units specified in the primary input file are propagated into the bodies. Otherwise -# specifiy units on a per body basis in the body files. -# Most string arguments can be in any case and need only be unambiguous. - -# 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 - -# Option names must be exact in spelling and case. - -# Evolution Parameters -bDoForward 1 # Perform a forward evolution? -bVarDt 1 # Use variable timestepping? -dEta 0.1 # Coefficient for variable timestepping -dStopTime 4.5e9 #1e10 # Stop time for evolution -dOutputTime 1e7 # 4.5e9 # Output timesteps (assuming in body files) - -# Some options are only permitted in the primary file, some are forbidden. -# That should really be documented! diff --git a/tests/Status/BP_Status/semi_a7/vplanet_log b/tests/Status/BP_Status/semi_a7/vplanet_log deleted file mode 100644 index cde57fa..0000000 --- a/tests/Status/BP_Status/semi_a7/vplanet_log +++ /dev/null @@ -1,33 +0,0 @@ -INFO: sUnitMass set in vpl.in, all bodies will use this unit. -INFO: sUnitTime set in vpl.in, all bodies will use this unit. -INFO: sUnitAngle set in vpl.in, all bodies will use this unit. -INFO: sUnitLength set in vpl.in, all bodies will use this unit. -INFO: sUnitTemp set in vpl.in, all bodies will use this unit. -INFO: dMass < 0 in file earth.in, units assumed to be Mearth. -INFO: dRadius < 0 in file earth.in, units assumed to be Rearth. -INFO: dRotPeriod < 0 in file earth.in, units assumed to be Days. -INFO: d40KPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d40KPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d232ThPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerMan < 0 in file earth.in, units assumed to be Primoridal Earth Units. -INFO: d235UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d235UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerMan < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCore < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: d238UPowerCrust < 0 in file earth.in, units assumed to be Primordial Earth Units. -INFO: sOutFile not set, defaulting to earth.sun.forward. -INFO: sOutFile not set, defaulting to earth.earth.forward. -INFO: sIntegrationMethod not set, defaulting to Runge-Kutta4. -INFO: No rotational information set in file sun.in. Defaulting to dRotRate = 2*pi/day. -INFO: DeltaTime output for first step is defined to be 0 when bVarDt = 1. -Input files read. -All of sun's modules verified. -All of earth's modules verified. -Input files verified. -Log file written. -Evolution completed. -Log file updated. -Simulation completed. diff --git a/tests/Status/__init__.py b/tests/Status/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/Status/__init__.py +++ b/tests/Status/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/Status/test_Status.py b/tests/Status/test_Status.py index 4c2eca6..1b40e8c 100644 --- a/tests/Status/test_Status.py +++ b/tests/Status/test_Status.py @@ -38,7 +38,8 @@ def test_bpstatus(): subprocess.check_output(["multiplanet", "vspace.in"], cwd=path) # Run bigplanet - subprocess.check_output(["bigplanet", "-ignorecorrupt", "bpl.in", "-a"], cwd=path) +# subprocess.check_output(["bigplanet", "-ignorecorrupt", "bpl.in", "-a"], cwd=path) + subprocess.check_output(["bigplanet", "bpl.in", "-a"], cwd=path) subprocess.check_output(["bpstatus", "vspace.in"], cwd=path) file = path / "BP_Status.bpa" @@ -46,6 +47,11 @@ def test_bpstatus(): # checks if the bpl files exist assert os.path.isfile(file) == True + shutil.rmtree(path / "BP_Status") + os.remove(path / ".BP_Status") + os.remove(path / ".BP_Status_BPL") + os.remove(path / "BP_Status.bpa") + os.remove(path / "BP_Status.md5") if __name__ == "__main__": test_bpstatus() diff --git a/tests/UlyssesAggregated/__init__.py b/tests/UlyssesAggregated/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/UlyssesAggregated/__init__.py +++ b/tests/UlyssesAggregated/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/UlyssesAggregated/test_UlyssesAggregated.py b/tests/UlyssesAggregated/test_UlyssesAggregated.py index 0689416..1f3c122 100644 --- a/tests/UlyssesAggregated/test_UlyssesAggregated.py +++ b/tests/UlyssesAggregated/test_UlyssesAggregated.py @@ -7,7 +7,7 @@ import warnings import shutil import numpy as np -import bigplanet.bp_extract as bp +import bigplanet.extract as bp def test_UlyssesAggregated(): @@ -50,6 +50,9 @@ def test_UlyssesAggregated(): float(data["earth:Instellation:final"][0]), 1367.635318 ) + shutil.rmtree(path / "BP_Extract") + os.remove(path / ".BP_Extract") + os.remove(path / "User.csv") if __name__ == "__main__": test_UlyssesAggregated() diff --git a/tests/UlyssesForward/__init__.py b/tests/UlyssesForward/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/UlyssesForward/__init__.py +++ b/tests/UlyssesForward/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import * diff --git a/tests/UlyssesForward/test_UlyssesForward.py b/tests/UlyssesForward/test_UlyssesForward.py index ba8498b..8f28320 100644 --- a/tests/UlyssesForward/test_UlyssesForward.py +++ b/tests/UlyssesForward/test_UlyssesForward.py @@ -49,6 +49,9 @@ def test_UlyssesForward(): assert np.isclose(value, 4999.131849) + shutil.rmtree(path / "BP_Extract") + os.remove(path / ".BP_Extract") + os.remove(path / "User.csv") if __name__ == "__main__": test_UlyssesForward() diff --git a/tests/__init__.py b/tests/__init__.py index 6fdd258..9668bb6 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -13,5 +13,5 @@ __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)" __copyright__ = "Copyright 2020 Caitlyn Wilhelm" -from bigplanet.bp_extract import * +from bigplanet.extract import * from bigplanet import *