Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1 from jchristopherson/Development-v1.1.0
Browse files Browse the repository at this point in the history
Development v1.1.0
  • Loading branch information
jchristopherson committed Sep 24, 2020
2 parents 4e0bf68 + c092a9e commit 70bed7a
Show file tree
Hide file tree
Showing 298 changed files with 3,570 additions and 1,016 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(fcore C CXX Fortran)

# Define version information
set(FCORE_MAJOR_VERSION 1)
set(FCORE_MINOR_VERSION 0)
set(FCORE_MINOR_VERSION 1)
set(FCORE_PATCH_VERSION 0)
set(FCORE_VERSION ${FCORE_MAJOR_VERSION}.${FCORE_MINOR_VERSION}.${FCORE_PATCH_VERSION})

Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = fcore
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.0.0
PROJECT_NUMBER = 1.1.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
115 changes: 59 additions & 56 deletions doc/html/annotated.html

Large diffs are not rendered by default.

112 changes: 61 additions & 51 deletions doc/html/classes.html

Large diffs are not rendered by default.

443 changes: 274 additions & 169 deletions doc/html/collections_8f90_source.html

Large diffs are not rendered by default.

340 changes: 340 additions & 0 deletions doc/html/collections__dictionary_8f90_source.html

Large diffs are not rendered by default.

168 changes: 168 additions & 0 deletions doc/html/collections__hash_8f90_source.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http:https://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.16"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>fcore: C:/Users/jchri/Documents/github/fcore/src/collections_hash.f90 Source File</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="navtree.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="resize.js"></script>
<script type="text/javascript" src="navtreedata.js"></script>
<script type="text/javascript" src="navtree.js"></script>
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
$(document).ready(initResizable);
/* @license-end */</script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
<link href="doxygen.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
<div id="titlearea">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
</tr>
</tbody>
</table>
</div>
<!-- end header part -->
<!-- Generated by Doxygen 1.8.16 -->
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
var searchBox = new SearchBox("searchBox", "search",false,'Search');
/* @license-end */
</script>
<script type="text/javascript" src="menudata.js"></script>
<script type="text/javascript" src="menu.js"></script>
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
$(function() {
initMenu('',true,false,'search.php','Search');
$(document).ready(function() { init_search(); });
});
/* @license-end */</script>
<div id="main-nav"></div>
</div><!-- top -->
<div id="side-nav" class="ui-resizable side-nav-resizable">
<div id="nav-tree">
<div id="nav-tree-contents">
<div id="nav-sync" class="sync"></div>
</div>
</div>
<div id="splitbar" style="-moz-user-select:none;"
class="ui-resizable-handle">
</div>
</div>
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
$(document).ready(function(){initNavTree('collections__hash_8f90_source.html','');});
/* @license-end */
</script>
<div id="doc-content">
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
onmouseout="return searchBox.OnSearchSelectHide()"
onkeydown="return searchBox.OnSearchSelectKey(event)">
</div>

<!-- iframe showing the search results (closed by default) -->
<div id="MSearchResultsWindow">
<iframe src="javascript:void(0)" frameborder="0"
name="MSearchResults" id="MSearchResults">
</iframe>
</div>

