[Yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new changesets in yt:

http://bitbucket.org/yt_analysis/yt/changeset/28d11480dac5/
changeset:   r3819:28d11480dac5
branch:      yt
user:        sklemer
date:        2011-03-14 18:01:14
summary:     Parse comoving variables from castro
affected #:  2 files (1.3 KB)

--- a/yt/frontends/orion/data_structures.py	Sun Mar 13 20:11:53 2011 -0600
+++ b/yt/frontends/orion/data_structures.py	Mon Mar 14 18:01:14 2011 +0100
@@ -470,6 +470,7 @@
         self.parameters["Time"] = 1. # default unit is 1...
         self.parameters["DualEnergyFormalism"] = 0 # always off.
         self.parameters["EOSType"] = -1 # default
+
         if self.fparameters.has_key("mu"):
             self.parameters["mu"] = self.fparameters["mu"]
 
@@ -504,6 +505,9 @@
                 self.fparameter_filename, 'probin')
         if os.path.isfile(self.fparameter_filename):
             self._parse_fparameter_file()
+            for param in self.fparameters:
+                if orion2enzoDict.has_key(param):
+                    self.parameters[orion2enzoDict[param]]=self.fparameters[param]
         # Let's read the file
         self.unique_identifier = \
             int(os.stat(self.parameter_filename)[ST_CTIME])
@@ -540,6 +544,20 @@
         self.dimensionality = self.parameters["TopGridRank"]
         self.domain_dimensions = self.parameters["TopGridDimensions"]
         self.refine_by = self.parameters["RefineBy"]
+        self.parameters["ComovingCoordinates"] = bool(self.parameters["ComovingCoordinates"])
+        if self.parameters["ComovingCoordinates"]:
+            self.cosmological_simulation = 1
+            self.omega_lambda = self.parameters["CosmologyOmegaLambdaNow"]
+            self.omega_matter = self.parameters["CosmologyOmegaMatterNow"]
+            self.hubble_constant = self.parameters["CosmologyHubbleConstantNow"]
+            a_file = open(os.path.join(self.fullplotdir,'comoving_a'))
+            line = a_file.readline().strip()
+            a_file.close()
+            self.parameters["CosmologyCurrentRedshift"] = 1/float(line) - 1
+            self.current_redshift = self.parameters["CosmologyCurrentRedshift"]
+        else:
+            self.current_redshift = self.omega_lambda = self.omega_matter = \
+                self.hubble_constant = self.cosmological_simulation = 0.0
 
     def _parse_fparameter_file(self):
         """
@@ -574,6 +592,7 @@
         n_fields = int(lines[1])
         self.current_time = float(lines[3+n_fields])
 
+
                 
     def _set_units(self):
         """


--- a/yt/frontends/orion/definitions.py	Sun Mar 13 20:11:53 2011 -0600
+++ b/yt/frontends/orion/definitions.py	Mon Mar 14 18:01:14 2011 +0100
@@ -63,7 +63,12 @@
 # throughout the code. key is Orion name, value is Enzo/yt equivalent
 orion2enzoDict = {"amr.n_cell": "TopGridDimensions",
                   "materials.gamma": "Gamma",
-                  "amr.ref_ratio": "RefineBy"
+                  "amr.ref_ratio": "RefineBy",
+                  "castro.use_comoving": "ComovingCoordinates",
+                  "castro.redshift_in": "CosmologyInitialRedshift",
+                  "comoving_OmL": "CosmologyOmegaLambdaNow",
+                  "comoving_OmM": "CosmologyOmegaMatterNow",
+                  "comoving_h": "CosmologyHubbleConstantNow"
                   }
 
 yt2orionFieldsDict = {}


http://bitbucket.org/yt_analysis/yt/changeset/d55a194ed202/
changeset:   r3820:d55a194ed202
branch:      yt
user:        sklemer
date:        2011-03-14 18:21:45
summary:     Fix for non-comoving simulations
affected #:  1 file (36 bytes)

--- a/yt/frontends/orion/data_structures.py	Mon Mar 14 18:01:14 2011 +0100
+++ b/yt/frontends/orion/data_structures.py	Mon Mar 14 18:21:45 2011 +0100
@@ -544,8 +544,8 @@
         self.dimensionality = self.parameters["TopGridRank"]
         self.domain_dimensions = self.parameters["TopGridDimensions"]
         self.refine_by = self.parameters["RefineBy"]
-        self.parameters["ComovingCoordinates"] = bool(self.parameters["ComovingCoordinates"])
-        if self.parameters["ComovingCoordinates"]:
+
+        if self.parameters.has_key("ComovingCoordinates") and bool(self.parameters["ComovingCoordinates"]):
             self.cosmological_simulation = 1
             self.omega_lambda = self.parameters["CosmologyOmegaLambdaNow"]
             self.omega_matter = self.parameters["CosmologyOmegaMatterNow"]

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.