DO NOT MERGE YET - Updates for JEDI+UFS #1504
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule FV3
updated
6 files
| +4 −2 | .gitmodules | |
| +4 −0 | CMakeLists.txt | |
| +1 −1 | atmos_cubed_sphere | |
| +234 −34 | atmos_model.F90 | |
| +4 −2 | fv3_cap.F90 | |
| +35 −3 | module_fcst_grid_comp.F90 |
Submodule GOCART
updated
58 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule MOM6
updated
5 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -8,7 +8,8 @@ endif() | |||||
| if(DEBUG) | ||||||
| add_definitions(-DDEBUG) | ||||||
| set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv -init=snan,arrays") | ||||||
| set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv -fPIC") | ||||||
| set(CMAKE_CXX_FLAGS_DEBUG "-g -fPIC" CACHE STRING "" FORCE) | ||||||
|
Collaborator
Author
There was a problem hiding this comment. Note to self. Should this be
Suggested change
? |
||||||
| else() | ||||||
| if(FASTER) | ||||||
| set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip") | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,9 +33,6 @@ load(pathJoin("hpc-gnu", hpc_gnu_ver)) | |
| hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25" | ||
| load(pathJoin("hpc-mpt", hpc_mpt_ver)) | ||
|
|
||
| load("ufs_common") | ||
|
|
||
| setenv("CC", "mpicc") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,9 +34,6 @@ load(pathJoin("hpc-intel", hpc_intel_ver)) | |
| hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25" | ||
| load(pathJoin("hpc-mpt", hpc_mpt_ver)) | ||
|
|
||
| load("ufs_common") | ||
|
|
||
| setenv("CC", "mpicc") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,3 +44,5 @@ emission_scheme: fengsha # choose among: fengsha, ginoux, k14 | |
| alpha: 0.039 | ||
| gamma: 0.8 | ||
| vertical_to_horizontal_flux_ratio_limit: 2.e-04 | ||
| soil_moisture_factor: 1.0 | ||
| soil_drylimit_factor: 1.0 | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note to self. This PR contains develop as of Nov 14, therefore the NoahMP submodule still shows up as a change. Need to pull in/fast forward and then this should go away (and some other stuff)