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

Jump to bottom

Sync develop into main #717

Merged
merged 130 commits into from
Mar 8, 2023
Merged

Sync develop into main #717

merged 130 commits into from
Mar 8, 2023

Conversation

sdrabenh
Copy link
Collaborator

@sdrabenh sdrabenh commented Mar 7, 2023

No description provided.

gmao-jkolassa and others added 30 commits December 7, 2022 10:01
@gmao-jkolassa
add clam_varpar use statement
364b7fd
@gmao-jkolassa
add dependencies for CLM directories
ebb0739
@gmao-jkolassa
cleanup of CatchCN constants
6d59096
@adarmenov
WIP: Initial commit of IGNI
c92d007
@adarmenov
Condense the import spec.
286823f 
Wind at 2m, temperature and humidity at 10m,
are not used, hence they can be removed from the
import spec.
@adarmenov
Refactor - remove unused variables
59e392d
@adarmenov
Enable/disable calculation of fire danger at runtime
f52b6ec
@gmao-jkolassa
Merge branch 'develop' into feature/jkolassa_catchCNrst_cleanup
4c14bf6
@gmao-jkolassa
replace orbital and day length subroutines with MAPL versions
283a4ea
@gmao-jkolassa
removing naming conflict
8835309
@gmao-jkolassa
replace orbital and daylength routines with MAPL functions and import…
de9b2f4 
… CatchCN constants
@gmao-jkolassa
change variable names
db806a8
@gmao-jkolassa
changing variable names in function call
bd0c61b
@adarmenov
Use PRLAND
fdd444e
@gmao-jkolassa
pointing to parameters in shared parameter file
3d8d268
@gmao-jkolassa
pointing to parameters in shared parameter file
bbcc1a1
@gmao-jkolassa
importing CatchCN parameters from shared file
d4a0c6e
@gmao-jkolassa
importing CatchCN parameters from shared file
89c88b0
@gmao-jkolassa
new shared parameter file for CatchCN
e336ad9
@gmao-jkolassa
updating CMake file
544bf08
@gmao-jkolassa
correct spelling
ee643d6
@gmao-jkolassa
adding share parameter file
627703b
@adarmenov
Refactor CFFWI
0128031 
This refactoring reproduces the initial implementation.
There is no notable speed up. Slightly smaller code,
however some of the changes may have resulted in more
difficult to read code.
@adarmenov
Add tests for CFFWI
9ecc254
@biljanaorescanin
change to new inputs location
5d67cd8
@weiyuan-jiang
create orbit object
b7d3f5d
@weiyuan-jiang
get orbital constants from MAPL
9df6bfc
@gmao-jkolassa
adding ESMF calendar generation
339bcaf
@adarmenov
WIP: Test the MAPL local solar noon functionality; tidy up comments.
8557d56
@adarmenov
Refactor the CFFWI module.
7454ae2 
Define the CFFWI functions as elemental.
Tidy up comments.
biljanaorescanin and others added 17 commits March 1, 2023 20:11
@biljanaorescanin
more comments
3ffd7a6
@gmao-rreichle
edited comment (get_snow_alb_mod10a1_30arcsec.pro)
e55c581
@gmao-jkolassa
Merge branch 'develop' into feature/jkolassa_catchCNrst_cleanup
4e50991
make_bcs modified to add a new 0.66 degree MOM6 grid
2ac19b0
Merge branch 'develop' into yv/feature/mom6-0.66deg
077bb4d
@sdrabenh
Merge pull request #710 from GEOS-ESM/feature/adarmenov/ignio
7028ee0 
IGNI: VPD over land
@sdrabenh
Merge branch 'develop' into feature/rreichle/make_bcs_cleanup
2f39435
@sdrabenh
Merge branch 'develop' into yv/feature/mom6-0.66deg
5b03ac9
@gmao-jkolassa
Merge branch 'develop' into feature/jkolassa_catchCNrst_cleanup
817325d
360x210 MOM6 removed from make_bcs. Fixed prompt for ocean model.
aee586c
Merge branch 'yv/feature/mom6-0.66deg' of github.com:GEOS-ESM/GEOSgcm…
69d1e8d 
…_GridComp into yv/feature/mom6-0.66deg
@sdrabenh
Merge pull request #707 from GEOS-ESM/feature/rreichle/make_bcs_cleanup
9cfd09c 
cleanup and reorganization of files in ./Raster (make_bcs)
@gmao-rreichle
Merge branch 'develop' into yv/feature/mom6-0.66deg
19d12f8
@gmao-rreichle
very minor MOM5/6 cleanup (MOM_VERSION init, comments, whitespace)
e4aa8dc
@mathomp4
Merge pull request #712 from GEOS-ESM/yv/feature/mom6-0.66deg
b513561 
Add new 0.66 degree MOM6 grid into make_bcs
@biljanaorescanin
Merge branch 'develop' into feature/jkolassa_catchCNrst_cleanup
bfd00c7
@sdrabenh
Merge pull request #682 from GEOS-ESM/feature/jkolassa_catchCNrst_cle…
d4775d5 
…anup

Cleanup of Catchment-CN constants in CatchmentCNRst.F90
@sdrabenh sdrabenh added enhancement New feature or request 0 diff The changes in this pull request have verified to be zero-diff with the target branch. labels Mar 7, 2023
@sdrabenh sdrabenh requested a review from mathomp4 March 7, 2023 19:41
@sdrabenh sdrabenh requested review from a team as code owners March 7, 2023 19:41
sanAkel
sanAkel approved these changes Mar 7, 2023
View reviewed changes
Copy link
Contributor

@sanAkel sanAkel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following @mathomp4 and approve!

@sdrabenh sdrabenh merged commit 4689e6a into main Mar 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sanAkel sanAkel sanAkel approved these changes

@mathomp4 mathomp4 mathomp4 approved these changes

Assignees
No one assigned
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch. enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@sdrabenh @mathomp4 @sanAkel @gmao-jkolassa @adarmenov @biljanaorescanin @weiyuan-jiang @gmao-rreichle @bena-nasa