-
Notifications
You must be signed in to change notification settings - Fork 150
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'cam_development' into CESM-GC+cam_development
NOTE: Update to add AEIC organic species to external forcings list was
removed in this merge. It is required for using HEMCO with CAM-Chem
since all 3D emissions fluxes applied in CAM-Chem must be
hard-coded. The update is not required for CESM-GC and so adding it
will be done later.
# Conflicts:
# .gitignore
# bld/build-namelist
# bld/config_files/definition.xml
# bld/configure
# bld/namelist_files/namelist_defaults_cam.xml
# bld/perl5lib/Build/ChemNamelist.pm
# cime_config/buildcpp
# cime_config/config_component.xml
# cime_config/config_pes.xml
# src/chemistry/modal_aero/aero_model.F90
# src/chemistry/modal_aero/modal_aero_gasaerexch.F90
# src/chemistry/pp_trop_strat_mam4_vbs/chem_mods.F90
# src/chemistry/pp_trop_strat_mam4_vbs/mo_sim_dat.F90
# src/chemistry/pp_trop_strat_mam4_vbsext/chem_mods.F90
# src/chemistry/pp_trop_strat_mam4_vbsext/mo_sim_dat.F90
# src/control/cam_comp.F90
# src/control/camsrfexch.F90
# src/cpl/atm_import_export.F90
# src/cpl/mct/cam_cpl_indices.F90
# src/physics/cam/phys_control.F90
Signed-off-by: Lizzie Lundgren <[email protected]>- Loading branch information
Showing
1,018 changed files
with
252,792 additions
and
134,168 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| name: Pushed commit workflow | ||
|
|
||
| #For some reason GitHub does not allow secrets | ||
| #when a PR from a fork is closed. Thus instead | ||
| #the workflow must activate whenever a commit | ||
| #is pushed to the repo. Theoretically this should | ||
| #behave the same way as if triggered from a pull | ||
| #request, just as long as no user ever pushes | ||
| #directly to the repo. | ||
| on: push | ||
|
|
||
| jobs: | ||
| #This job is designed to close any issues or pull requests specified | ||
| #in the body of a pull request merged into a non-default branch. | ||
| issue_closer: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| # acquire github action routines | ||
| - uses: actions/checkout@v2 | ||
| # acquire specific version of python | ||
| - name: Set up Python 3.6 | ||
| if: github.repository == 'ESCOMP/CAM' #Only run on main repo | ||
| uses: actions/setup-python@v1 | ||
| with: | ||
| python-version: '3.6' # Semantic version range syntax or exact version of a Python version | ||
| # install required python packages | ||
| - name: Install dependencies | ||
| if: github.repository == 'ESCOMP/CAM' #Only run on main repo | ||
| run: | | ||
| python -m pip install --upgrade pip # Install latest version of PIP | ||
| pip install PyGithub # Install PyGithub python package | ||
| # run CAM issue-closing script | ||
| - name: python action scripts | ||
| if: github.repository == 'ESCOMP/CAM' #Only run on main repo | ||
| env: | ||
| ACCESS_TOKEN: ${{ secrets.WRITE_ACCESS_TOKEN }} | ||
| TRIGGER_SHA: ${{ github.sha }} | ||
| run: .github/scripts/branch_pr_issue_closer.py --access_token $ACCESS_TOKEN --trigger_sha $TRIGGER_SHA |
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 |
|---|---|---|
| @@ -1,49 +1,84 @@ | ||
| # Contributor Covenant Code of Conduct | ||
| # Contributor Code of Conduct | ||
| _The Contributor Code of Conduct is for participants in our software projects and community._ | ||
|
|
||
| ## Our Pledge | ||
|
|
||
| In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, politcal affiliation, veteran status, pregnancy, genetic information, personal appearance, choice of text editor or operating system, race, religion, or sexual identity and orientation, or any other characteristic protected under applicable US federal or state law. | ||
| We, as contributors, creators, stewards, and maintainers (participants), of the Community Atmosphere Model (CAM) pledge to make participation in our software, system or hardware 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. | ||
|
|
||
| ## Our Standards | ||
|
|
||
| Examples of behavior that contributes to creating a positive environment include: | ||
|
|
||
| * Using welcoming and inclusive language | ||
| * Being respectful of differing viewpoints and experiences | ||
| * Gracefully accepting constructive criticism | ||
| * Focusing on what is best for the community | ||
| * Showing empathy towards other community members | ||
|
|
||
| Examples of unacceptable behavior by participants include: | ||
|
|
||
| * The use of sexualized language or imagery and unwelcome sexual attention or advances | ||
| * Trolling, insulting/derogatory comments, and personal or political attacks | ||
| * Public or private harassment | ||
| Examples of behaviors that contribute to a positive environment include: | ||
|
|
||
| * All participants are treated with respect and consideration, valuing a diversity of views and opinions | ||
| * Be considerate, respectful, and collaborative | ||
| * Communicate openly with respect for others, critiquing ideas rather than individuals and gracefully accepting criticism | ||
| * Acknowledging the contributions of others | ||
| * Avoid personal attacks directed toward other participants | ||
| * Be mindful of your surroundings and of your fellow participants | ||
| * Alert UCAR staff and suppliers/vendors if you notice a dangerous situation or someone in distress | ||
| * Respect the rules and policies of the project and venue | ||
|
|
||
| Examples of unacceptable behavior include, but are not limited to: | ||
|
|
||
| * Harassment, intimidation, or discrimination in any form | ||
| * Physical, verbal, or written abuse by anyone to anyone, including repeated use of pronouns other than those requested | ||
| * Unwelcome sexual attention or advances | ||
| * Personal attacks directed at other guests, members, participants, etc. | ||
| * Publishing others' private information, such as a physical or electronic address, without explicit permission | ||
| * Alarming, intimidating, threatening, or hostile comments or conduct | ||
| * Inappropriate use of nudity and/or sexual images | ||
| * Threatening or stalking anyone, including a participant | ||
| * Other conduct which could reasonably be considered inappropriate in a professional setting | ||
| * Refusing to use the pronouns that someone requests | ||
| * Intimidating, threatening, or hostile conduct; physical or verbal abuse; vandalism; arson; and sabotage | ||
| * Alarming or threatening comments that might refer to, suggest, or promote a violent, intimidating, or threatening action | ||
|
|
||
| ## Our Responsibilities | ||
| ## Scope | ||
| This Code of Conduct applies to all spaces managed by the Project whether they be physical, 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. | ||
|
|
||
| Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. | ||
| ## Community Responsibilities | ||
| 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](#reporting) section below. | ||
|
|
||
| Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. | ||
| ## Project Administrator Responsibilities | ||
| 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](#consequences) section below. | ||
|
|
||
| ## Scope | ||
| 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. | ||
|
|
||
| This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. | ||
| ## Reporting | ||
| 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. | ||
| However, making a report to a project administrator is not considered an 'official report' to UCAR. | ||
|
|
||
| ## Enforcement | ||
| 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). | ||
|
|
||
| Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. Alternatively, this behavior can be reported to individuals on the CAM team, who will then have the responsibility to talk about the behavior to the core team. Another alternative for NCAR employees (when all individuals involved are NCAR employees) is to use the reporting methods of NCAR for this behavior (these options include anonymous reporting methods). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Retaliation against a person who initiates a complaint or an inquiry about such behaviors is equally prohibited. | ||
| 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. | ||
|
|
||
| Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. | ||
| 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). | ||
|
|
||
| ## Attribution | ||
| ## Consequences | ||
| 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. | ||
|
|
||
| This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] | ||
| ## Process for Changes | ||
| 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 and adoption date. | ||
|
|
||
| [homepage]: http://contributor-covenant.org | ||
| [version]: http://contributor-covenant.org/version/1/4/ | ||
| 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. | ||
| 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. | ||
|
|
||
| ## Attribution | ||
| This Code of Conduct was originally adapted from the [Contributor Covenant](http://contributor-covenant.org/version/1/4), 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. | ||
| 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. | ||
| The date that it was adopted by this project was 2020-04-08 and replaces the previous version. | ||
| 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](#process-for-changes) section above. |
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 |
|---|---|---|
| @@ -1,60 +1,111 @@ | ||
| [externals_description] | ||
| schema_version = 1.0.0 | ||
|
|
||
| [cice] | ||
| tag = cice5_cesm2_0_rel_01 | ||
| tag = cice5_20210802 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/CESM_CICE5 | ||
| required = True | ||
| local_path = components/cice | ||
| required = True | ||
|
|
||
| [cice6] | ||
| tag = cesm_cice6_2_0_5 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/CESM_CICE | ||
| local_path = components/cice6 | ||
| externals = Externals.cfg | ||
| required = False | ||
|
|
||
| [cmeps] | ||
| tag = cmeps0.13.40 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/CMEPS.git | ||
| local_path = components/cmeps | ||
| required = True | ||
|
|
||
| [cdeps] | ||
| tag = cdeps0.12.32 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/CDEPS.git | ||
| local_path = components/cdeps | ||
| externals = Externals_CDEPS.cfg | ||
| required = True | ||
|
|
||
| [cpl7] | ||
| tag = cpl7.0.5 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps | ||
| local_path = components/cpl7 | ||
| required = True | ||
|
|
||
| [share] | ||
| tag = share1.0.8 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/CESM_share | ||
| local_path = share | ||
| required = True | ||
|
|
||
| [mct] | ||
| tag = MCT_2.11.0 | ||
| protocol = git | ||
| repo_url = https://github.com/MCSclimate/MCT | ||
| local_path = libraries/mct | ||
| required = True | ||
|
|
||
| [parallelio] | ||
| tag = pio2_5_4 | ||
| protocol = git | ||
| repo_url = https://github.com/NCAR/ParallelIO | ||
| local_path = libraries/parallelio | ||
| required = True | ||
|
|
||
| [cime] | ||
| tag = cime_cesm2_0_rel_06 | ||
| tag = cime6.0.11 | ||
| protocol = git | ||
| repo_url = https://github.com/ESMCI/cime | ||
| required = True | ||
| local_path = cime | ||
| required = True | ||
|
|
||
| [cism] | ||
| tag = release-cesm2.0.01 | ||
| tag = cismwrap_2_1_93 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/cism-wrapper | ||
| repo_url = https://github.com/ESCOMP/CISM-wrapper | ||
| local_path = components/cism | ||
| externals = Externals_CISM.cfg | ||
| required = True | ||
| local_path = components/cism | ||
|
|
||
| [clm] | ||
| tag = release-clm5.0.01 | ||
| tag = ctsm5.1.dev064 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/ctsm | ||
| repo_url = https://github.com/ESCOMP/CTSM | ||
| local_path = components/clm | ||
| externals = Externals_CLM.cfg | ||
| required = True | ||
| local_path = components/clm | ||
|
|
||
| [fms] | ||
| tag = fi_20211011 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/FMS_interface | ||
| local_path = libraries/FMS | ||
| externals = Externals_FMS.cfg | ||
| required = True | ||
|
|
||
| [mosart] | ||
| tag = release-cesm2.0.00 | ||
| tag = mosart1_0_44 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/mosart | ||
| repo_url = https://github.com/ESCOMP/MOSART | ||
| local_path = components/mosart | ||
| required = True | ||
| local_path = components/mosart | ||
|
|
||
| [rtm] | ||
| tag = release-cesm2.0.00 | ||
| tag = rtm1_0_78 | ||
| protocol = git | ||
| repo_url = https://github.com/ESCOMP/rtm | ||
| required = True | ||
| repo_url = https://github.com/ESCOMP/RTM | ||
| local_path = components/rtm | ||
|
|
||
| [ww3] | ||
| tag = ww3_cesm2_0_rel_01 | ||
| protocol = svn | ||
| repo_url = https://svn-ccsm-models.cgd.ucar.edu/ww3/release_tags | ||
| required = True | ||
| local_path = components/ww3 | ||
|
|
||
| [cam] | ||
| local_path = . | ||
| protocol = externals_only | ||
| externals = Externals_CAM.cfg | ||
| required = True | ||
|
|
||
| [externals_description] | ||
| schema_version = 1.0.0 |
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
Oops, something went wrong.