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

Merge current e3sm-coupled code with e3sm-rebase-gcam6 #383

Open
wants to merge 74 commits into
base: e3sm-rebase-gcam6
Choose a base branch
from
Open

Merge current e3sm-coupled code with e3sm-rebase-gcam6 #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
bf47ca4
Update to GCAM6 with functioning land feedback
aldivi Apr 7, 2023
6796e4d
Added a late check for very high scalars
aldivi May 5, 2023
852c68b
Mods to try to get scalars set for GCAM
aldivi May 19, 2023
b08eb26
Contains additional debug info for passing scalars
aldivi Jun 12, 2023
9d6964a
Updated GCAM restart control to behave like E3SM
aldivi Jul 19, 2023
9b922d3
Updated to 5-year average data for scalars
aldivi Jul 21, 2023
d139c67
Increase efficiency and update carbon scaling
aldivi Jul 29, 2023
e0603f0
modification for co2 downscaling
Aug 1, 2023
60bf29e
resolve some bugs
Aug 2, 2023
2f47dd9
remove space in the region name
Aug 9, 2023
0ea4b4e
Ignoring some untracked files
aldivi Aug 31, 2023
05951e5
modify variable name
Sep 5, 2023
4c8c38b
modify variable names
Sep 9, 2023
e700250
use vector to avoid the hard-coded array dimension
Sep 9, 2023
4b708b4
resolve some bugs
Sep 9, 2023
7f2e6a7
debug
Sep 9, 2023
86e4cd7
debug
Sep 9, 2023
fcb4c4c
debug
Sep 9, 2023
d7aa0b2
debug
Sep 9, 2023
926aa14
Some guards to ensure no floating point exceptions are raised for:
pralitp Sep 11, 2023
7eb5bac
implement the seperation of shipment co2 from surface co2
Sep 19, 2023
ec5d826
debug
Sep 19, 2023
a7d8fe5
modify co2 mappign file
Sep 19, 2023
ba8812f
add convergence-based downscaling method
Sep 19, 2023
4a48d70
debug
Sep 19, 2023
f378fd0
debug
Sep 19, 2023
7362e45
debug
Sep 19, 2023
aeee8a4
debug
Sep 19, 2023
6705977
debug
Sep 19, 2023
bd52f91
Added carbon density scaling to GCAM
aldivi Sep 19, 2023
b812143
Added the carbon density mapping file to the repo
aldivi Sep 19, 2023
0c1227c
Merge branch 'aldivi/gcam_gcam6' of github.com:JGCRI/gcam-core into a…
aldivi Sep 19, 2023
1b0b5e9
debug
Sep 19, 2023
99417b6
Merge branch 'aldivi/gcam_gcam6_carbon_density' into aldivi/gcam_gcam6
aldivi Sep 19, 2023
e82647f
carbon density scaling complete; needs more testing
aldivi Sep 20, 2023
69c773b
debug
Sep 20, 2023
7e56cf2
modify variable name
Sep 20, 2023
0a0f340
Fixed carbon density scaling bug
aldivi Sep 27, 2023
1f13d73
debug
Sep 28, 2023
bf3f3cd
debug
Sep 28, 2023
bd66b00
add diagnostics output
Sep 29, 2023
3075ae5
debug
Sep 29, 2023
23d35fe
debug
Sep 30, 2023
82d8c7b
scale base-year co2 emission
Sep 30, 2023
0782073
debug
Oct 2, 2023
46c2fa5
debug
Oct 2, 2023
2955f20
debug
Oct 2, 2023
67705ba
debug
Oct 2, 2023
4b32b05
debug
Oct 2, 2023
1b7eeee
debug
Oct 2, 2023
decfd2a
debug
Oct 2, 2023
b089333
debug
Oct 2, 2023
285c381
debug
Oct 3, 2023
da570e6
debug
Oct 3, 2023
aff302a
debug
Oct 3, 2023
cb7b588
debug
Oct 3, 2023
a370d14
debug
Oct 3, 2023
263767a
debug
Oct 3, 2023
8681050
debug
Oct 3, 2023
f4cda89
debug
Oct 3, 2023
537bb0e
clean the diagnostics output
Oct 3, 2023
9487ab3
Merge branch 'daleihao/gcam_gcam6' of https://github.com/daleihao/gca…
aldivi Nov 7, 2023
9f532ab
Completed CO2 downscaling
aldivi Dec 8, 2023
d604629
merged with e3sm v2.1
aldivi Dec 18, 2023
5da7cc0
fix bug for co2 downscaling
Jan 6, 2024
22bde7a
Cleaned up some diagnostic printing code
aldivi Jan 18, 2024
970f98a
Merge pull request #376 from daleihao/daleihao/gcam_gcam6_merge_co2
aldivi Jan 18, 2024
3ea7fe7
Merge branch 'aldivi/gcam_gcam6_merge_co2' of github.com:JGCRI/gcam-c…
aldivi Jan 18, 2024
3172c6f
Removed boost files from repo
aldivi Jan 31, 2024
38812d0
Fixed minor bug in co2 downscaling
aldivi May 10, 2024
205a815
Fixed calcScalers segmentation fault bug
Jul 18, 2024
8ee87e2
Disabled unnecessary diagnostic log outputs
Jul 23, 2024
2b858e9
Trap gcam output floating point exception
Aug 13, 2024
daa34ef
removed unnecessary gcam submodule
Oct 23, 2024
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
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,10 @@ xcuserdata
*.xcuserstate
.Rproj.user
input/gcamdata/inst/extdata/emissions/CEDS/desktop.ini

# some files related to eigen
util/eigen-3.4.0.zip
util/eigen-3.4.0/.gitignore
util/eigen-3.4.0/.gitlab-ci.yml
util/eigen-3.4.0/.gitlab/
util/eigen-3.4.0/.hgeol
7 changes: 4 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[submodule "output/modelinterface/modelinterface"]
path = output/modelinterface/modelinterface
url = https://github.com/JGCRI/modelinterface.git
[submodule "util/testing-framework"]
path = util/testing-framework
url = https://stash.pnnl.gov/scm/jgcri/gcam-testing-framework.git
[submodule "cpl/deps/eigen"]
path = cpl/deps/eigen
url = [email protected]:PX4/eigen
branch = 3.4
1 change: 0 additions & 1 deletion cpl/data/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
*.csv
*.txt
Loading