Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deleted simple model and restructure Yukawa #315

Merged
merged 11 commits into from
Oct 24, 2024
Merged

Deleted simple model and restructure Yukawa #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4273e27
changed M from 50 to 20 to speed up computation
jorindevandevis Oct 21, 2024
3dbaaee
made a simpler version of the Yukawa model
jorindevandevis Oct 21, 2024
eb72a72
file with collision generation
jorindevandevis Oct 21, 2024
00394ba
ran black and replaced addOrModify with add
jorindevandevis Oct 21, 2024
6d57195
Delete simple model
jorindevandevis Oct 21, 2024
09bb2a4
Load the Yukawa config file
benoitlaurent96 Oct 22, 2024
4c8dd91
removed comments at the end of yukawa.py
jorindevandevis Oct 23, 2024
66a4f21
Merge branch 'main' into deleteSimpleModel
jorindevandevis Oct 24, 2024
77d5daa
use default logging and added explicit configuration options
jorindevandevis Oct 24, 2024
c898c34
Merge branch 'main' into deleteSimpleModel
jorindevandevis Oct 24, 2024
fc6649e
deleted config file and added comments explaining modified config params
jorindevandevis Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 9 additions & 179 deletions Models/Yukawa/yukawa.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,15 @@ def main() -> None:

manager = WallGo.WallGoManager()

# Change the amount of grid points in the spatial coordinates
# for faster computations
manager.config.configGrid.spatialGridSize = 20
# Increase the number of iterations in the wall solving to
# ensure convergence
manager.config.configEOM.maxIterations = 25
# Decrease error tolerance for phase tracing to ensure stability
manager.config.configThermodynamics.phaseTracerTol = 1e-8

pathtoCollisions = pathlib.Path(__file__).resolve().parent / pathlib.Path(
f"CollisionOutput_N11"
)
Expand Down Expand Up @@ -218,182 +227,3 @@ def main() -> None:
## Don't run the main function if imported to another file
if __name__ == "__main__":
main()


# class YukawaModelExample(WallGoExampleBase):
# """
# Sets up the Yukawa model, computes or loads the collison
# integrals, and computes the wall velocity.
# """

# def __init__(self) -> None:
# """"""
# self.bShouldRecalculateMatrixElements = False

# self.bShouldRecalculateCollisions = False

# self.matrixElementFile = pathlib.Path(
# self.exampleBaseDirectory
# / "MatrixElements/MatrixElements_Yukawa.json"
# )

# def initWallGoModel(self) -> "WallGo.GenericModel":
# """
# Initialize the model. This should run after cmdline argument parsing
# so safe to use them here.
# """
# return YukawaModel()

# def initCollisionModel(
# self, wallGoModel: "YukawaModel"
# ) -> "WallGoCollision.PhysicsModel":
# """Initialize the Collision model and set the seed."""

# import WallGoCollision # pylint: disable = C0415

# # Collision integrations utilize Monte Carlo methods, so RNG is involved.
# # We can set the global seed for collision integrals as follows.
# # This is optional; by default the seed is 0.
# WallGoCollision.setSeed(0)

# collisionModelDefinition = (
# WallGo.collisionHelpers.generateCollisionModelDefinition(wallGoModel)
# )

# # Add in-equilibrium particles that appear in collision processes
# phiParticle = WallGoCollision.ParticleDescription()
# phiParticle.name = "phi"
# phiParticle.index = 0
# phiParticle.bInEquilibrium = True
# phiParticle.bUltrarelativistic = True
# phiParticle.type = WallGoCollision.EParticleType.eBoson
# # mass-sq function not required or used for UR particles,
# # and it cannot be field-dependent for collisions.
# # Backup of what the vacuum mass was intended to be:
# """
# msqVacuum=lambda fields: (
# msq + g * fields.getField(0) + lam / 2 * fields.getField(0) ** 2
# ),
# """

# parameters = WallGoCollision.ModelParameters()

# parameters.addOrModifyParameter("y", wallGoModel.modelParameters["y"])
# parameters.addOrModifyParameter("gamma", wallGoModel.modelParameters["gamma"])
# parameters.addOrModifyParameter("lam", wallGoModel.modelParameters["lam"])
# parameters.addOrModifyParameter("v", 0.0)

# parameters.addOrModifyParameter(
# "mf2", 1 / 16 * wallGoModel.modelParameters["y"] ** 2
# ) # phi thermal mass^2 in units of T
# parameters.addOrModifyParameter(
# "ms2",
# + wallGoModel.modelParameters["lam"] / 24.0
# + wallGoModel.modelParameters["y"] ** 2.0 / 6.0,
# ) # psi thermal mass^2 in units of T