<div class="header">
<div class="headertitle">
<div class="title">collections_hash.f90</div> </div>
</div><!--header-->
<div class="contents">
<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="comment">! collections_hash.f90</span></div>
<div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160; </div>
<div class="line"><a name="l00003"></a><span class="lineno"> 3</span>&#160;submodule(<a class="code" href="namespacecollections.html">collections</a>) collections_hash</div>
<div class="line"><a name="l00004"></a><span class="lineno"> 4</span>&#160;<span class="keyword">contains</span></div>
<div class="line"><a name="l00005"></a><span class="lineno"> 5</span>&#160;<span class="comment">! ******************************************************************************</span></div>
<div class="line"><a name="l00006"></a><span class="lineno"> 6</span>&#160;<span class="comment">! HASH_GENERATOR MEMBERS</span></div>
<div class="line"><a name="l00007"></a><span class="lineno"> 7</span>&#160;<span class="comment">! ------------------------------------------------------------------------------</span></div>
<div class="line"><a name="l00011"></a><span class="lineno"> 11</span>&#160; <span class="keyword">module</span> subroutine hc_init(this)</div>
<div class="line"><a name="l00012"></a><span class="lineno"> 12</span>&#160; <span class="comment">! Arguments</span></div>
<div class="line"><a name="l00013"></a><span class="lineno"> 13</span>&#160; <span class="keywordtype">class</span>(hash_code), <span class="keywordtype">intent(inout)</span> :: this</div>
<div class="line"><a name="l00014"></a><span class="lineno"> 14</span>&#160; </div>
<div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160; <span class="comment">! Local Variables</span></div>
<div class="line"><a name="l00016"></a><span class="lineno"> 16</span>&#160; <span class="keywordtype">integer(int64)</span> :: rem</div>
<div class="line"><a name="l00017"></a><span class="lineno"> 17</span>&#160; <span class="keywordtype">integer(int32)</span> :: i, j</div>
<div class="line"><a name="l00018"></a><span class="lineno"> 18</span>&#160; </div>
<div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160; <span class="comment">! Process</span></div>
<div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; <span class="keywordflow">if</span> (.not.this%have_table) <span class="keywordflow">then</span></div>
<div class="line"><a name="l00021"></a><span class="lineno"> 21</span>&#160; <span class="keywordflow">do</span> i = 1, <span class="keyword">size</span>(this%table)</div>
<div class="line"><a name="l00022"></a><span class="lineno"> 22</span>&#160; rem = int(i - 1, int64)</div>
<div class="line"><a name="l00023"></a><span class="lineno"> 23</span>&#160; <span class="keywordflow">do</span> j = 1, 8</div>
<div class="line"><a name="l00024"></a><span class="lineno"> 24</span>&#160; <span class="keywordflow">if</span> (iand(rem, 1_int64) /= 0_int64) <span class="keywordflow">then</span></div>
<div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160; rem = ieor(ishft(rem, -abs(1_int64)), this%crcpoly)</div>
<div class="line"><a name="l00026"></a><span class="lineno"> 26</span>&#160; <span class="keywordflow">else</span></div>
<div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160; rem = ishft(rem, -abs(1_int64))</div>
<div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160;<span class="keywordflow"> end if</span></div>
<div class="line"><a name="l00029"></a><span class="lineno"> 29</span>&#160;<span class="keywordflow"> end do</span></div>
<div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160; this%table(i) = rem</div>
<div class="line"><a name="l00031"></a><span class="lineno"> 31</span>&#160;<span class="keywordflow"> end do</span></div>
<div class="line"><a name="l00032"></a><span class="lineno"> 32</span>&#160; this%have_table = .true.</div>
<div class="line"><a name="l00033"></a><span class="lineno"> 33</span>&#160;<span class="keywordflow"> end if</span></div>
<div class="line"><a name="l00034"></a><span class="lineno"> 34</span>&#160; <span class="keyword">end subroutine</span></div>
<div class="line"><a name="l00035"></a><span class="lineno"> 35</span>&#160; </div>
<div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160;<span class="comment">! ------------------------------------------------------------------------------</span></div>
<div class="line"><a name="l00043"></a><span class="lineno"> 43</span>&#160; <span class="keyword">module</span> function hc_get(this, str) result(rst)</div>
<div class="line"><a name="l00044"></a><span class="lineno"> 44</span>&#160; <span class="comment">! Arguments</span></div>
<div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160; <span class="keywordtype">class</span>(hash_code), <span class="keywordtype">intent(inout)</span> :: this</div>
<div class="line"><a name="l00046"></a><span class="lineno"> 46</span>&#160; <span class="keywordtype">character(len = *)</span>, <span class="keywordtype">intent(in)</span> :: str</div>
<div class="line"><a name="l00047"></a><span class="lineno"> 47</span>&#160; <span class="keywordtype">integer(int64)</span> :: rst</div>
<div class="line"><a name="l00048"></a><span class="lineno"> 48</span>&#160; </div>
<div class="line"><a name="l00049"></a><span class="lineno"> 49</span>&#160; <span class="comment">! Local Variables</span></div>
<div class="line"><a name="l00050"></a><span class="lineno"> 50</span>&#160; <span class="keywordtype">integer(int32)</span> :: i, j, n</div>
<div class="line"><a name="l00051"></a><span class="lineno"> 51</span>&#160; <span class="keywordtype">integer(int64)</span> :: crc</div>
<div class="line"><a name="l00052"></a><span class="lineno"> 52</span>&#160; </div>
<div class="line"><a name="l00053"></a><span class="lineno"> 53</span>&#160; <span class="comment">! Parameters</span></div>
<div class="line"><a name="l00054"></a><span class="lineno"> 54</span>&#160; <span class="keywordtype">integer(int64)</span>, <span class="keywordtype">parameter</span> :: ff = int(z<span class="stringliteral">&#39;ff&#39;</span>, int64)</div>
<div class="line"><a name="l00055"></a><span class="lineno"> 55</span>&#160; </div>
<div class="line"><a name="l00056"></a><span class="lineno"> 56</span>&#160; <span class="comment">! Ensure initialization</span></div>
<div class="line"><a name="l00057"></a><span class="lineno"> 57</span>&#160; <span class="keywordflow">if</span> (.not.this%have_table) <span class="keyword">call </span>this%initialize()</div>
<div class="line"><a name="l00058"></a><span class="lineno"> 58</span>&#160; </div>
<div class="line"><a name="l00059"></a><span class="lineno"> 59</span>&#160; <span class="comment">! Process</span></div>
<div class="line"><a name="l00060"></a><span class="lineno"> 60</span>&#160; crc = this%initxor</div>
<div class="line"><a name="l00061"></a><span class="lineno"> 61</span>&#160; n = len(str)</div>
<div class="line"><a name="l00062"></a><span class="lineno"> 62</span>&#160; <span class="keywordflow">do</span> i = 1, n</div>
<div class="line"><a name="l00063"></a><span class="lineno"> 63</span>&#160; j = int(iand(ieor(crc, int(iachar(str(i:i)), int64)), ff))</div>
<div class="line"><a name="l00064"></a><span class="lineno"> 64</span>&#160; crc = ieor(ishft(crc, -abs(8_int64)), this%table(j + 1))</div>
<div class="line"><a name="l00065"></a><span class="lineno"> 65</span>&#160;<span class="keywordflow"> end do</span></div>
<div class="line"><a name="l00066"></a><span class="lineno"> 66</span>&#160; rst = ieor(crc, this%finalxor)</div>
<div class="line"><a name="l00067"></a><span class="lineno"> 67</span>&#160; <span class="keyword">end function</span></div>
<div class="line"><a name="l00068"></a><span class="lineno"> 68</span>&#160; </div>
<div class="line"><a name="l00069"></a><span class="lineno"> 69</span>&#160;<span class="comment">! ------------------------------------------------------------------------------</span></div>
<div class="line"><a name="l00070"></a><span class="lineno"> 70</span>&#160;<span class="keyword">end </span>submodule</div>
</div><!-- fragment --></div><!-- contents -->
</div><!-- doc-content -->
<div class="ttc" id="anamespacecollections_html"><div class="ttname"><a href="namespacecollections.html">collections</a></div><div class="ttdoc">Provides types supporting various collections of objects.</div><div class="ttdef"><b>Definition:</b> <a href="collections_8f90_source.html#l00004">collections.f90:4</a></div></div>
<!-- start footer part -->
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
<li class="navelem"><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html">src</a></li><li class="navelem"><b>collections_hash.f90</b></li>
<li class="footer">Generated by
<a href="http:https://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.16 </li>
</ul>
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion doc/html/collections__list_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 2 additions & 0 deletions doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
var dir_68267d1309a1af8e8297ef4c3efbcdba =
[
[ "collections.f90", "collections_8f90_source.html", null ],
[ "collections_dictionary.f90", "collections__dictionary_8f90_source.html", null ],
[ "collections_hash.f90", "collections__hash_8f90_source.html", null ],
[ "collections_list.f90", "collections__list_8f90_source.html", null ],
[ "fcore_constants.f90", "fcore__constants_8f90_source.html", null ],
[ "file_io.f90", "file__io_8f90_source.html", null ],
Expand Down
6 changes: 4 additions & 2 deletions doc/html/fcore__constants_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down Expand Up @@ -104,7 +104,9 @@
<div class="line"><a name="l00018"></a><span class="lineno"><a class="line" href="namespacefcore__constants.html#a64c5a4d2b0751175e506ecc9d37734df"> 18</a></span>&#160; <span class="keywordtype">integer(int32)</span>, <span class="keywordtype">parameter</span> :: fcore_file_io_error = 10004</div>
<div class="line"><a name="l00021"></a><span class="lineno"><a class="line" href="namespacefcore__constants.html#aeb0e82fe89bd60b614ca7c9587343dfa"> 21</a></span>&#160; <span class="keywordtype">integer(int32)</span>, <span class="keywordtype">parameter</span> :: fcore_unopened_error = 10005</div>
<div class="line"><a name="l00024"></a><span class="lineno"><a class="line" href="namespacefcore__constants.html#aea7a1c30862bb044d62ae2aa41573e4c"> 24</a></span>&#160; <span class="keywordtype">integer(int32)</span>, <span class="keywordtype">parameter</span> :: fcore_end_of_file_error = 10006</div>
<div class="line"><a name="l00025"></a><span class="lineno"> 25</span>&#160;<span class="keyword">end module</span></div>
<div class="line"><a name="l00026"></a><span class="lineno"><a class="line" href="namespacefcore__constants.html#aed2286db6dd6d55230a2a15ecf87c90f"> 26</a></span>&#160; <span class="keywordtype">integer(int32)</span>, <span class="keywordtype">parameter</span> :: fcore_nonexistent_key_error = 10007</div>
<div class="line"><a name="l00029"></a><span class="lineno"><a class="line" href="namespacefcore__constants.html#a1ac69b7d0c5241ff7166fb34ee05414a"> 29</a></span>&#160; <span class="keywordtype">integer(int32)</span>, <span class="keywordtype">parameter</span> :: fcore_existing_key_error = 10008</div>
<div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160;<span class="keyword">end module</span></div>
</div><!-- fragment --></div><!-- contents -->
</div><!-- doc-content -->
<div class="ttc" id="anamespacefcore__constants_html"><div class="ttname"><a href="namespacefcore__constants.html">fcore_constants</a></div><div class="ttdoc">A module providing constants used by the FCORE library.</div><div class="ttdef"><b>Definition:</b> <a href="fcore__constants_8f90_source.html#l00004">fcore_constants.f90:4</a></div></div>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/file__io_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/file__io__binary_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/file__io__endian_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/file__io__fm_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/file__io__path_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/file__io__reader_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/file__io__text_8f90_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">fcore
&#160;<span id="projectnumber">1.0.0</span>
&#160;<span id="projectnumber">1.1.0</span>
</div>
<div id="projectbrief">A Fortran library containing string handling, i/o routines, etc.</div>
</td>
Expand Down
Loading

0 comments on commit 70bed7a

Please sign in to comment.