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

[commits-noreply at bitbucket.org]

4 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/548748492937/
Changeset:   548748492937
User:        dwillcox
Date:        2017-11-13 03:48:16+00:00
Summary:     Fix _guess_pcast bug in boxlib frontend with boolean parameter casting.
Affected #:  1 file

diff -r 76d8412d2fed58cb0a7ce232849519fe3177c7bb -r 548748492937dfaa8b494f7780990a954b0ed7dc yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -1326,7 +1326,10 @@
             pcast = float
         else:
             pcast = int
-    vals = [pcast(value) for value in vals.split()]
+    if pcast == bool:
+        vals = [value=="T" for value in vals.split()]
+    else:
+        vals = [pcast(value) for value in vals.split()]
     if len(vals) == 1:
         vals = vals[0]
     return vals


https://bitbucket.org/yt_analysis/yt/commits/09fe12170542/
Changeset:   09fe12170542
User:        dwillcox
Date:        2017-11-13 23:04:41+00:00
Summary:     Added a test for parameters and types for a Maestro dataset.
Affected #:  1 file

diff -r 548748492937dfaa8b494f7780990a954b0ed7dc -r 09fe12170542138beddd24fcabea80808979763f yt/frontends/boxlib/tests/test_outputs.py
--- a/yt/frontends/boxlib/tests/test_outputs.py
+++ b/yt/frontends/boxlib/tests/test_outputs.py
@@ -26,7 +26,8 @@
     OrionDataset, \
     NyxDataset, \
     WarpXDataset, \
-    CastroDataset
+    CastroDataset, \
+    MaestroDataset
 import numpy as np    
 
 # We don't do anything needing ghost zone generation right now, because these
@@ -269,3 +270,31 @@
 
     ds = data_dir_load(nyx_no_particles)
     assert_equal(sorted(ds.field_list), fields)
+
+msubch = 'maestro_subCh_plt00248'
+ at requires_file(msubch)
+def test_maestro_bool_parameters():
+    assert isinstance(data_dir_load(msubch), MaestroDataset)
+    ds = data_dir_load(msubch)
+
+    # Check a string parameter
+    assert(ds.parameters['plot_base_name']=="subCh_hot_baserun_plt")
+    assert(type(ds.parameters['plot_base_name']) is str)
+
+    # Check boolean parameters: T or F
+    assert(ds.parameters['use_thermal_diffusion'] is False)
+    assert(type(ds.parameters['use_thermal_diffusion']) is bool)
+
+    assert(ds.parameters['do_burning'] is True)
+    assert(type(ds.parameters['do_burning']) is bool)
+
+    # Check a float parameter with a decimal point
+    assert(ds.parameters['sponge_kappa']==float('10.00000000'))
+    assert(type(ds.parameters['sponge_kappa']) is float)
+
+    # Check a float parameter with E exponent notation
+    assert(ds.parameters['small_dt']==float('0.1000000000E-09'))
+
+    # Check an int parameter
+    assert(ds.parameters['s0_interp_type']==3)
+    assert(type(ds.parameters['s0_interp_type']) is int)


https://bitbucket.org/yt_analysis/yt/commits/f484b70855e0/
Changeset:   f484b70855e0
User:        dwillcox
Date:        2017-11-13 23:12:41+00:00
Summary:     Renamed test function - it tests more than boolean parameters.
Affected #:  1 file

diff -r 09fe12170542138beddd24fcabea80808979763f -r f484b70855e06e41fbf910115db8b30d372238ac yt/frontends/boxlib/tests/test_outputs.py
--- a/yt/frontends/boxlib/tests/test_outputs.py
+++ b/yt/frontends/boxlib/tests/test_outputs.py
@@ -273,7 +273,7 @@
 
 msubch = 'maestro_subCh_plt00248'
 @requires_file(msubch)
-def test_maestro_bool_parameters():
+def test_maestro_parameters():
     assert isinstance(data_dir_load(msubch), MaestroDataset)
     ds = data_dir_load(msubch)
 


https://bitbucket.org/yt_analysis/yt/commits/dca5e454d03e/
Changeset:   dca5e454d03e
User:        atmyers
Date:        2017-11-14 01:05:19+00:00
Summary:     Merge pull request #1619 from dwillcox/boxlib-pcast-fix

Fix _guess_pcast bug in boxlib frontend with boolean parameter casting.
Affected #:  2 files

diff -r 54cd1adee59e22c8dea3997c8c2626c64a563f84 -r dca5e454d03e59c1f9ab4a52301e74dc12f245e7 yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -1326,7 +1326,10 @@
             pcast = float
         else:
             pcast = int
-    vals = [pcast(value) for value in vals.split()]
+    if pcast == bool:
+        vals = [value=="T" for value in vals.split()]
+    else:
+        vals = [pcast(value) for value in vals.split()]
     if len(vals) == 1:
         vals = vals[0]
     return vals

diff -r 54cd1adee59e22c8dea3997c8c2626c64a563f84 -r dca5e454d03e59c1f9ab4a52301e74dc12f245e7 yt/frontends/boxlib/tests/test_outputs.py
--- a/yt/frontends/boxlib/tests/test_outputs.py
+++ b/yt/frontends/boxlib/tests/test_outputs.py
@@ -26,7 +26,8 @@
     OrionDataset, \
     NyxDataset, \
     WarpXDataset, \
-    CastroDataset
+    CastroDataset, \
+    MaestroDataset
 import numpy as np    
 
 # We don't do anything needing ghost zone generation right now, because these
@@ -269,3 +270,31 @@
 
     ds = data_dir_load(nyx_no_particles)
     assert_equal(sorted(ds.field_list), fields)
+
+msubch = 'maestro_subCh_plt00248'
+ at requires_file(msubch)
+def test_maestro_parameters():
+    assert isinstance(data_dir_load(msubch), MaestroDataset)
+    ds = data_dir_load(msubch)
+
+    # Check a string parameter
+    assert(ds.parameters['plot_base_name']=="subCh_hot_baserun_plt")
+    assert(type(ds.parameters['plot_base_name']) is str)
+
+    # Check boolean parameters: T or F
+    assert(ds.parameters['use_thermal_diffusion'] is False)
+    assert(type(ds.parameters['use_thermal_diffusion']) is bool)
+
+    assert(ds.parameters['do_burning'] is True)
+    assert(type(ds.parameters['do_burning']) is bool)
+
+    # Check a float parameter with a decimal point
+    assert(ds.parameters['sponge_kappa']==float('10.00000000'))
+    assert(type(ds.parameters['sponge_kappa']) is float)
+
+    # Check a float parameter with E exponent notation
+    assert(ds.parameters['small_dt']==float('0.1000000000E-09'))
+
+    # Check an int parameter
+    assert(ds.parameters['s0_interp_type']==3)
+    assert(type(ds.parameters['s0_interp_type']) is int)

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.