# collisionModelDefinition.defineParticleSpecies(phiParticle)
# collisionModelDefinition.defineParameters(parameters)

# collisionModel = WallGoCollision.PhysicsModel(collisionModelDefinition)

# return collisionModel

# def configureCollisionIntegration(
# self, inOutCollisionTensor: "WallGoCollision.CollisionTensor"
# ) -> None:
# """Non-abstract override"""

# import WallGoCollision # pylint: disable = C0415

# """We can also configure various verbosity settings that are useful when
# you want to see what is going on in long-running integrations. These
# include progress reporting and time estimates, as well as a full result dump
# of each individual integral to stdout. By default these are all disabled.
# Here we enable some for demonstration purposes.
# """
# verbosity = WallGoCollision.CollisionTensorVerbosity()
# verbosity.bPrintElapsedTime = (
# True # report total time when finished with all integrals
# )

# """Progress report when this percentage of total integrals (approximately)
# have been computed. Note that this percentage is per-particle-pair, ie.
# each (particle1, particle2) pair reports when this percentage of their
# own integrals is done. Note also that in multithreaded runs the
# progress tracking is less precise.
# """
# verbosity.progressReportPercentage = 0.25

# # Print every integral result to stdout? This is very slow and
# # verbose, intended only for debugging purposes
# verbosity.bPrintEveryElement = False

# inOutCollisionTensor.setIntegrationVerbosity(verbosity)

# def configureManager(self, inOutManager: "WallGo.WallGoManager") -> None:
# inOutManager.config.loadConfigFromFile(
# pathlib.Path(self.exampleBaseDirectory / "yukawaConfig.ini")
# )
# super().configureManager(inOutManager)

# def updateModelParameters(
# self, model: "YukawaModel", inputParameters: dict[str, float]
# ) -> None:
# """Update internal model parameters. This example is constructed so
# that the effective potential and particle mass functions refer to
# model.modelParameters, so be careful not to replace that reference here.
# """

# # oldParams = model.modelParameters.copy()
# model.updateModel(inputParameters)

# def getBenchmarkPoints(self) -> list[ExampleInputPoint]:
# """
# Input parameters, phase info, and settings for the effective potential and
# wall solver for the Yukawa benchmark point.
# """

# output: list[ExampleInputPoint] = []
# output.append(
# ExampleInputPoint(
# {
# "sigma": 0.0,
# "msq": 1.0,
# "gamma": -1.2,
# "lam": 0.10,
# "y": 0.55,
# "mf": 0.30,
# },
# WallGo.PhaseInfo(
# temperature=8.0, # nucleation temperature
# phaseLocation1=WallGo.Fields([0.4]),
# phaseLocation2=WallGo.Fields([27.0]),
# ),
# WallGo.VeffDerivativeSettings(
# temperatureVariationScale=1.0,
# fieldValueVariationScale=[
# 100.0,
# ],
# ),
# WallGo.WallSolverSettings(
# # we actually do both cases in the common example
# bIncludeOffEquilibrium=True,
# # meanFreePathScale is determined here by the annihilation channels,
# # and scales inversely with y^4 or lam^2. This is why
# # meanFreePathScale has to be so large.
# meanFreePathScale=10000.0, # In units of 1/Tnucl
# wallThicknessGuess=10.0, # In units of 1/Tnucl
# ),
# )
# )

# return output

# # ~ End WallGoExampleBase interface


# if __name__ == "__main__":

# example = YukawaModelExample()
# example.runExample()
95 changes: 0 additions & 95 deletions Models/Yukawa/yukawaConfig.ini
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions Models/Yukawa/yukawaWithCollisionGeneration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,18 @@ def configureCollisionIntegration(
inOutCollisionTensor.setIntegrationVerbosity(verbosity)

def configureManager(self, inOutManager: "WallGo.WallGoManager") -> None:
inOutManager.config.loadConfigFromFile(
pathlib.Path(self.exampleBaseDirectory / "yukawaConfig.ini")
)

super().configureManager(inOutManager)

# Change the amount of grid points in the spatial coordinates
# for faster computations
inOutManager.config.configGrid.spatialGridSize = 20
# Increase the number of iterations in the wall solving to
# ensure convergence
inOutManager.config.configEOM.maxIterations = 25
# Decrease error tolerance for phase tracing to ensure stability
inOutManager.config.configThermodynamics.phaseTracerTol = 1e-8

def updateModelParameters(
self, model: "YukawaModel", inputParameters: dict[str, float]
) -> None:
Expand Down
Loading