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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/a362b888783d/
Changeset:   a362b888783d
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-07-22 23:18:01
Summary:     Switching to UUIDs for Enzo.  Closes #353.
Affected #:  1 file

diff -r 3c4dc9e27719f260e29bcbc6ad18c4a3601ed1f9 -r a362b888783de98a8e4159baa5cb6cb46f4bb601 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -738,8 +738,6 @@
         dictionaries.
         """
         # Let's read the file
-        self.unique_identifier = \
-            int(os.stat(self.parameter_filename)[stat.ST_CTIME])
         with open(self.parameter_filename, "r") as f:
             line = f.readline().strip() 
             f.seek(0)
@@ -826,6 +824,13 @@
         self.periodicity = ensure_tuple(
             self.parameters["LeftFaceBoundaryCondition"] == 3)
         self.dimensionality = self.parameters["TopGridRank"]
+        if "MetaDataDatasetUUID" in self.parameters:
+            self.unique_identifier = self.parameters["MetaDataDatasetUUID"]
+        elif "CurrentTimeIdentifier" in self.parameters:
+            self.unique_identifier = self.parameters["CurrentTimeIdentifier"]
+        else:
+            self.unique_identifier = \
+                int(os.stat(self.parameter_filename)[stat.ST_CTIME])
         if self.dimensionality > 1:
             self.domain_dimensions = self.parameters["TopGridDimensions"]
             if len(self.domain_dimensions) < 3:


https://bitbucket.org/yt_analysis/yt/commits/f8f6cf1c1415/
Changeset:   f8f6cf1c1415
Branch:      yt-3.0
User:        brittonsmith
Date:        2014-07-24 12:18:21
Summary:     Merged in MatthewTurk/yt/yt-3.0 (pull request #1056)

Switching to UUIDs for Enzo.  Closes #353.
Affected #:  1 file

diff -r 9e7fefe0865b1cc5bb6d26b25b9d6009d562ef6d -r f8f6cf1c1415a65032655b9b85f7e52eff1afef4 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -738,8 +738,6 @@
         dictionaries.
         """
         # Let's read the file
-        self.unique_identifier = \
-            int(os.stat(self.parameter_filename)[stat.ST_CTIME])
         with open(self.parameter_filename, "r") as f:
             line = f.readline().strip() 
             f.seek(0)
@@ -826,6 +824,13 @@
         self.periodicity = ensure_tuple(
             self.parameters["LeftFaceBoundaryCondition"] == 3)
         self.dimensionality = self.parameters["TopGridRank"]
+        if "MetaDataDatasetUUID" in self.parameters:
+            self.unique_identifier = self.parameters["MetaDataDatasetUUID"]
+        elif "CurrentTimeIdentifier" in self.parameters:
+            self.unique_identifier = self.parameters["CurrentTimeIdentifier"]
+        else:
+            self.unique_identifier = \
+                int(os.stat(self.parameter_filename)[stat.ST_CTIME])
         if self.dimensionality > 1:
             self.domain_dimensions = self.parameters["TopGridDimensions"]
             if len(self.domain_dimensions) < 3:

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.