Skip to content

Commit ad6d6db

Browse files
authored
Joss edits (#12)
- Resolves #9 - Resolves #10 - Resolves #11 General: -added missing references info to the paper.bib file -updated Acknowledgements section of paper.md file to acknowledge TEM tomo data from Andy -updated paper.md to remove potential conflicts with math symbols -fixed use of underscores in paper.md -corrected some formatting errors and typos in paper.md -added further explanation to the figure caption in paper.md -corrected mistake in the testing instructions for the mpi tests in README -added CONTRIBUTING.md file with some more detailed instructions for how others can contribute to the project -updated README current status to highlight that v4.0 is now stable -added link to the Changelog in the Current Status section of README -added link to CONTRIBUTING.md file in README -add initial changelog file with changes for the v4.0 release -added link to the CHANGELOG.md file in CONTRIBUTING.md -generated updated Doxygen documentation -updated Doxyfile version to v4.0.0 -updated Changelog by adding changes in this commit Version class: -updated the version string to v4.0.0
1 parent 82511ae commit ad6d6db

File tree

68 files changed

+1025
-422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1025
-422
lines changed

CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6+
7+
--------------------------------------------------------------------------------------------------------------------------------
8+
9+
## [Unreleased]
10+
11+
## [v4.0.0] - 2018-11-29 - Final Release
12+
13+
This release only changes documentation files and does not contain modifications to the source code.
14+
15+
### Added
16+
- CONTRIBUTING.md - New file with instructions for how others can contribute to the project
17+
- README.md - Link to new CONTRIBUTING file
18+
- CHANGELOG.md - New file detailing the changes for each release
19+
- README.md - Link to new CHANGELOG file
20+
- papers/v4_paper/paper.bib - Several missing reference entries
21+
- papers/v4_paper/paper.md - Acknowledgement of Dr. Andrew A. Herzing for TEM tomo data
22+
23+
### Changed
24+
- README.md - Current release status to note that v4.0 is now stable
25+
- papers/v4_paper/paper.md - Image alt text to be more descriptive
26+
- papers/v4_paper/paper.md - Formating of plus signs using \texttt command
27+
- Version.cpp - Current_version namespace variable to v4.0.0
28+
- Doxyfile - updated the version number to v4.0.0
29+
- docs - generated updated Doxygen documentation
30+
31+
### Fixed
32+
- README.md - Instructions for running the MPI tests
33+
- papers/v4_paper/paper.md - Problem with underscore by adding a backslash

CONTRIBUTING.md

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Contributing to Ising_OPV
2+
3+
We welcome new contributors to this project to help make the Ising_OPV morphology tool better and more effective for our scientific and educational users. Contributions can take on a variety of forms, such as bug reports, feature requests, code documentation updates, user tutorials, feature implementations, bugfixes, and more.
4+
5+
## Ground Rules
6+
7+
- To maintain an inclusive and welcoming environment, all community members must follow the [Code of Conduct](./CODE_OF_CONDUCT.md).
8+
- To keep project development organized, all new features and bugfixes must be proposed and discussed using [issues](https://github.com/MikeHeiber/Ising_OPV/issues) before changes are implemented.
9+
- C++ code should follow the [C++11 standard](https://en.wikipedia.org/wiki/C%2B%2B11) and should be written to be simple and largely self-documenting with self-descriptive names.
10+
11+
## Filing Issues
12+
13+
One of the easiest ways to contribute is by using the software and submitting bug reports and feature requests as issues in the [Issues section](https://github.com/MikeHeiber/Ising_OPV/issues).
14+
Before filing a new issue please check that your issue has not already been submitted.
15+
If it has, 'like' the issue and add any additional feedback you have to the issue thread in a comment.
16+
If your issue has not already been filed, create a new issue and provide a detailed description of the problem or new idea/suggestion.
17+
The code owners will review new issues, provide feedback, and decide if and when to implement the changes needed to resolve the issue.
18+
19+
## Working on an Issue
20+
21+
1. Before you set out to tackle an issue, discuss your implementation plans with the code owners on the issue page.
22+
23+
Especially for code additions needed to add new features, it is important to discuss your implementation ideas with the code owners to ensure that the software design is relatively well thought out and fits with the rest of the codebase.
24+
25+
2. Create fork of the Ising_OPV repo on your account.
26+
27+
Click the "Fork" button near the top of any Ising_OPV Github webpage.
28+
29+
3. Connect your fork to the upstream repo
30+
31+
```
32+
git remote add upstream https://github.com/MikeHeiber/Ising_OPV.git
33+
```
34+
35+
4. Clone your forked Ising_OPV repo to your local machine.
36+
37+
```
38+
git clone --recurse-submodules https://github.com/YOUR_USERNAME/Ising_OPV
39+
```
40+
41+
5. Create a new feature branch from the development branch.
42+
43+
```
44+
git checkout development
45+
git branch feature-new-thing
46+
git checkout feature-new-thing
47+
```
48+
49+
6. Implement your changes keeping the scope of changes limited to the specified issue.
50+
51+
7. Document your changes by adding to the [Changelog](./CHANGELOG.md).
52+
53+
8. Update your new branch with any upstream changes and resolve any conflicts.
54+
55+
```
56+
git fetch upstream
57+
git checkout development
58+
git merge upstream/development
59+
git checkout feature-new-thing
60+
git rebase development
61+
```
62+
63+
9. Make sure your changes do not break any of the existing functionality by running the tests locally.
64+
65+
```
66+
make test
67+
./test/Ising_OPV_tests.exe
68+
mpiexec -n 4 ./test/Ising_OPV_MPI_tests.exe
69+
```
70+
71+
10. Push your local changes to your forked Ising_OPV repo.
72+
73+
```
74+
git push origin feature-new-thing
75+
```
76+
77+
11. Submit a pull request
78+
79+
See below for details about how to submit a pull request.
80+
81+
## Code Testing and Documentation Standards
82+
83+
Unit tests using the [googletest framework](https://github.com/abseil/googletest/blob/master/googletest/docs/primer.md) must be created for all new/modified functions and added to the test/test.cpp or test/test_mpi.cpp file as appropriate. Tests should include comments that describe what functionality each test code section is testing for.
84+
85+
All new/modified classes and functions must be documented using the [Doxygen style](https://www.stack.nl/~dimitri/doxygen/manual/docblocks.html).
86+
87+
## Submitting A Pull Request
88+
89+
The pull request must reference the issue that is being resolved.
90+
Merging of feature branches into the development branch will be done using a squash merge operation to keep a tidy Git history.
91+
The squash merge will be done by a code owner, so you must provide a single overall commit message that details all changes in the pull request body text for the code owner the use with the merge.
92+
The pull request version of the code must pass all [TravisCI tests](https://travis-ci.org/MikeHeiber/Ising_OPV) and must not reduce code testing coverage on [Coveralls](https://coveralls.io/github/MikeHeiber/Ising_OPV).
93+
Code will be formatted during the code review stage to the Microsoft Visual Studio 2017 standard format.
94+
Updated documentation files will also be generated by Doxygen during the code review stage as needed.
95+
Code owners may add new commits to your pull request branch in order to help you fix any problems.
96+

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = Ising_OPV
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v4.0.0-rc.2
41+
PROJECT_NUMBER = v4.0.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

README.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Ising_OPV
1+
Ising_OPV
22
=========
33

44
This C++ software package can be used to create and analyze bulk heterojunction morphologies for further use in kinetic Monte Carlo simulation tools, such as [Excimontec](https://github.com/MikeHeiber/Excimontec).
@@ -18,11 +18,12 @@ Generated or imported morphologies are then rigorously analyzed to determine imp
1818

1919
## Current Status
2020

21-
Latest release: [![GitHub (pre-)release](https://img.shields.io/github/release/MikeHeiber/Ising_OPV/all.svg?style=flat-square)](https://github.com/MikeHeiber/Ising_OPV/releases)
21+
v4.0 is now stable.
22+
Please report any bugs or submit feature requests for future releases in the [Issues](https://github.com/MikeHeiber/Ising_OPV/issues) section.
2223

23-
All major planned features for v4.0 are now implemented and have undergone significant testing.
24-
However, there may still be bugs that need to be fixed.
25-
Please report any bugs or submit feature requests in the [Issues](https://github.com/MikeHeiber/Ising_OPV/issues) section.
24+
Latest pre-release: [![GitHub Pre-release](https://img.shields.io/github/release-pre/MikeHeiber/Ising_OPV/all.svg?style=flat-square)](https://github.com/MikeHeiber/Ising_OPV/releases)
25+
26+
To keep track of upcoming changes or review prior changes to the codebase, please see the [Changelog](./CHANGELOG.md).
2627

2728
#### Continuous Integration and Testing Status:
2829

@@ -40,9 +41,10 @@ Code is being tested using [googletest](https://github.com/google/googletest) wi
4041
| Master | [![Coveralls Github branch](https://img.shields.io/coveralls/github/MikeHeiber/Ising_OPV/master.svg?style=for-the-badge)](https://coveralls.io/github/MikeHeiber/Ising_OPV?branch=master) |
4142
| Development | [![Coveralls Github branch](https://img.shields.io/coveralls/github/MikeHeiber/Ising_OPV/development.svg?style=for-the-badge)](https://coveralls.io/github/MikeHeiber/Ising_OPV?branch=development) |
4243

43-
## Contact
44+
## Contributing
4445

45-
If you would like to contribute to the development of this project or would like some help in using the tool for your research, please contact me ([email protected]) to discuss a collaboration.
46+
If you would like to contribute to the development of this project, please see the [contributing instructions](./CONTRIBUTING.md).
47+
If you would like some help in using or customizing the tool for your research, please contact me ([email protected]) to discuss a collaboration.
4648
You can check out my research using this tool and other work on [Researchgate](https://www.researchgate.net/profile/Michael_Heiber).
4749

4850
## Using Ising_OPV
@@ -71,7 +73,14 @@ Once you have an MPI library installed and have an appropriate compiler, to buil
7173
Then, navigate to the Ising_OPV directory and run `make`.
7274
Once the normal build is successful, you should test Ising_OPV on your own hardware using the unit and system tests provided before you use the tool.
7375
Build the testing executable by running `make test`.
74-
Once the test build is complete, run the two test executables `./test/Ising_OPV_tests.exe` and `./test/Ising_OPV_MPI_tests.exe`.
76+
Once the test build is complete, run the two test executables
77+
78+
```./test/Ising_OPV_tests.exe```
79+
80+
and
81+
82+
```mpiexec -n 4 ./test/Ising_OPV_MPI_tests.exe```.
83+
7584
Please report any build or testing errors in the [Issues](https://github.com/MikeHeiber/Ising_OPV/issues) section. If you do not have any build or testing errors, then you are ready to go!
7685

7786
#### Running Simulations

docs/Thumbs.db

2 KB
Binary file not shown.

docs/_c_h_a_n_g_e_l_o_g_8md.html

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
<head>
4+
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5+
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6+
<meta name="generator" content="Doxygen 1.8.14"/>
7+
<meta name="viewport" content="width=device-width, initial-scale=1"/>
8+
<title>Ising_OPV: CHANGELOG.md File Reference</title>
9+
<link href="tabs.css" rel="stylesheet" type="text/css"/>
10+
<script type="text/javascript" src="jquery.js"></script>
11+
<script type="text/javascript" src="dynsections.js"></script>
12+
<link href="navtree.css" rel="stylesheet" type="text/css"/>
13+
<script type="text/javascript" src="resize.js"></script>
14+
<script type="text/javascript" src="navtreedata.js"></script>
15+
<script type="text/javascript" src="navtree.js"></script>
16+
<script type="text/javascript">
17+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
18+
$(document).ready(initResizable);
19+
/* @license-end */</script>
20+
<link href="search/search.css" rel="stylesheet" type="text/css"/>
21+
<script type="text/javascript" src="search/searchdata.js"></script>
22+
<script type="text/javascript" src="search/search.js"></script>
23+
<link href="doxygen.css" rel="stylesheet" type="text/css" />
24+
</head>
25+
<body>
26+
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
27+
<div id="titlearea">
28+
<table cellspacing="0" cellpadding="0">
29+
<tbody>
30+
<tr style="height: 56px;">
31+
<td id="projectalign" style="padding-left: 0.5em;">
32+
<div id="projectname">Ising_OPV
33+
&#160;<span id="projectnumber">v4.0.0</span>
34+
</div>
35+
<div id="projectbrief">Generates and analyzes model bulk heterojunction morphologies in a parallel computing environment</div>
36+
</td>
37+
</tr>
38+
</tbody>
39+
</table>
40+
</div>
41+
<!-- end header part -->
42+
<!-- Generated by Doxygen 1.8.14 -->
43+
<script type="text/javascript">
44+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
45+
var searchBox = new SearchBox("searchBox", "search",false,'Search');
46+
/* @license-end */
47+
</script>
48+
<script type="text/javascript" src="menudata.js"></script>
49+
<script type="text/javascript" src="menu.js"></script>
50+
<script type="text/javascript">
51+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
52+
$(function() {
53+
initMenu('',true,false,'search.php','Search');
54+
$(document).ready(function() { init_search(); });
55+
});
56+
/* @license-end */</script>
57+
<div id="main-nav"></div>
58+
</div><!-- top -->
59+
<div id="side-nav" class="ui-resizable side-nav-resizable">
60+
<div id="nav-tree">
61+
<div id="nav-tree-contents">
62+
<div id="nav-sync" class="sync"></div>
63+
</div>
64+
</div>
65+
<div id="splitbar" style="-moz-user-select:none;"
66+
class="ui-resizable-handle">
67+
</div>
68+
</div>
69+
<script type="text/javascript">
70+
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
71+
$(document).ready(function(){initNavTree('_c_h_a_n_g_e_l_o_g_8md.html','');});
72+
/* @license-end */
73+
</script>
74+
<div id="doc-content">
75+
<!-- window showing the filter options -->
76+
<div id="MSearchSelectWindow"
77+
onmouseover="return searchBox.OnSearchSelectShow()"
78+
onmouseout="return searchBox.OnSearchSelectHide()"
79+
onkeydown="return searchBox.OnSearchSelectKey(event)">
80+
</div>
81+
82+
<!-- iframe showing the search results (closed by default) -->
83+
<div id="MSearchResultsWindow">
84+
<iframe src="javascript:void(0)" frameborder="0"
85+
name="MSearchResults" id="MSearchResults">
86+
</iframe>
87+
</div>
88+
89+
<div class="header">
90+
<div class="headertitle">
91+
<div class="title">CHANGELOG.md File Reference</div> </div>
92+
</div><!--header-->
93+
<div class="contents">
94+
</div><!-- contents -->
95+
</div><!-- doc-content -->
96+
<!-- start footer part -->
97+
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
98+
<ul>
99+
<li class="navelem"><a class="el" href="_c_h_a_n_g_e_l_o_g_8md.html">CHANGELOG.md</a></li>
100+
<li class="footer">Generated by
101+
<a href="http://www.doxygen.org/index.html">
102+
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.14 </li>
103+
</ul>
104+
</div>
105+
</body>
106+
</html>

docs/_c_o_d_e___o_f___c_o_n_d_u_c_t_8md.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<tr style="height: 56px;">
3131
<td id="projectalign" style="padding-left: 0.5em;">
3232
<div id="projectname">Ising_OPV
33-
&#160;<span id="projectnumber">v4.0.0-rc.2</span>
33+
&#160;<span id="projectnumber">v4.0.0</span>
3434
</div>
3535
<div id="projectbrief">Generates and analyzes model bulk heterojunction morphologies in a parallel computing environment</div>
3636
</td>

0 commit comments

Comments
 (0)