Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync tag sdr_v2.1.2.6 into develop #232

Merged
merged 17 commits into from
May 18, 2023
+242 −306
Merged

Sync tag sdr_v2.1.2.6 into develop #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2022e4d
MSTRF updates for GOCART
wmputman Mar 1, 2023
c51357e
Merge feature/pcolarco/GOCART2G_data_instance into sdr_v2.1.2.1
mathomp4 Mar 28, 2023
f4c7da3
Donifan's 1MOM bug fixes for seasalt
mathomp4 Mar 28, 2023
aa05ff6
Fix memory issue in CA, DU, SS, SU
mathomp4 Apr 6, 2023
d35a239
Changeg global dims to local dims in NI2G_GridCompMod.F90
aoloso Apr 6, 2023
184d909
Update Changelog
mathomp4 Apr 7, 2023
bebc4d5
Fix ESMF Error on instance file read
mathomp4 Apr 18, 2023
1bbb139
updted moist_import to reduce rst size, alt FV3 sponge and new FV3 di…
wmputman Apr 1, 2023
5ad8714
Update changelog
mathomp4 May 4, 2023
730fd26
Fix missing inquires
mathomp4 May 6, 2023
b34fbb8
hand-resolve merge conflicts
sdrabenh May 12, 2023
4edfff4
Update CA2G_GridCompMod.F90
sdrabenh May 12, 2023
7fc523e
Merge branch 'develop' into feature/sdrabenh/sdr_v2.1.2.6_into_develop
sdrabenh May 12, 2023
1497e79
Update Changelog
mathomp4 May 12, 2023
d2165be
Fix bad merge
mathomp4 May 12, 2023
5defba5
Update components to match v11
mathomp4 May 12, 2023
a932e8c
Fix bug with totscacoefrh80 and ocscacoefrh80
mathomp4 May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.7.0
bcs_version: &bcs_version v10.23.0
bcs_version: &bcs_version v11.00.0

orbs:
ci: geos-esm/circleci-tools@1
Expand Down
36 changes: 19 additions & 17 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Fixed
- Made needed code changes in SS2G_GridCompMod.F90 and CA2G_GridCompMod.F90 to permit data instances of of GOCART aerosols to run

- Made needed code changes in `SS2G_GridCompMod.F90` and `CA2G_GridCompMod.F90` to permit data instances of of GOCART aerosols to run
- Added missing brown carbon (BR) climatology hooks to yaml and rc files for data driven instances
- Changed pointers to climatological deposition inputs in yaml and rc files to "/dev/null" since the files pointed to didn't provide them anyway, and in any case they are being used presently in the model
- Changed pointers to climatological nitrate inputs in yaml and rc files to "/dev/null" since pointing to FP files was inconsistent with MERRA-2 files used for other species
- Changed pointers to climatological deposition inputs in yaml and rc files to `/dev/null` since the files pointed to didn't provide them anyway, and in any case they are being used presently in the model
- Changed pointers to climatological nitrate inputs in yaml and rc files to `/dev/null` since pointing to FP files was inconsistent with MERRA-2 files used for other species
- Ensured zero-diff in performance of yaml vs. rc files for ExtData2G vs. ExtData1g for data driven aerosols
- To do: remove hooks to old (legacy) GOCART.data instances in CHEM and setup scripts
- Fixed rc file in legacy O3 component.
- Fixed issue #223 where Global dimension was being used for allocating a local array
- This fixes a long standing issue that one can not start and stop the model in anything less than 3 hour increments to test start/stop regression because of GOCART.
-
- Fixed issue #223 where Global dimension was being used for allocating a local array
- Fix a long standing issue that one can not start and stop the model in anything less than 3 hour increments to test start/stop regression because of GOCART.

### Added

### Changed

## [2.1.4] - 2023-05-04
- Comment out ASSERT to allow `GOCART_DT` to not match the `HEARTBEAT_DT`
- Single-moment moist changes from Donifan
- Change names of microphysics schemes to match refactored physics
- Set `SS_SCALE` default to 0.0
- Updates in CA2G for OpenMP
- Updates for CI
- Update BCs version
- Update components to match GEOSgcm v11.0.0

## [2.1.4] - 2023-05-12

### Fixed

Expand All @@ -32,10 +42,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added


- Added `*` to CA State specs file to allow for ACG to substitute in the long name
- Changes were made so GOCART2G and its children can be run with component level
OpenMP threading. The key change is to create the data structure ThreadWorkspace
- Changes were made so GOCART2G and its children can be run with component level
OpenMP threading. The key change is to create the data structure ThreadWorkspace
to hold variables that should be private to each thread to avoid race conditions.
Additionally spatially distributed arrays that are not in any of the ESMF states
were added to the ESMF internal state so they could be properly handled when
Expand All @@ -45,8 +54,6 @@ option so they are not written to restart.
- Aerosol single scattering backscatter coefficient for each instances and total at wavelengths_profile
- Total (molecular + aerosols) attenuated backscatter coefficient from TOA and sfc at 532nm

### Fixed

### Changed

- Moved to use GitHub Action for label enforcement
Expand All @@ -65,11 +72,6 @@ option so they are not written to restart.
- Extinction/Scattering profile exports at model RH at wavelengths_profile
- Extinction/Scattering profile exports with RH=20% and RH=80% at wavelengths_profile

### Fixed

### Changed


## [2.1.1] - 2022-09-16

### Fixed
Expand Down
Loading