Skip to content

Merge gsl/develop to RRFS_dev#137

Merged
SamuelTrahanNOAA merged 223 commits into
NOAA-GSL:RRFS_devfrom
SamuelTrahanNOAA:merge_gsl_develop_to_RRFS_dev-20220314
Mar 15, 2022
Merged

Merge gsl/develop to RRFS_dev#137
SamuelTrahanNOAA merged 223 commits into
NOAA-GSL:RRFS_devfrom
SamuelTrahanNOAA:merge_gsl_develop_to_RRFS_dev-20220314

Conversation

@SamuelTrahanNOAA
Copy link
Copy Markdown
Collaborator

Replaces PR #136

SMoorthi-emc and others added 30 commits October 1, 2021 16:45
Comment thread physics/cu_gf_driver.F90
!use physcons , g => con_g, cp => con_cp, xlv => con_hvap, r_v => con_rv
use machine , only: kind_phys
use cu_gf_deep, only: cu_gf_deep_run,neg_check,fct1d3
use cu_gf_deep, only: cu_gf_deep_run,neg_check,autoconv,aeroevap,fct1d3
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

autoconv and aeroevap should no longer be in this use statement

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I believe this was a workaround for a compiler issue. The compiler wanted some extra things in the scope that it shouldn't need.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Strange, we did not run into that issue before. But I guess it is not a big deal.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Remember that the community repository is more widely tested than our branches. There are many compiler versions on many platforms, each of which has its own eccentricities.

Comment thread physics/cu_gf_driver.F90
else
do i=1,im
if (icy(i)) then
if (kdt == 1 .or. (.not. cplflx .or. lakefrac(i) > zero)) then
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

@SamuelTrahanNOAA A PR#131 has to be merged into this code. This line should be:
if ((kdt == 1.and. lsm_cold_start) .or. (.not. cplflx .or. lsm==lsm_ruc .or. lakefrac(i) > zero)) then

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

That PR can go in next.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

The code change you (@tanyasmirnova) request does not belong in this PR because the sole purpose of this PR is to merge gsl/develop into RRFS_dev. All #131 changes need to be in a separate PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.