[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Apr 15 14:11:14 PDT 2014
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/e7447fcd27a7/
Changeset: e7447fcd27a7
Branch: yt-3.0
User: mzingale
Date: 2014-04-15 21:14:57
Summary: Maestro changes: some more variable names for velocities
(mostly full state), and add the git hashes for the various
code pieces to the parameters. Also, set the default
HydroMethod parameter to Maestro.
Affected #: 2 files
diff -r b77623d7526ed785f1e71651ee98000657d8da56 -r e7447fcd27a7da944037d9de0b91651090b45658 yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -391,12 +391,14 @@
Dataset.__init__(self, output_dir, dataset_type)
# These are still used in a few places.
- self.parameters["HydroMethod"] = 'boxlib'
+ if not "HydroMethod" in self.parameters.keys():
+ self.parameters["HydroMethod"] = 'boxlib'
self.parameters["Time"] = 1. # default unit is 1...
self.parameters["EOSType"] = -1 # default
self.parameters["gamma"] = self.parameters.get(
"materials.gamma", 1.6667)
+
def _localize_check(self, fn):
# If the file exists, use it. If not, set it to None.
root_dir = os.path.dirname(self.output_dir)
@@ -768,13 +770,21 @@
line = ""
with open(jobinfo_filename, "r") as f:
while not line.startswith(" [*] indicates overridden default"):
+ # get the code git hashes
+ if "git hash" in line:
+ # line format: codename git hash: the-hash
+ fields = line.split(":")
+ self.parameters[fields[0]] = fields[1].strip()
line = f.next()
+ # get the runtime parameters
for line in f:
p, v = (_.strip() for _ in line[4:].split("="))
if len(v) == 0:
self.parameters[p] = ""
else:
self.parameters[p] = _guess_pcast(v)
+ # hydro method is set by the base class -- override it here
+ self.parameters["HydroMethod"] = "Maestro"
# set the periodicity based on the integer BC runtime parameters
periodicity = [True, True, True]
diff -r b77623d7526ed785f1e71651ee98000657d8da56 -r e7447fcd27a7da944037d9de0b91651090b45658 yt/frontends/boxlib/fields.py
--- a/yt/frontends/boxlib/fields.py
+++ b/yt/frontends/boxlib/fields.py
@@ -118,10 +118,10 @@
known_other_fields = (
("density", ("g/cm**3", ["density"], None)),
- ("x_vel", ("cm/s", ["velocity_x"], None)),
- ("y_vel", ("cm/s", ["velocity_y"], None)),
- ("z_vel", ("cm/s", ["velocity_z"], None)),
- ("magvel", ("cm/s", ["velocity_magnitude"], None)),
+ ("x_vel", ("cm/s", ["velocity_x"], r"\tilde{u}")),
+ ("y_vel", ("cm/s", ["velocity_y"], r"\tilde{v}")),
+ ("z_vel", ("cm/s", ["velocity_z"], r"\tilde{w}")),
+ ("magvel", ("cm/s", ["velocity_magnitude"], r"|\tilde{U} + w_0 e_r|")),
("tfromp", ("K", [], None)),
("tfromh", ("K", [], None)),
("Machnumber", ("", ["mach_number"], None)),
https://bitbucket.org/yt_analysis/yt/commits/5acca4b24803/
Changeset: 5acca4b24803
Branch: yt-3.0
User: MatthewTurk
Date: 2014-04-15 23:11:07
Summary: Merged in mzingale/yt/yt-3.0 (pull request #822)
Maestro changes: some more variable names for velocities
Affected #: 2 files
diff -r 8c3d54b7ef018f70667fa928f34208cd13f5dbf7 -r 5acca4b24803da91accfcb8937aed96432fe7edd yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -391,12 +391,14 @@
Dataset.__init__(self, output_dir, dataset_type)
# These are still used in a few places.
- self.parameters["HydroMethod"] = 'boxlib'
+ if not "HydroMethod" in self.parameters.keys():
+ self.parameters["HydroMethod"] = 'boxlib'
self.parameters["Time"] = 1. # default unit is 1...
self.parameters["EOSType"] = -1 # default
self.parameters["gamma"] = self.parameters.get(
"materials.gamma", 1.6667)
+
def _localize_check(self, fn):
# If the file exists, use it. If not, set it to None.
root_dir = os.path.dirname(self.output_dir)
@@ -768,13 +770,21 @@
line = ""
with open(jobinfo_filename, "r") as f:
while not line.startswith(" [*] indicates overridden default"):
+ # get the code git hashes
+ if "git hash" in line:
+ # line format: codename git hash: the-hash
+ fields = line.split(":")
+ self.parameters[fields[0]] = fields[1].strip()
line = f.next()
+ # get the runtime parameters
for line in f:
p, v = (_.strip() for _ in line[4:].split("="))
if len(v) == 0:
self.parameters[p] = ""
else:
self.parameters[p] = _guess_pcast(v)
+ # hydro method is set by the base class -- override it here
+ self.parameters["HydroMethod"] = "Maestro"
# set the periodicity based on the integer BC runtime parameters
periodicity = [True, True, True]
diff -r 8c3d54b7ef018f70667fa928f34208cd13f5dbf7 -r 5acca4b24803da91accfcb8937aed96432fe7edd yt/frontends/boxlib/fields.py
--- a/yt/frontends/boxlib/fields.py
+++ b/yt/frontends/boxlib/fields.py
@@ -118,10 +118,10 @@
known_other_fields = (
("density", ("g/cm**3", ["density"], None)),
- ("x_vel", ("cm/s", ["velocity_x"], None)),
- ("y_vel", ("cm/s", ["velocity_y"], None)),
- ("z_vel", ("cm/s", ["velocity_z"], None)),
- ("magvel", ("cm/s", ["velocity_magnitude"], None)),
+ ("x_vel", ("cm/s", ["velocity_x"], r"\tilde{u}")),
+ ("y_vel", ("cm/s", ["velocity_y"], r"\tilde{v}")),
+ ("z_vel", ("cm/s", ["velocity_z"], r"\tilde{w}")),
+ ("magvel", ("cm/s", ["velocity_magnitude"], r"|\tilde{U} + w_0 e_r|")),
("tfromp", ("K", [], None)),
("tfromh", ("K", [], None)),
("Machnumber", ("", ["mach_number"], None)),
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list