Atomistic file extension #16
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,202 +10,86 @@ namespace detail | |
| namespace keywords | ||
| { | ||
|
|
||
| // set up some utilities for parsing vector3 | ||
| namespace Vector3 = ovf::detail::parse::Vector3; | ||
|
|
||
| using vec3_t = float[3]; | ||
|
|
||
| template<typename Rule> | ||
| using vec3_action_t = Vector3::action<Rule, vec3_t>; | ||
|
|
||
| template<class Input> | ||
| inline void read_vector(const Input & in, vec3_t & vec3_data) | ||
| { | ||
| Vector3::read_vec3<const Input &, vec3_t, vec3_action_t>(in, vec3_data); | ||
| } | ||
|
|
||
| ////// meshtype | ||
|
|
||
| // ONLY TRIGGERS ON MESHTYPE LATTICE, the rest of the meshtype keyword is implemented in keywords.hpp | ||
| struct meshtype_value_lattice : TAO_PEGTL_ISTRING("lattice") // This keyword is triggered only, when meshtype lattice is found | ||
| { }; | ||
|
|
||
| template<> | ||
| struct kw_action< meshtype_value_lattice > | ||
| { | ||
| template< typename Input > | ||
| static void apply( const Input& in, ovf_file & f, ovf_segment & segment) | ||
| { | ||
| segment.meshtype = strdup(in.string().c_str()); | ||
| f._state->found_meshtype = true; | ||
| f._state->found_meshtype_lattice = true; | ||
| } | ||
| }; | ||
|
|
||
| ////// bravaisa | ||
| struct bravaisa : TAO_PEGTL_ISTRING("bravaisa") | ||
| { }; | ||
|
|
||
| struct bravaisa_value : pegtl::seq<Vector3::vec3, end_kw_value> {}; | ||
| template<> | ||
| struct kw_action< bravaisa_value > | ||
| { | ||
| template< typename Input > | ||
| static void apply( const Input& in, ovf_file & f, ovf_segment & segment) | ||
| { | ||
| f._state->found_bravaisa = true; | ||
| read_vector(in, segment.bravaisa); | ||
| } | ||
| }; | ||
|
|
||
| ////// bravaisb | ||
| struct bravaisb : TAO_PEGTL_ISTRING("bravaisb") | ||
| { }; | ||
|
|
||
| struct bravaisb_value : pegtl::seq<Vector3::vec3, end_kw_value> {}; | ||
| template<> | ||
| struct kw_action< bravaisb_value > | ||
| { | ||
| template< typename Input > | ||
| static void apply( const Input& in, ovf_file & f, ovf_segment & segment) | ||
| { | ||
| f._state->found_bravaisb = true; | ||
| read_vector(in, segment.bravaisb); | ||
| } | ||
| }; | ||
|
|
||
| ////// bravaisc | ||
| struct bravaisc : TAO_PEGTL_ISTRING("bravaisc") | ||
| { }; | ||
|
|
||
| struct bravaisc_value : pegtl::seq<Vector3::vec3, end_kw_value> {}; | ||
| template<> | ||
| struct kw_action< bravaisc_value > | ||
| { | ||
| template< typename Input > | ||
| static void apply( const Input& in, ovf_file & f, ovf_segment & segment) | ||
| { | ||
| f._state->found_bravaisc = true; | ||
| read_vector(in, segment.bravaisc); | ||
| } | ||
| }; | ||
|
|
||
| ////// ncellpoints | ||
| struct ncellpoints : TAO_PEGTL_ISTRING("ncellpoints") | ||
|
There was a problem hiding this comment. maybe |
||
| { }; | ||
|
|
@@ -221,7 +105,7 @@ namespace keywords | |
| { | ||
| segment.ncellpoints = std::stoi(in.string()); | ||
| f._state->found_ncellpoints = true; | ||
| f._state->_basis.reserve(segment.ncellpoints); // If we find ncellpoints, we reserve the space | ||
| } | ||
| }; | ||
|
|
||
|
|
@@ -292,62 +176,21 @@ namespace keywords | |
| struct cur_basis_line_value_z : pegtl::pad<decimal_number, pegtl::blank> | ||
| { }; | ||
|
|
||
| struct basis_value_line : Vector3::vec3 | ||
| { }; | ||
|
|
||
| struct basis_value : pegtl::seq< pegtl::eol, pegtl::list<pegtl::seq< pegtl::string<'#'>, pegtl::opt<TAO_PEGTL_ISTRING("#%")>, basis_value_line>, pegtl::eol > > | ||
| { }; | ||
|
|
||
| template<> | ||
| struct kw_action< basis_value_line > | ||
| { | ||
| template< typename Input > | ||
| static void apply( const Input& in, ovf_file & f, ovf_segment & segment) | ||
| { | ||
| float temp[3]; | ||
| read_vector( in, temp ); | ||
| f._state->_basis.push_back( {temp[0], temp[1], temp[2]} ); | ||
|
Comment on lines
+191
to
+193
There was a problem hiding this comment. ovf/include/detail/pegtl_defines.hpp Line 61 in 32da6aa I therefore believe it would be more canonical to write auto atom = f._state->_basis.emplace_back();
read_vector( in, (*atom).data() );or std::array<float,3> atom;
read_vector( in, atom.data() );
f._state->_basis.push_back(atom); |
||
| } | ||
| }; | ||
|
|
||
|
|
@@ -357,12 +200,14 @@ namespace keywords | |
| template< typename Input > | ||
| static void apply( const Input& in, ovf_file & f, ovf_segment & segment) | ||
| { | ||
| f._state->found_basis = true; | ||
| // Allocate and data in segment struct and copy | ||
| segment.basis = new float[3 * f._state->_basis.size()]; | ||
|
There was a problem hiding this comment. To avoid memory leaks, lines like this should probably be preceded by if( segment.basis )
delete segment.basis; |
||
| for( int i=0; i<f._state->_basis.size(); i++) | ||
| { | ||
| segment.basis[3*i] = f._state->_basis[i][0]; | ||
| segment.basis[3*i + 1] = f._state->_basis[i][1]; | ||
| segment.basis[3*i + 2] = f._state->_basis[i][2]; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe
"bravais_a"would be a more readable name than"bravaisa"?