[yt-svn] commit/yt-3.0: 3 new changesets

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Tue Nov 5 13:20:21 PST 2013


3 new commits in yt-3.0:

https://bitbucket.org/yt_analysis/yt-3.0/commits/476873d72b74/
Changeset:   476873d72b74
Branch:      yt-3.0
User:        ChrisMalone
Date:        2013-11-04 19:03:09
Summary:     properly catch Maestro files
Affected #:  1 file

diff -r 0ca385183a06b5fd4057a139ccc7e29db348124d -r 476873d72b746a2cac6e565cae70305c1a1f343f yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -717,12 +717,11 @@
                             args['fparam_filename'])
         if not os.path.exists(jobinfo_filename):
             return False
-        if not os.path.exists(fparam_filename):
+        if os.path.exists(fparam_filename):
             return False
-        # Now we check for all the others
+        # Now we check the job_info for the mention of maestro
         lines = open(jobinfo_filename).readlines()
-        # Maestro outputs have "Castro" in them
-        if any(line.startswith("Castro   ") for line in lines): return True
+        if any("maestro" in line.lower() for line in lines): return True
         return False
 
 


https://bitbucket.org/yt_analysis/yt-3.0/commits/d0c398ddec51/
Changeset:   d0c398ddec51
Branch:      yt-3.0
User:        ChrisMalone
Date:        2013-11-04 19:24:42
Summary:     actually, Castro and Maestro don't care about an fparam file
Affected #:  1 file

diff -r 476873d72b746a2cac6e565cae70305c1a1f343f -r d0c398ddec51ac01d55d95e0257148ec5b884569 yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -685,15 +685,8 @@
         if not os.path.exists(header_filename):
             # We *know* it's not boxlib if Header doesn't exist.
             return False
-        args = inspect.getcallargs(cls.__init__, args, kwargs)
-        # This might need to be localized somehow
-        fparam_filename = os.path.join(
-                            os.path.dirname(os.path.abspath(output_dir)),
-                            args['fparam_filename'])
         if not os.path.exists(jobinfo_filename):
             return False
-        if os.path.exists(fparam_filename):
-            return False
         # Now we check for all the others
         lines = open(jobinfo_filename).readlines()
         if any(line.startswith("Castro   ") for line in lines): return True
@@ -710,15 +703,8 @@
         if not os.path.exists(header_filename):
             # We *know* it's not boxlib if Header doesn't exist.
             return False
-        args = inspect.getcallargs(cls.__init__, args, kwargs)
-        # This might need to be localized somehow
-        fparam_filename = os.path.join(
-                            os.path.dirname(os.path.abspath(output_dir)),
-                            args['fparam_filename'])
         if not os.path.exists(jobinfo_filename):
             return False
-        if os.path.exists(fparam_filename):
-            return False
         # Now we check the job_info for the mention of maestro
         lines = open(jobinfo_filename).readlines()
         if any("maestro" in line.lower() for line in lines): return True


https://bitbucket.org/yt_analysis/yt-3.0/commits/67fab8ea9ea6/
Changeset:   67fab8ea9ea6
Branch:      yt-3.0
User:        ChrisMalone
Date:        2013-11-04 19:28:35
Summary:     make sure Orion isn't confused with Maestro
Affected #:  1 file

diff -r d0c398ddec51ac01d55d95e0257148ec5b884569 -r 67fab8ea9ea6841dae5b9000537f2ed4575fff3d yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -671,6 +671,7 @@
         lines = open(inputs_filename).readlines()
         if any(("castro." in line for line in lines)): return False
         if any(("nyx." in line for line in lines)): return False
+        if any(("maestro" in line.lower() for line in lines)): return False
         if any(("geometry.prob_lo" in line for line in lines)): return True
         return False

Repository URL: https://bitbucket.org/yt_analysis/yt-3.0/

--

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