Skip to content

Commit 1de7bf4

Browse files
authored
Merge pull request #19 from ekluzek/release-cesm2.0
Move update in rtm1_0_70 to release branch
2 parents 77a9ab1 + 886dce5 commit 1de7bf4

File tree

6 files changed

+137
-82
lines changed

6 files changed

+137
-82
lines changed

CODE_OF_CONDUCT.md

Lines changed: 56 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,84 @@
11
# Contributor Code of Conduct
2-
3-
## Related Code of Conduct
4-
5-
Participant Code of Conduct
6-
https://www2.fin.ucar.edu/ethics/participant-code-conduct
2+
_The Contributor Code of Conduct is for participants in our software projects and community._
73

84
## Our Pledge
9-
We, as contributors and maintainers (participants), of River Transport Model (RTM) pledge to make participation in our software project and community a safe, productive, welcoming and inclusive experience for everyone. All participants are required to abide by this Code of Conduct. This includes respectful treatment of everyone regardless of age, body size, disability, ethnicity, gender identity or expression, level of experience, nationality, political affiliation, veteran status, pregnancy, genetic information, physical appearance, race, religion, or sexual orientation, as well as any other characteristic protected under applicable US federal or state law.
5+
We, as contributors, creators, stewards, and maintainers (participants), of River Transport Model (RTM) pledge to make participation in our software, system or hardware project and community a safe, productive, welcoming and inclusive experience for everyone.
6+
All participants are required to abide by this Code of Conduct.
7+
This includes respectful treatment of everyone regardless of age, body size, disability, ethnicity, gender identity or expression, level of experience, nationality, political affiliation, veteran status, pregnancy, genetic information, physical appearance, race, religion, or sexual orientation, as well as any other characteristic protected under applicable US federal or state law.
108

119
## Our Standards
1210
Examples of behaviors that contribute to a positive environment include:
13-
* Using welcoming and inclusive language
14-
* Respectful when offering and gracefully accepting constructive criticism
15-
* Acknowledging the contributions of others
16-
* Focusing on what is best for the community
17-
* Showing empathy towards other community members
18-
* Treating everyone with respect and consideration, valuing a diversity of views and opinions
19-
* Communicating openly with respect for others, critiquing ideas rather than individuals
11+
12+
* All participants are treated with respect and consideration, valuing a diversity of views and opinions
13+
* Be considerate, respectful, and collaborative
14+
* Communicate openly with respect for others, critiquing ideas rather than individuals and gracefully accepting criticism
15+
* Acknowledging the contributions of others
16+
* Avoid personal attacks directed toward other participants
17+
* Be mindful of your surroundings and of your fellow participants
18+
* Alert UCAR staff and suppliers/vendors if you notice a dangerous situation or someone in distress
19+
* Respect the rules and policies of the project and venue
2020

2121
Examples of unacceptable behavior include, but are not limited to:
22+
2223
* Harassment, intimidation, or discrimination in any form
23-
* Personal attacks directed toward other participants
24+
* Physical, verbal, or written abuse by anyone to anyone, including repeated use of pronouns other than those requested
2425
* Unwelcome sexual attention or advances
25-
* Inappropriate, negative, derogatory comments and/or attacks on personal beliefs
26+
* Personal attacks directed at other guests, members, participants, etc.
2627
* Publishing others' private information, such as a physical or electronic address, without explicit permission
27-
* Refusing to use the pronouns that someone requests
2828
* Alarming, intimidating, threatening, or hostile comments or conduct
29-
* Physical or verbal abuse by anyone to anyone, including but not limited to a participant, member of the public, guest, member of any institution or sponsor
30-
* Comments related to characteristics given in the pledge at the top
3129
* Inappropriate use of nudity and/or sexual images
32-
* Threatening or stalking other participants
30+
* Threatening or stalking anyone, including a participant
3331
* Other conduct which could reasonably be considered inappropriate in a professional setting
3432

