[yt-svn] commit/yt: 4 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Jun 7 13:54:43 PDT 2017
4 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/e8a11e72f1b3/
Changeset: e8a11e72f1b3
User: Yinghe Lu
Date: 2017-06-07 00:13:58+00:00
Summary: minor updates to read boxlib data
Affected #: 2 files
diff -r 662fdbe5331ad344f09868c8115f697e5a3bae62 -r e8a11e72f1b3ebcebddd09a52bc10292666f4c1e yt/frontends/boxlib/1
--- /dev/null
+++ b/yt/frontends/boxlib/1
@@ -0,0 +1,86 @@
+class AMReXParticleHeader(object):
+
+ def __init__(self, ds, directory_name, is_checkpoint,
+ extra_field_names=None):
+
+ self.particle_type = directory_name
+ header_filename = ds.output_dir + "/" + directory_name + "/Header"
+ self.real_component_names = []
+ self.int_component_names = []
+ with open(header_filename, "r") as f:
+ self.version_string = f.readline().strip()
+
+ particle_real_type = self.version_string.split('_')[-1]
+ particle_real_type = self.version_string.split('_')[-1]
+ if particle_real_type == 'double':
+ self.real_type = np.float64
+ elif particle_real_type == 'single':
+ self.real_type = np.float32
+ else:
+ raise RuntimeError("yt did not recognize particle real type.")
+ self.int_type = np.int32
+
+ self.dim = int(f.readline().strip())
+ self.num_int_base = 2
+ self.num_real_base = self.dim
+ self.num_real_extra = int(f.readline().strip())
+ for i in range(self.num_real_extra):
+ self.real_component_names.append(f.readline().strip())
+ self.num_int_extra = int(f.readline().strip())
+ for i in range(self.num_int_extra):
+ self.int_component_names.append(f.readline().strip())
+ self.num_int = self.num_int_base + self.num_int_extra
+ self.num_real = self.num_real_base + self.num_real_extra
+ self.is_checkpoint = bool(int(f.readline().strip()))
+ self.num_particles = int(f.readline().strip())
+ self.max_next_id = int(f.readline().strip())
+ self.finest_level = int(f.readline().strip())
+ self.num_levels = self.finest_level + 1
+
+ if not self.is_checkpoint:
+ self.num_int_base = 0
+ self.num_int_extra = 0
+ self.num_int = 0
+
+ self.grids_per_level = np.zeros(self.num_levels, dtype='int64')
+ self.data_map = {}
+ for level_num in range(self.num_levels):
+ self.grids_per_level[level_num] = int(f.readline().strip())
+ self.data_map[level_num] = {}
+
+ pfd = namedtuple("ParticleFileDescriptor",
+ ["file_number", "num_particles", "offset"])
+
+ for level_num in range(self.num_levels):
+ for grid_num in range(self.grids_per_level[level_num]):
+ entry = [int(val) for val in f.readline().strip().split()]
+ self.data_map[level_num][grid_num] = pfd(*entry)
+
+ self._generate_particle_fields()
+
+ def _generate_particle_fields(self):
+
+ # these are the 'base' integer fields
+ self.known_int_fields = [(self.particle_type, "particle_id"),
+ (self.particle_type, "particle_cpu")]
+ self.known_int_fields = self.known_int_fields[0:self.num_int_base]
+
+ self.known_int_fields.extend([(self.particle_type, "particle_" + field)
+ for field in self.int_component_names])
+
+ # these are the base real fields
+ self.known_real_fields = [(self.particle_type, "particle_position_x"),
+ (self.particle_type, "particle_position_y"),
+ (self.particle_type, "particle_position_z")]
+ self.known_real_fields = self.known_real_fields[0:self.num_real_base]
+
+ self.known_real_fields.extend([(self.particle_type, "particle_" + field)
+ for field in self.real_component_names])
+
+ self.known_fields = self.known_int_fields + self.known_real_fields
+
+ self.particle_int_dtype = np.dtype([(t[1], self.int_type)
+ for t in self.known_int_fields])
+
+ self.particle_real_dtype = np.dtype([(t[1], self.real_type)
+ for t in self.known_real_fields])
diff -r 662fdbe5331ad344f09868c8115f697e5a3bae62 -r e8a11e72f1b3ebcebddd09a52bc10292666f4c1e yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -1225,7 +1225,7 @@
def __init__(self, output_dir,
cparam_filename='inputs',
- fparam_filename='probin',
+ fparam_filename='None',
dataset_type='boxlib_native',
storage_filename=None,
units_override=None,
https://bitbucket.org/yt_analysis/yt/commits/b52b235d27b0/
Changeset: b52b235d27b0
User: Yinghe Lu
Date: 2017-06-07 00:45:43+00:00
Summary: changed fparam_filename and cparam_filename
Affected #: 1 file
diff -r e8a11e72f1b3ebcebddd09a52bc10292666f4c1e -r b52b235d27b0c288fe3d990f7a211cfd430257a7 yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -1224,8 +1224,8 @@
_field_info_class = NyxFieldInfo
def __init__(self, output_dir,
- cparam_filename='inputs',
- fparam_filename='None',
+ cparam_filename=None,
+ fparam_filename=None,
dataset_type='boxlib_native',
storage_filename=None,
units_override=None,
https://bitbucket.org/yt_analysis/yt/commits/f93fcf770d70/
Changeset: f93fcf770d70
User: Yinghe Lu
Date: 2017-06-07 00:49:44+00:00
Summary: removed the useless stuff
Affected #: 1 file
diff -r b52b235d27b0c288fe3d990f7a211cfd430257a7 -r f93fcf770d70181e6f6f9603079bb0050071aaa1 yt/frontends/boxlib/1
--- a/yt/frontends/boxlib/1
+++ /dev/null
@@ -1,86 +0,0 @@
-class AMReXParticleHeader(object):
-
- def __init__(self, ds, directory_name, is_checkpoint,
- extra_field_names=None):
-
- self.particle_type = directory_name
- header_filename = ds.output_dir + "/" + directory_name + "/Header"
- self.real_component_names = []
- self.int_component_names = []
- with open(header_filename, "r") as f:
- self.version_string = f.readline().strip()
-
- particle_real_type = self.version_string.split('_')[-1]
- particle_real_type = self.version_string.split('_')[-1]
- if particle_real_type == 'double':
- self.real_type = np.float64
- elif particle_real_type == 'single':
- self.real_type = np.float32
- else:
- raise RuntimeError("yt did not recognize particle real type.")
- self.int_type = np.int32
-
- self.dim = int(f.readline().strip())
- self.num_int_base = 2
- self.num_real_base = self.dim
- self.num_real_extra = int(f.readline().strip())
- for i in range(self.num_real_extra):
- self.real_component_names.append(f.readline().strip())
- self.num_int_extra = int(f.readline().strip())
- for i in range(self.num_int_extra):
- self.int_component_names.append(f.readline().strip())
- self.num_int = self.num_int_base + self.num_int_extra
- self.num_real = self.num_real_base + self.num_real_extra
- self.is_checkpoint = bool(int(f.readline().strip()))
- self.num_particles = int(f.readline().strip())
- self.max_next_id = int(f.readline().strip())
- self.finest_level = int(f.readline().strip())
- self.num_levels = self.finest_level + 1
-
- if not self.is_checkpoint:
- self.num_int_base = 0
- self.num_int_extra = 0
- self.num_int = 0
-
- self.grids_per_level = np.zeros(self.num_levels, dtype='int64')
- self.data_map = {}
- for level_num in range(self.num_levels):
- self.grids_per_level[level_num] = int(f.readline().strip())
- self.data_map[level_num] = {}
-
- pfd = namedtuple("ParticleFileDescriptor",
- ["file_number", "num_particles", "offset"])
-
- for level_num in range(self.num_levels):
- for grid_num in range(self.grids_per_level[level_num]):
- entry = [int(val) for val in f.readline().strip().split()]
- self.data_map[level_num][grid_num] = pfd(*entry)
-
- self._generate_particle_fields()
-
- def _generate_particle_fields(self):
-
- # these are the 'base' integer fields
- self.known_int_fields = [(self.particle_type, "particle_id"),
- (self.particle_type, "particle_cpu")]
- self.known_int_fields = self.known_int_fields[0:self.num_int_base]
-
- self.known_int_fields.extend([(self.particle_type, "particle_" + field)
- for field in self.int_component_names])
-
- # these are the base real fields
- self.known_real_fields = [(self.particle_type, "particle_position_x"),
- (self.particle_type, "particle_position_y"),
- (self.particle_type, "particle_position_z")]
- self.known_real_fields = self.known_real_fields[0:self.num_real_base]
-
- self.known_real_fields.extend([(self.particle_type, "particle_" + field)
- for field in self.real_component_names])
-
- self.known_fields = self.known_int_fields + self.known_real_fields
-
- self.particle_int_dtype = np.dtype([(t[1], self.int_type)
- for t in self.known_int_fields])
-
- self.particle_real_dtype = np.dtype([(t[1], self.real_type)
- for t in self.known_real_fields])
https://bitbucket.org/yt_analysis/yt/commits/c2a7d92135d0/
Changeset: c2a7d92135d0
User: atmyers
Date: 2017-06-07 20:54:17+00:00
Summary: Merge pull request #1441 from luminosa42/yinghe
minor updates to read boxlib data
Affected #: 1 file
diff -r 662fdbe5331ad344f09868c8115f697e5a3bae62 -r c2a7d92135d0e0e6702fa3a72fedb801d8f6b30d yt/frontends/boxlib/data_structures.py
--- a/yt/frontends/boxlib/data_structures.py
+++ b/yt/frontends/boxlib/data_structures.py
@@ -1224,8 +1224,8 @@
_field_info_class = NyxFieldInfo
def __init__(self, output_dir,
- cparam_filename='inputs',
- fparam_filename='probin',
+ cparam_filename=None,
+ fparam_filename=None,
dataset_type='boxlib_native',
storage_filename=None,
units_override=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