Skip to content

Merge develop into main#110

Draft
joewallwork wants to merge 215 commits intomainfrom
develop
Draft

Merge develop into main#110
joewallwork wants to merge 215 commits intomainfrom
develop

Conversation

@joewallwork
Copy link
Copy Markdown
Collaborator

@joewallwork joewallwork commented Mar 24, 2025 •
edited
Loading

At the end of the project, once all open PRs have been merged or closed, we should merge the GISS-GC develop branch into the GISS-GC main branch.

Checklist

  • Check there are no open GEOS-Chem issues.
  • Check there are no open HEMCO issues.
  • Check any open GISS-GC issues are tasked as follow-ups to the project.
  • Merge GEOS-Chem develop into GEOS-Chem main (Merge GEOS-Chem develop into main geos-chem#17).
  • Merge HEMCO develop into HEMCO main (Merge HEMCO develop into main HEMCO#8).
  • Check all open GISS-GC PRs have been merged into develop or closed.
  • Check all open GEOS-Chem PRs have been merged into develop or closed.
  • Check all open HEMCO PRs have been merged into develop or closed.
  • Check .gitmodules specifies the main branches for each repo.
  • Check CI jobs pass for this PR.
  • Switch project settings back so that main is the default branch.

ltmurray and others added 30 commits July 19, 2024 16:33
@ltmurray @joewallwork
Rename ModelE2.1 modules that would be in conflict with GEOS-Chem mod…
b186ea8 
…ules
@ltmurray @joewallwork
Modifications to ModelE2.1 to enable verions 12.9.3 of GEOS-Chem to c…
f8bc7cd 
…ompile and run as alternative chemistry operator and output subdaily mixing ratios diagnostics.
@ltmurray @joewallwork
Add GEOS-Chem version 12.9.3 as submodule
446471e
@ltmurray @joewallwork
Update submodule
d0535a2
@ltmurray @joewallwork
Allow GEOS-Chem methane and ozone to interact with radiation code. Up…
94306ed 
…date radiation code from F77 to F90 standard. Add some radiative forcing SUBDD diagnostics.
@joewallwork
Declare ij_fcghg under TRACERS_GC preprocessor option
3d295b5
@AmyOctoCat
tell git to ignore everything in the decks directory apart from the M…
d66b210 
…akefile
@AmyOctoCat
Merge pull request #14 from fetch4/add-git-ignore-file
e21c57c 
Tell git to ignore everything in the decks directory apart from the Makefile
@joewallwork
Add GISS_GC_14 rundeck to repo
a9d4d9c
@joewallwork
Merge pull request #15 from fetch4/add-rundecks
a22b1c0 
Add `GISS_GC_14.R` rundeck to repo
@ltmurray @joewallwork
Add GEOS-Chem 14.3.1, HEMCO 3.8.1, and Cloud-J 7.7.1 as submodules fo…
dfbb263 
…r ModelE2.1.2
@ltmurray @joewallwork
Updates to ModelE2.1 to allow GEOS-Chem version 14.3.1 to be an alter…
df9cfe3 
…native chemistry operator.

These changes are likely robust.
@ltmurray @joewallwork
Failed attempt at building GEOS-Chem libraries and linking to ModelE2.1.
9cd8698 
This purposely breaks the GCClassic code, and is meant to try to get a working code, so we can go back to the prior commit with a new branch to create a version that preserves the existing GCClassic code.
@joewallwork
Introduce GC_BUILD_DIR and GC_LIB_DIR environment variables
8c70e55
@joewallwork
Add linker flags: -nostartfiles -nofor-main
26a25ae
@joewallwork
Add GC to clean recipe
d78c606
@joewallwork
Fix MODEL_CLASSIC typo
65a2a4a
@joewallwork
Hook up right branch for GEOS-Chem
05e7df9
@joewallwork
Drop comments in model/Makefile and reformat
3938d0a
@joewallwork
Use -qopenmp for recent versions of the Intel compiler
75404e9
@joewallwork
Pass GISS OpenMP configuration through to GEOS-Chem
468ed51
@joewallwork
Equivalent linker flags for gfortran, too; pass F90 and linker flags …
a10e9eb 
…to GEOS-Chem
@joewallwork
Need MODEL_ compile definition
3e71ea0
@joewallwork
Account for having separate C and Fortran NetCDF installs
c396587
@joewallwork
Only alter LFLAGS if GC=YES
1b263b0
@joewallwork
Add OpenMP flags for gfortran
1088414
@joewallwork
Base F90FLAGS off FFLAGS
2283165
@joewallwork
Simplify change set
53694dc
@joewallwork
Do not include executable
45a72a2
@joewallwork
Add development environment Dockerfile
beb1767
joewallwork and others added 27 commits March 12, 2025 11:11
@joewallwork
Load from fort.1.nc
881063e
@joewallwork
Set species units before FIRST_CHEM conditional
98642ec
@joewallwork
Remove comment [skip ci]
b3baaae
@joewallwork
Revert species unit setting, but ensure set on first_chem
21ab6f3
@joewallwork
Can't call io_chem until trm is allocated; switch back to fort.2.nc
c7250fe
@joewallwork
Fix error message in Get_GC_Restart
f6b2150
@joewallwork
Put TrM into species concentration after calling IO_CHEM
532bebb
@joewallwork
read_dist action for IO_CHEM
72b8d3e
@joewallwork
Revert space
57bc768
@joewallwork
Drop TODO
b77641c
@joewallwork
Call find_later_rsf when needed
33ce43b
@joewallwork
Drop unnecessary conversion; formatting
399c6a9
@joewallwork
Clearer comments on restart file load
686c065
@joewallwork
Attempt at fixing units
0a20da7
@joewallwork
NOTE on io_rsf
9b0297c
@joewallwork
Remove restart files before cold restart
7e16a52
@joewallwork
Ignore generated module files
1b4fdeb
@joewallwork
Unit conversions seem fixed
d6eea03
@joewallwork
Drop unnecessary imports; formatting
773da18
@ltmurray
Merge pull request #90 from fetch4/79_reinit-model-take2
2990576 
Loading from checkpoint file if not cold restart (take 2)
@joewallwork
Checkpoint file uses kg
1f17a61
@joewallwork
Use correct end date and resolution
ee51a25
@joewallwork
Use correct number of levels
d45fde8
@ltmurray
Merge pull request #94 from fetch4/93_prod-run-conversion
555709c 
Checkpoint file uses kg
@joewallwork
Only run compile_giss CI job if code or config changes
78e4f26
@joewallwork
Merge pull request #95 from fetch4/misc-fixes
8321358 
Misc fixes
@joewallwork
Use develop branch throughout
dd73c0d
@joewallwork joewallwork self-assigned this Mar 24, 2025
AdelekeBankole and others added 2 commits March 24, 2025 16:42
@AdelekeBankole
Merge pull request #109 from fetch4/gitmodules-update
3712b37 
Use `develop` branch for all submodules
@AdelekeBankole @joewallwork
Update documentation for GISS-GC (#106)
52ac49c 
* remove outdated modelE README
* update readme with build instructions
* add contributing section to readme

Co-authored-by: Joe Wallwork <22053413+jwallwork23@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@joewallwork joewallwork

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@joewallwork @ltmurray @AmyOctoCat @AdelekeBankole