Skip to content

Commit 8ed2fd7

Browse files
authored
Merge pull request #29 from ekluzek/release-cesm2.0
Bring in updates on mosart1_0_35 to release branch
2 parents f246b44 + 65eec36 commit 8ed2fd7

File tree

10 files changed

+210
-41
lines changed

10 files changed

+210
-41
lines changed

CODE_OF_CONDUCT.md

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# Contributor Code of Conduct
2+
_The Contributor Code of Conduct is for participants in our software projects and community._
3+
4+
## Our Pledge
5+
We, as contributors, creators, stewards, and maintainers (participants), of Model for Scale Adaptive River Transport (MOSART) 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.
8+
9+
## Our Standards
10+
Examples of behaviors that contribute to a positive environment include:
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
20+
21+
Examples of unacceptable behavior include, but are not limited to:
22+
23+
* Harassment, intimidation, or discrimination in any form
24+
* Physical, verbal, or written abuse by anyone to anyone, including repeated use of pronouns other than those requested
25+
* Unwelcome sexual attention or advances
26+
* Personal attacks directed at other guests, members, participants, etc.
27+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
28+
* Alarming, intimidating, threatening, or hostile comments or conduct
29+
* Inappropriate use of nudity and/or sexual images
30+
* Threatening or stalking anyone, including a participant
31+
* Other conduct which could reasonably be considered inappropriate in a professional setting
32+
33+
## Scope
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.
38+
39+
## 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.
44+
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.
50+
51+
## Reporting
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).
62+
63+
## Consequences
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.
68+
69+
## Process for Changes
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.
73+
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.
76+
77+
## Attribution
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 Nov/6th/2019
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/buildnml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
6868
#----------------------------------------------------
6969

7070
run_type = case.get_value("RUN_TYPE")
71+
finidat_rtm = str(nmlgen.get_value("finidat_rtm"))
7172
if run_type == 'branch' or run_type == 'hybrid':
7273
run_refcase = case.get_value("RUN_REFCASE")
7374
run_refdate = case.get_value("RUN_REFDATE")
@@ -82,9 +83,11 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
8283
else:
8384

8485
nmlgen.add_default("nrevsn_rtm", value=filename)
86+
elif finidat_rtm.strip() == '':
87+
nmlgen.set_value('finidat_rtm', value=' ')
8588
else:
8689
if nmlgen.get_default('finidat_rtm') == 'UNSET':
87-
nmlgen.add_default('finidat_rtm', value='', ignore_abs_path=True)
90+
nmlgen.add_default('finidat_rtm', value=' ', ignore_abs_path=True)
8891
else:
8992
nmlgen.add_default("finidat_rtm")
9093

cime_config/namelist_definition_mosart.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<group>mosart_inparm</group>
167167
<values>
168168
<value rof_grid="r05" >$DIN_LOC_ROOT/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc</value>
169-
<value rof_grid="r8th">$DIN_LOC_ROOT/rof/mosart/MOSART_Global_8th_20160716a.nc</value>
169+
<value rof_grid="r8th">$DIN_LOC_ROOT/rof/mosart/MOSART_Global_8th_20191007.nc</value>
170170
</values>
171171
<desc>
172172
Full pathname of input datafile for RTM.

cime_config/testdefs/testlist_mosart.xml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<machines>
66
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
77
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
8-
<machine name="hobart" compiler="nag" category="mosart"></machine>
8+
<machine name="izumi" compiler="nag" category="mosart"></machine>
99
</machines>
1010
<options>
11-
<option name="wallclock">0:20</option>
11+
<option name="wallclock">00:20:00</option>
1212
<option name="comment" >Restart test without DEBUG on all machines/compilers</option>
1313
</options>
1414
</test>
@@ -17,25 +17,36 @@
1717
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
1818
</machines>
1919
<options>
20-
<option name="wallclock">0:20</option>
20+
<option name="wallclock">00:20:00</option>
21+
</options>
22+
</test>
23+
<test name="SMS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCrop" testmods="mosart/mosartCold">
24+
<machines>
25+
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
26+
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
27+
<machine name="izumi" compiler="nag" category="mosart"></machine>
28+
</machines>
29+
<options>
30+
<option name="wallclock">00:20:00</option>
31+
<option name="comment" >Run a Cold-Start with all machine/compilers</option>
2132
</options>
2233
</test>
2334
<test name="ERS_Ld5" grid="f10_f10_musgs" compset="I2000Clm50BgcCru" testmods="mosart/mosartOff">
2435
<machines>
2536
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
2637
</machines>
2738
<options>
28-
<option name="wallclock">0:20</option>
39+
<option name="wallclock">00:20:00</option>
2940
</options>
3041
</test>
3142
<test name="SMS_D_Ld5" grid="f10_f10_musgs" compset="I1850Clm50Bgc" testmods="mosart/default">
3243
<machines>
3344
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
3445
<machine name="cheyenne" compiler="gnu" category="mosart"></machine>
35-
<machine name="hobart" compiler="nag" category="mosart"></machine>
46+
<machine name="izumi" compiler="nag" category="mosart"></machine>
3647
</machines>
3748
<options>
38-
<option name="wallclock">0:20</option>
49+
<option name="wallclock">00:20:00</option>
3950
<option name="comment" >Smoke test with DEBUG on all machines/compilers</option>
4051
</options>
4152
</test>
@@ -44,7 +55,7 @@
4455
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
4556
</machines>
4657
<options>
47-
<option name="wallclock">0:20</option>
58+
<option name="wallclock">00:20:00</option>
4859
<option name="comment" >decompOpts are not bit for bit on PE layout change</option>
4960
</options>
5061
</test>
@@ -53,7 +64,7 @@
5364
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
5465
</machines>
5566
<options>
56-
<option name="wallclock">0:20</option>
67+
<option name="wallclock">00:20:00</option>
5768
</options>
5869
</test>
5970
</testlist>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../default
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
finidat_rtm = ' '

