Skip to content

Commit

Permalink
Merge PR #252 (branch 'feature/TOMAS') into dev/14.2.0
Browse files Browse the repository at this point in the history
Resolved conflicts in:
	CHANGELOG.md
	src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt
	src/GCHP_GridComp/GEOSChem_GridComp/geos-chem
	src/GCHP_GridComp/HEMCO_GridComp/HEMCO

Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
  • Loading branch information
msulprizio committed Apr 5, 2023
2 parents 6fc09e1 + 1013424 commit b107830
Show file tree
Hide file tree
Showing 32 changed files with 314 additions and 306 deletions.
17 changes: 0 additions & 17 deletions .github/ISSUE_TEMPLATE/ask-a-question-about-geos-chem.md

This file was deleted.

5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: GCHP user manual
url: https://gchp.readthedocs.io/en/stable
about: Click this link to read the GCHP user manual.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/new-feature-or-discussion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Request a new GCHP feature or start a discussion
about: Use this template for topics relevant to the GCHP superproject. For GEOS-Chem, HEMCO, or other submodule see the respective repositories on Github.
---

### Name and Institution (Required)

Name:
Institution:

### Confirm you have reviewed the following documentation

- [ ] [Contributing guidelines](https://gchp.readthedocs.io/en/latest/reference/CONTRIBUTING.html)

### New GCHP feature or discussion

Please provide a clear and concise overview of the discussion topic or new feature requested.
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/question-issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: Ask a question about or report an issue with GCHP
about: Use this template for topics relevant to the GCHP superproject. For GEOS-Chem, HEMCO, or other submodule see the respective repositories on Github.
---

### Name and Institution (Required)

Name:
Institution:

### Confirm you have reviewed the following documentation

- [ ] [Support guidelines](https://gchp.readthedocs.io/en/latest/reference/SUPPORT.html)
- [ ] [User manuals](https://gchp.readthedocs.io/en/latest/geos-chem-shared-docs/supplemental-guides/related-docs.html)
- [ ] [Debugging GEOS-Chem and HEMCO errors](https://gchp.readthedocs.io/en/latest/geos-chem-shared-docs/supplemental-guides/debug-guide.html)
- [ ] [Current and past Github issues](https://github.com/geoschem/GCHP/issues)

### Description of your issue or question

Please provide as much detail as possible. Always include the GCHP version number and any relevant configuration and log files.

31 changes: 0 additions & 31 deletions .github/ISSUE_TEMPLATE/report-a-bug-or-technical-issue.md

This file was deleted.

17 changes: 0 additions & 17 deletions .github/ISSUE_TEMPLATE/request-a-new-feature.md

This file was deleted.

26 changes: 0 additions & 26 deletions .github/ISSUE_TEMPLATE/start-a-geos-chem-discussion.md

This file was deleted.

27 changes: 0 additions & 27 deletions .github/ISSUE_TEMPLATE/submodule-updates.md

This file was deleted.

24 changes: 24 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
### Name and Institution (Required)

Name:
Institution:

### Confirm you have reviewed the following documentation

- [ ] [Contributing guidelines](https://gchp.readthedocs.io/en/latest/reference/CONTRIBUTING.html)

### Describe the update

Please provide a clear and concise overview of the update.

### Expected changes

Please provide details on how this update will impact model output and include plots or tables as needed.

### Reference(s)

If this is a science update, please provide a literature citation.

### Related Github Issue(s)

Please link to the corresponding Github issue here. If fixing a bug, there should be an issue describing it with steps to reproduce.
86 changes: 0 additions & 86 deletions .github/PULL_REQUEST_TEMPLATE/create-a-gchp-pull-request.md

This file was deleted.

39 changes: 25 additions & 14 deletions .github/workflows/findRefKey.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,36 @@ hash=$3


commits=`git rev-list --max-count=${MAX_COMMITS} ${hash}`
describe_command="git describe --tags"
recent_tags=`git tag --sort=-v:refname --list "[0-9]*" | head -n 5`

# in reverse chronological order we query dynamodb for the last
# successful simulation run
for commit in ${commits}
do
find_previous_tag

# query dynamodb for the given primary key simulation
output=`aws dynamodb get-item \
--table-name geoschem_testing \
--key "{\"InstanceID\": {\"S\": \"${primary_key}\"}}"`
# Check if the simulation for given primary key exists and ran
# successfully print out the first successful primary key and exit
if [[ `echo $output | jq '.Item.ExecStatus.S | contains("SUCCESSFUL")'` == "true" ]] \
&& [[ `echo $output | jq 'any(.Item.Stages.L[].M.Name.S; . == "RunGCHP")'` == "true" ]]; then
echo $primary_key
exit 0
fi
exclude_string=""

for tag in ${recent_tags}
do
if [[ ! -z $exclude_string ]]; then
describe_command="git describe ${exclude_string} --tags"
else
describe_command="git describe --tags"
fi
find_previous_tag

# query dynamodb for the given primary key simulation
output=`aws dynamodb get-item \
--table-name geoschem_testing \
--key "{\"InstanceID\": {\"S\": \"${primary_key}\"}}"`
# Check if the simulation for given primary key exists and ran
# successfully print out the first successful primary key and exit
if [[ `echo $output | jq '.Item.ExecStatus.S | contains("SUCCESSFUL")'` == "true" ]] \
&& [[ `echo $output | jq 'any(.Item.Stages.L[].M.Name.S; . == "RunGCHP")'` == "true" ]]; then
echo $primary_key
exit 0
fi
exclude_string="${exclude_string} --exclude ${tag}"
done
done

echo "Error: No successful primary key found within $MAX_COMMITS commits"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spack-deployment-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install dependencies
run: |
set -x
conda install -y -c conda-forge gh flake8 mypy isort
conda install -y -c conda-forge gh flake8 mypy isort curl
- name: Login with PAT
run: |
git config --global user.email "lestrada00@gmail.com"
Expand Down
Loading

0 comments on commit b107830

Please sign in to comment.