3533
## Scope
36-
37-
This Code of Conduct applies to all spaces managed by the Project whether it be online or face-to-face. This includes project code, code repository, associated web pages, documentation, mailing lists, project websites and wiki pages, issue tracker, meetings, telecons, events, project social media accounts, and any other forums created by the project team which the community uses for communication. In addition, violations of this Code of Conduct outside these spaces may affect a person's ability to participate within them. Representation of a project may be further defined and clarified by project maintainers.
34+
This Code of Conduct applies to all spaces managed by the Project whether they be physical, online or face-to-face.
35+
This includes project code, code repository, associated web pages, documentation, mailing lists, project websites and wiki pages, issue tracker, meetings, telecons, events, project social media accounts, and any other forums created by the project team which the community uses for communication.
36+
In addition, violations of this Code of Conduct outside these spaces may affect a person's ability to participate within them.
37+
Representation of a project may be further defined and clarified by project maintainers.
3838

3939
## Community Responsibilities
40+
Everyone in the community is empowered to respond to people who are showing unacceptable behavior.
41+
They can talk to them privately or publicly.
42+
Anyone requested to stop unacceptable behavior is expected to comply immediately.
43+
If the behavior continues concerns may be brought to the project administrators or to any other party listed in the [Reporting](#reporting) section below.
4044

41-
Everyone in the community is empowered to respond to people who are showing unacceptable behavior. They can talk to them privately or publicly. Anyone requested to stop unacceptable behavior is expected to comply immediately. If the behavior continues concerns may be brought to the project administrators or to any other party listed in the Reporting section below.
42-
Project Administrator Responsibilities
43-
Project Administrators are responsible for clarifying the standards of acceptable behavior and are encouraged to model appropriate behavior and provide support when people in the community point out inappropriate behavior. Project administrator(s) are normally the ones that would be tasked to carry out the actions in the Consequences section below.
44-
45-
Project Administrators are also expected to keep this Code of Conduct updated with the main one housed at UCAR as listed below in the Attribution section.
45+
## Project Administrator Responsibilities
46+
Project administrators are responsible for clarifying the standards of acceptable behavior and are encouraged to model appropriate behavior and provide support when people in the community point out inappropriate behavior.
47+
Project administrator(s) are normally the ones that would be tasked to carry out the actions in the [Consequences](#consequences) section below.
48+
49+
Project administrators are also expected to keep this Code of Conduct updated with the main one housed at UCAR, as listed below in the [Attribution](#attribution) section.
4650

4751
## Reporting
48-
Instances of unacceptable behavior can be brought to the attention of the project administrator(s) who may take any action as outlined in the Consequences section below. However, making a report to a project administrator is not considered an ‘official report’ to UCAR.
49-
50-
Instances of unacceptable behavior may also be reported directly to UCAR via UCAR’s Harassment Reporting and Complaint Procedure at https://www2.fin.ucar.edu/procedures/hr/harassment-reporting-and-complaint-procedure, or anonymously through UCAR’s EthicsPoint Hotline at https://www2.fin.ucar.edu/ethics/anonymous-reporting.
51-
Complaints received by UCAR will be handled pursuant to the procedures outlined in UCAR’s Harassment Reporting and Complaint Procedure. Complaints to UCAR will be held as confidential as practicable under the circumstances, and retaliation against a person who initiates a complaint or an inquiry about inappropriate behavior will not be tolerated.
52-
53-
Any Contributor can use these reporting methods even if they are not directly affiliated with UCAR. The Frequently Asked Questions (FAQ) page for reporting is here: https://www2.fin.ucar.edu/procedures/hr/reporting-faqs.
52+
Instances of unacceptable behavior can be brought to the attention of the project administrator(s) who may take any action as outlined in the [Consequences](#consequences) section below.
53+
However, making a report to a project administrator is not considered an 'official report' to UCAR.
54+
55+
Instances of unacceptable behavior may also be reported directly to UCAR pursuant to [UCAR's Harassment Reporting and Complaint Procedure](https://www2.fin.ucar.edu/procedures/hr/harassment-reporting-and-complaint-procedure), or anonymously through [UCAR's EthicsPoint Hotline](https://www2.fin.ucar.edu/ethics/anonymous-reporting).
56+
57+
Complaints received by UCAR will be handled pursuant to the procedures outlined in UCAR's Harassment Reporting and Complaint Procedure.
58+
Complaints to UCAR will be held as confidential as practicable under the circumstances, and retaliation against a person who initiates a complaint or an inquiry about inappropriate behavior will not be tolerated.
59+
60+
Any Contributor can use these reporting methods even if they are not directly affiliated with UCAR.
61+
The Frequently Asked Questions (FAQ) page for reporting is [here](https://www2.fin.ucar.edu/procedures/hr/reporting-faqs).
5462

5563
## Consequences
56-
Upon receipt of a complaint, the project administrator(s) may take any action deemed necessary and appropriate under the circumstances. Such action can include things such as: removing, editing, or rejecting comments, commits, code, wiki edits, email, issues, and other contributions that are not aligned to this Code of Conduct, or banning temporarily or permanently any contributor for other behaviors that are deemed inappropriate, threatening, offensive, or harmful. Project Administrators also have the right to report violations to UCAR HR and/or UCAR’s Office of Diversity, Equity and Inclusion (ODEI) as well as a participant’s home institution and/or law enforcement. In the event an incident is reported to UCAR, UCAR will follow its Harassment Reporting and Complaint Procedure.
64+
Upon receipt of a complaint, the project administrator(s) may take any action deemed necessary and appropriate under the circumstances.
65+
Such action can include things such as: removing, editing, or rejecting comments, commits, code, wiki edits, email, issues, and other contributions that are not aligned to this Code of Conduct, or banning temporarily or permanently any contributor for other behaviors that are deemed inappropriate, threatening, offensive, or harmful.
66+
Project administrators also have the right to report violations to UCAR HR and/or UCAR's Office of Diversity, Equity and Inclusion (ODEI), as well as a participant's home institution and/or law enforcement.
67+
In the event an incident is reported to UCAR, UCAR will follow its Harassment Reporting and Complaint Procedure.
5768

5869
## Process for Changes
59-
All UCAR managed projects are required to adopt this Contributor Code of Conduct. Adoption is assumed even if not expressly stated in the repository. Projects should fill in sections where prompted with project-specific information, including, project name, email addresses, adoption date, etc. There is one section below marked “optional” that may not apply to a given project.
70+
All UCAR managed projects are required to adopt this Contributor Code of Conduct.
71+
Adoption is assumed even if not expressly stated in the repository.
72+
Projects should fill in sections where prompted with project-specific information, including, project name and adoption date.
6073

61-
Projects that adopt this Code of Conduct need to stay up to date with UCAR's Contributor Code of Conduct, linked with a DOI in the "Attribution" section below. Projects can make limited substantive changes to the Code of Conduct, however, the changes must be limited in scope and may not contradict the UCAR Contributor Code of Conduct.
74+
Projects that adopt this Code of Conduct need to stay up to date with UCAR's Contributor Code of Conduct, linked with a DOI in the [Attribution](#attribution) section below.
75+
Projects can make limited substantive changes to the Code of Conduct, however, the changes must be limited in scope and may not contradict the UCAR Contributor Code of Conduct.
6276

6377
## Attribution
64-
This Code of Conduct was originally adapted from the Contributor Covenant, version 1.4, available at [Contributor-Covenant](http://contributor-covenant.org/version/1/4) We then aligned it with the UCAR Participant Code of Conduct, which also borrows from the American Geophysical Union (AGU) Code of Conduct. The UCAR Participant Code of Conduct applies to both UCAR employees as well as participants in activities run by UCAR. We modified the “scope” section with the django project description, and we added “Publication Ethics” from the NGEET/FATES project. The original version of this for all software projects that have strong management from UCAR or UCAR staff is available on the UCAR website at _**`[Enter DOI link name]`**_ (the date that it was adopted by this project was Dec/5/2018) When responding to complaints UCAR HR and ODEI will do so based on the latest published version. Therefore, any project-specific changes should follow the Process for Changes section above.
65-
66-
## Publication Ethics
67-
We aim to create an open development environment where developers can be confident that all members of the community are publishing any research on the project in an ethical manner. In particular, writing code is a form of intellectual contribution, and one should expect that all such intellectual contributions are respected and given credit in any resulting published work. To support the community and avoid issues of misconduct related to the above principle, please respect the following rules:
68-
69-
* Document the version of the code used in any publication, preferably by either using a release tag (existing or newly created) if possible, or a commit hash if not.
70-
* Do not use code from anywhere other than the central project’s development repository main development branch without discussing with the author(s) of the modified code your intentions for using the code and receiving their permission to do so.
71-
* When using project features that have recently been integrated into the central Project development repository, be mindful of the contributions of others and, where the novel features qualitatively affect the results, involve the author(s) of these features in any resulting manuscripts. Be particularly aware of the concerns of early career researchers, and ensure they have sufficient time to lead publications using their developments.
72-
* When discussing results arising from older project features that have been described in the literature or releases, accurately cite the publications describing those features or releases.
78+
This Code of Conduct was originally adapted from the [Contributor Covenant](http://contributor-covenant.org/version/1/4), version 1.4.
79+
We then aligned it with the UCAR Participant Code of Conduct, which also borrows from the American Geophysical Union (AGU) Code of Conduct.
80+
The UCAR Participant Code of Conduct applies to both UCAR employees as well as participants in activities run by UCAR.
81+
The original version of this for all software projects that have strong management from UCAR or UCAR staff is available on the UCAR website at https://doi.org/10.5065/6w2c-a132.
82+
The date that it was adopted by this project was Dec/5th/2018
83+
When responding to complaints, UCAR HR and ODEI will do so based on the latest published version.
84+
Therefore, any project-specific changes should follow the [Process for Changes](#process-for-changes) section above.

cime_config/testdefs/testlist_rtm.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<machines>
66
<machine name="cheyenne" compiler="intel" category="rtm"></machine>
77
<machine name="cheyenne" compiler="gnu" category="rtm"></machine>
8-
<machine name="hobart" compiler="nag" category="rtm"></machine>
8+
<machine name="izumi" compiler="nag" category="rtm"></machine>
99
</machines>
1010
<options>
1111
<option name="wallclock">00:20:00</option>
@@ -16,7 +16,7 @@
1616
<machines>
1717
<machine name="cheyenne" compiler="intel" category="rtm"></machine>
1818
<machine name="cheyenne" compiler="gnu" category="rtm"></machine>
19-
<machine name="hobart" compiler="nag" category="rtm"></machine>
19+
<machine name="izumi" compiler="nag" category="rtm"></machine>
2020
</machines>
2121
<options>
2222
<option name="wallclock">00:20:00</option>
@@ -27,7 +27,7 @@
2727
<machines>
2828
<machine name="cheyenne" compiler="intel" category="rtm"></machine>
2929
<machine name="cheyenne" compiler="gnu" category="rtm"></machine>
30-
<machine name="hobart" compiler="nag" category="rtm"></machine>
30+
<machine name="izumi" compiler="nag" category="rtm"></machine>
3131
</machines>
3232
<options>
3333
<option name="wallclock">00:20:00</option>

docs/ChangeLog

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
===============================================================
2+
Tag name: rtm1_0_70
3+
Originator(s): erik
4+
Date: Nov 08, 2019
5+
One-line Summary: Rename uses of SHR_KIND_CL to CL for a cime update
6+
7+
Change wallclock time in tests and change hobart for izumi
8+
9+
Add Code of Conduct.
10+
11+
Have all instances of SHR_KIND_CL use CL that is renamed from SHR_KIND_CL.
12+
This is important for a recent cime update.
13+
114
===============================================================
215
Tag name: rtm1_0_69
316
Originator(s): erik

docs/release-cesm2.0.ChangeLog

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
===============================================================
2+
Tag name: release-cesm2.0.04
3+
Originator(s): erik
4+
Date: Jan 14, 2020
5+
One-line Summary: Bring in updates to rtm1_0_70
6+
7+
Update release branch to rtm1_0_70. This updates
8+
the code of conduct to the standard UCAR version.
9+
It also moves testing from hobart to izumi. And it
10+
changes instances of SHR_KIND_ to lowercase.
11+
12+
RTM Master Tag This Corresponds To: rtm1_0_70 (with changes)
13+
14+
Software Changes since last release: release-cesm2.0.03
15+
* Remove mosart from some files
16+
17+
Science Changes since last release: release-cesm2.0.00
18+
* None
19+
20+
Changes to User Interface since: release-cesm2.0.03
21+
* None
22+
23+
Pull Requests that document the changes (include PR ids):
24+
#19 -- Move update in rtm1_0_70 to release branch
25+
26+
Testing:
27+
rtm -- cheyenne_intel PASS
28+
rtm -- cheyenne_gnu PASS
29+
rtm -- izumi_nag PASS
30+
131
===============================================================
232
Tag name: release-cesm2.0.03
333
Originator(s): erik

0 commit comments

Comments
 (0)