docs/ChangeLog

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,72 @@
1+
===============================================================
2+
Tag name: release-cesm2.0.04
3+
Originator(s): erik
4+
Date: Jan 14, 2020
5+
One-line Summary: Bring in mosart1_0_35 to release branch
6+
7+
Fix for cold start and add cold start test
8+
9+
Change wallclock time in tests and change hobart for izumi
10+
11+
Add code of conduct
12+
13+
Change all instances of SHR_KIND_CL to use CL that is renamed from
14+
shr_kind_cl in shr_kind_mod. This is important for a recent cime
15+
update.
16+
17+
MOSART Master Tag This Corresponds To: mosart1_0_35 (with changes)
18+
19+
Issues Fixed: #24 #26
20+
#24 -- cold start
21+
#26 -- 8th degree file
22+
23+
Science changes since: release-cesm2.0.01
24+
* None
25+
Software changes since: release-cesm2.0.03
26+
* Fix cold starts and 8th degree routing file
27+
28+
Testing: Run mosart test suite
29+
cheyenne -- PASS
30+
izumi ----- PASS
31+
32+
Pull Requests that document the changes (include PR ids): #29
33+
#29 -- Bring in updates on mosart1_0_35 to release branch
34+
35+
===============================================================
36+
Tag name: mosart1_0_35
37+
Originator(s): erik
38+
Date: Nov 08, 2019
39+
One-line Summary: Fix cold-start, 8th degree file, wallclock, add COC, change SHR_KIND
40+
41+
Fix for cold start #24 and add cold start test
42+
43+
Fix 8th degree file, #26
44+
45+
Change wallclock time in tests and change hobart for izumi
46+
47+
Add code of conduct
48+
49+
Change all instances of SHR_KIND_CL to use CL that is renamed from
50+
shr_kind_cl in shr_kind_mod. This is important for a recent cime
51+
update.
52+
53+
===============================================================
54+
Tag name: mosart1_0_34
55+
Originator(s): mvertens/erik
56+
Date: Jul 25, 2019
57+
One-line Summary: Add nuopc cap for NUOPC coupler option -- SKIPPED on release branch
58+
===============================================================
59+
Tag name: mosart1_0_33
60+
Originator(s): erik
61+
Date: Jun 11, 2019
62+
One-line Summary: buildlib updates for cime5.8 and nldas grid -- SKIPPED on release branch
63+
64+
+===============================================================
65+
Tag name: mosart1_0_32
66+
Originator(s): erik
67+
Date: May 07, 2019
68+
One-line Summary: Move release-cesm2.0.03 to mosart master -- SKIPPED on release branch
69+
170
===============================================================
271
Tag name: release-cesm2.0.03
372
Originator(s): erik

src/cpl/rof_comp_mct.F90

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module rof_comp_mct
77
! in MCT (Model Coupling Toolkit) format and converting it to use by MOSART
88

99
use seq_flds_mod
10-
use shr_kind_mod , only : r8 => shr_kind_r8
10+
use shr_kind_mod , only : r8 => shr_kind_r8, CL => shr_kind_cl
1111
use shr_file_mod , only : shr_file_setLogUnit, shr_file_setLogLevel, &
1212
shr_file_getLogUnit, shr_file_getLogLevel, &
1313
shr_file_getUnit, shr_file_setIO
@@ -100,14 +100,14 @@ subroutine rof_init_mct( EClock, cdata_r, x2r_r, r2x_r, NLFilename)
100100
integer :: lbnum ! input to memory diagnostic
101101
integer :: shrlogunit,shrloglev ! old values for log unit and log level
102102
integer :: begr, endr
103-
character(len=SHR_KIND_CL) :: caseid ! case identifier name
104-
character(len=SHR_KIND_CL) :: ctitle ! case description title
105-
character(len=SHR_KIND_CL) :: starttype ! start-type (startup, continue, branch, hybrid)
106-
character(len=SHR_KIND_CL) :: calendar ! calendar type name
107-
character(len=SHR_KIND_CL) :: hostname ! hostname of machine running on
108-
character(len=SHR_KIND_CL) :: version ! Model version
109-
character(len=SHR_KIND_CL) :: username ! user running the model
110-
character(len=SHR_KIND_CL) :: model_doi_url ! Web address for model Digital Object Identifier (DOI)
103+
character(len=CL) :: caseid ! case identifier name
104+
character(len=CL) :: ctitle ! case description title
105+
character(len=CL) :: starttype ! start-type (startup, continue, branch, hybrid)
106+
character(len=CL) :: calendar ! calendar type name
107+
character(len=CL) :: hostname ! hostname of machine running on
108+
character(len=CL) :: version ! Model version
109+
character(len=CL) :: username ! user running the model
110+
character(len=CL) :: model_doi_url ! Web address for model Digital Object Identifier (DOI)
111111
character(len=32), parameter :: sub = 'rof_init_mct'
112112
character(len=*), parameter :: format = "('("//trim(sub)//") :',A)"
113113
!---------------------------------------------------------------------------

src/riverroute/MOSART_physics_mod.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MODULE MOSART_physics_mod
1010
!-----------------------------------------------------------------------
1111

1212
! !USES:
13-
use shr_kind_mod , only : r8 => shr_kind_r8, SHR_KIND_CL
13+
use shr_kind_mod , only : r8 => shr_kind_r8
1414
use shr_const_mod , only : SHR_CONST_REARTH, SHR_CONST_PI
1515
use shr_sys_mod , only : shr_sys_abort
1616
use RtmVar , only : iulog, barrier_timers

0 commit comments

Comments
 (0)