Skip to content

Commit a740464

Browse files
Merge BRIDGE into main in prep for release v1.0.0 (#8)
2 parents 90ba7d3 + 491b280 commit a740464

File tree

86 files changed

+22086
-446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+22086
-446
lines changed

.circleci/config.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: 2.1
2+
3+
# Anchors in case we need to override the defaults from the orb
4+
#baselibs_version: &baselibs_version v7.17.0
5+
#bcs_version: &bcs_version v11.4.0
6+
7+
orbs:
8+
ci: geos-esm/circleci-tools@2
9+
10+
workflows:
11+
build-test:
12+
jobs:
13+
# Build GEOSldas
14+
- ci/build:
15+
name: build-GEOSldas-on-<< matrix.compiler >>
16+
context:
17+
- docker-hub-creds
18+
matrix:
19+
parameters:
20+
compiler: [ifort, gfortran]
21+
#baselibs_version: *baselibs_version
22+
repo: GEOSldas
23+
checkout_fixture: true
24+
mepodevelop: false
25+
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra

.github/CODEOWNERS

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This is a comment.
2+
# Each line is a file pattern followed by one or more owners.
3+
# Order is important; the last matching pattern takes the most
4+
# precedence.
5+
6+
# LDAS Gatekeepers own all files
7+
* @GEOS-ESM/ldas-gatekeepers
8+
9+
# The LDAS gatekeepers and CMake should know/approve these
10+
/.github/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
11+
/.circleci/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
12+
/.codebuild/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
13+
14+
# The GEOS CMake Team should be notified about changes to the CMakeLists.txt files in this repository
15+
CMakeLists.txt @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
16+
17+
# The GEOS CMake Team should be notified about and approve config changes
18+
/config/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## :memo: Automatic PR: `develop``release/MAPL-v3`
2+
3+
### Description
4+
5+
<!-- Write your description here -->
6+
7+
## :file_folder: Modified files
8+
<!-- Diff files - START -->
9+
<!-- Diff files - END -->
10+
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Push to Develop
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
pull_request:
10+
name: Create Pull Request
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repo
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
- name: Run the action
18+
uses: devops-infra/[email protected]
19+
with:
20+
github_token: ${{ secrets.GITHUB_TOKEN }}
21+
source_branch: develop
22+
target_branch: release/MAPL-v3
23+
label: automatic,MAPL3,Skip Changelog
24+
template: .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
25+
get_diff: true
26+
assignee: ${{ github.actor }}
27+
old_string: "<!-- Write your description here -->"
28+
new_string: ${{ github.event.commits[0].message }}
29+
title: Auto PR - develop → MAPL-v3 - ${{ github.event.commits[0].message }}
30+

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
1-
# Changelog
1+
# Changelog for `GEOSldas_GridComp`
22

33
All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
-----------------------------
9+
810
## [Unreleased]
911

12+
-----------------------------
13+
14+
## [v1.0.0] - 2024-03-26
15+
16+
- Inaugural version. 0-diff vs. GEOSldas v18.0.0.
17+
18+
-----------------------------
19+
1020
### Added
1121

1222
### Changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
esma_set_this ()
22

3-
esma_add_subdirectory(GEOSgcm_GridComp )
3+
esma_add_subdirectory(GEOSgcm_GridComp)
44

55
set (alldirs
66
GEOSmetforce_GridComp
@@ -15,3 +15,5 @@ esma_add_library(${this}
1515
SUBDIRS LDAS_Shared
1616
DEPENDENCIES GEOSland_GridComp makebcs MAPL
1717
INCLUDES ${INC_ESMF})
18+
19+
esma_add_subdirectory(GEOSldas_App)

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Contributing to GEOSgcm_GridComp
1+
# Contributing to GEOSldas_GridComp
22

3-
Contributing code to GEOSgcm_GridComp should be done via a Pull Request to this repository.
3+
Contributing code to GEOSldas_GridComp should be done via a Pull Request to this repository.
44

55
## Contributor License Agreement (CLA)
66

0 commit comments

Comments
 (0)