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.

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

Fix several data component issues #1987

Merged
merged 4 commits into from
Oct 25, 2017
Merged

Fix several data component issues #1987

merged 4 commits into from
Oct 25, 2017

Conversation

mvertens
Copy link
Contributor

This PR fixes several outstanding issues:

  1. src/components/data_comps/dshare was moved to src/share/streams in order
    to resolved issue Discussion on new organization of shr_stream_mod and related code #1802.

  2. For aquaplanet runs - the landmask was reset in docn_comp_mod.F90
    and in fact this does work if you are reading an input sst file as the
    aquaplanet forcing. The right place to put this is in
    shr_strdata_init.F90 right after the model grid is read in. An
    optional argument was introduced in shr_strdata_init.F90
    (reset_domain_mask) that will allow this in a backwards compatible manner.
    This resolves issue Q compset DOCN streams not zeroing land mask with SE dycore #1960.

  3. If the data component domain file is equal to 'UNSET' the 'domainfile' namelist
    variable should be set to'null'which will assume that the model domain is contained
    in the first stream file. This resolves issue Case created even with no domain file #1937.

Test suite: scripts_regressions_tests
The following extra tests were also run on cheyenne and compared to cesm2_0_alpha07f:

ERI.T62_g16.C1850ECO.cheyenne_intel.pop-ecosys
ERI.T62_g37.G.cheyenne_intel.pop-cice
ERP_D_Ln9.f19_f19_mg17.QPC6.cheyenne_intel.cam-outfrq9s
ERP_D_Ln9.f19_f19_mg17.QSC6.cheyenne_intel.cam-outfrq9s
ERP_Ln9.f09_f09_mg17.F1850_DONOTUSE.cheyenne_intel.cam-outfrq9s
ERP_P180x2_D_Ld5.f19_g17_gl4.I1850Clm50BgcCropG.cheyenne_intel.clm-default
ERR.f45_g37_rx1.A.cheyenne_intel
ERS_IOP.T62_g16.CIAF.cheyenne_intel.pop-default
ERS_IOP.T62_g16.GIAF.cheyenne_intel.pop-default
ERS_Lm3.T62_g16.AIAF.cheyenne_intel
ERS_Ly3.f09_g16_gl4.T1850G.cheyenne_intel

Test baseline: cesm2_0_alpha07b
Test namelist changes: none
Test status: bit for bit

Fixes #1802
Fixes #1960
Fixes #1937

User interface changes?: None
Update gh-pages html (Y/N)?:N
Code review:

@jedwards4b jedwards4b merged commit 4e7bd64 into master Oct 25, 2017
@apcraig
Copy link
Collaborator

apcraig commented Oct 25, 2017

It looks like the dependency on the driver share code was not removed. I think that is important.

@mvertens
Copy link
Contributor Author

mvertens commented Oct 25, 2017 via email

@mvertens
Copy link
Contributor Author

mvertens commented Oct 25, 2017 via email

@apcraig
Copy link
Collaborator

apcraig commented Oct 25, 2017

I am not raising a driver share code issue, I am raising an issue that is directly related to the shr stream code. It currently depends on driver share code. That dependency should be removed.

This is not difficult to do and was pointed out in issue #1802.

@mvertens
Copy link
Contributor Author

mvertens commented Oct 25, 2017 via email

@mvertens mvertens deleted the mvertens/fix_datacomps branch March 11, 2018 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants