From 2e8c9287543df20a3aa113d304bb7d19cb41f885 Mon Sep 17 00:00:00 2001 From: Joe Stassi Date: Mon, 29 Mar 2021 08:56:44 -0400 Subject: [PATCH 1/3] Fixed GEOSUTIL in gcm_plot.tmpl to point to the install directory instead of to src. --- src/Applications/GEOSdas_App/monthly_setup.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Applications/GEOSdas_App/monthly_setup.pl b/src/Applications/GEOSdas_App/monthly_setup.pl index 0d0bdd25..647546c7 100755 --- a/src/Applications/GEOSdas_App/monthly_setup.pl +++ b/src/Applications/GEOSdas_App/monthly_setup.pl @@ -178,7 +178,7 @@ sub write_plotfiles { $values{"\@BATCH_GROUP"} = "SBATCH --account=$GID"; $values{"\@SITE"} = uc($siteID); $values{"\@GEOSBIN"} = "$FVROOT/bin"; - $values{"\@GEOSSRC"} = dirname($FVROOT) ."/src"; + $values{"\@GEOSSRC"} = $ENV{"GEOSUTIL"}; replaceLabels($infile, $outfil, \%values,\@setenvs); From 1cd358e32330bb253e8d70bb9c76c747eac4e1df Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 16 Apr 2021 09:36:51 -0400 Subject: [PATCH 2/3] Update to ESMA_env v1.4.3 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 1efc470b..36b2dc2c 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSadas: env: local: ./@env remote: ../ESMA_env.git - tag: v1.4.2 + tag: v1.4.3 develop: main cmake: From 0684e1d86fb925cfd1b47ed24705195bb17c57ac Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 19 Apr 2021 13:29:07 -0400 Subject: [PATCH 3/3] Add CONTRIBUTING and CODE_OF_CONDUCT --- CODE_OF_CONDUCT.md | 133 +++++++++++++++++++++++++++++++++++++++++++++ CONTRIBUTING.md | 16 ++++++ 2 files changed, 149 insertions(+) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..704e6d1f --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,133 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders 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, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +thomas.l.clune@nasa.gov. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available +at [https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..73ec8c52 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,16 @@ +# Contributing to GEOSadas + +Contributing code to GEOSadas should be done via a Pull Request to this repository. + +## Contributor License Agreement (CLA) + +All external developers contributing to GEOS-ESM projects must complete a [Contributor License +Agreement](https://github.com/GEOS-ESM/cla). + +NOTE: Internal NASA contributors associated with GEOS, including contractors, +are covered by other agreements and do not need to sign a CLA. + +## License + +By contributing to GEOS-ESM projects, you agree your contributions will be +licensed under the [NASA Open Source Aggrement (NOSA) License](LICENSE.md)