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

Add regionally-refined Eastern North Atlantic grid #1629

Merged
merged 6 commits into from
Aug 8, 2017

Conversation

brhillman
Copy link
Contributor

@brhillman brhillman commented Jul 11, 2017

Add configuration for a new regionally-refined (ne30 to ne120) grid over the Eastern North Atlantic. All components run on the RRM grid (enax4v1). All needed input files to run the new configuration have been uploaded to the input data repository. Supported compsets include only FC5AV1C-04P2 (72 levels), but RTM needs to be turned off (xmlchange RTM_MODE=NULL).

Fixes #1357

@mt5555
Copy link
Contributor

mt5555 commented Jul 11, 2017

@brhillman : one issue that was recently pointed out in another github issue: why are you adding defaults for the land model in the CAM defaults.xml file? I think this is probably a mistake. Can you remove them and see if this case still works?

edit: actually - my mistake - the changes in the CAM defaults.xml in this PR may all be related to atmosphere?
Can you just double check?

@oksanaguba
Copy link
Contributor

@mt5555 Ben did not put finidat values to cam default namelist, if this is what you are referring to.

@mt5555
Copy link
Contributor

mt5555 commented Jul 11, 2017

per @bishtgautam 's comment on #1612

these variables are CLM defaults and I suspect should not be in the CAM defaults XML file:

It appears that components/cam/bld/namelist_files/namelist_defaults_cam.xml has:

Following land-related entries:
finidat
fsurdat
fpftdyn
fatmlndfrc
fsnowoptics
fsnowaging
Following river-related entries:
frivinp_rtm

@bishtgautam
Copy link
Contributor

This PR doesn't add any land related entries in namelist_defaults_cam.xml. All land-related entries are added in namelist_defaults_clm4_5.xml.

A different issue that I see with this PR is that both commits make changes to files inside and outside the cime directory. Commits need to be done all over again to ensure that a single commit only modifies files inside or outside the cime directory.

@mt5555
Copy link
Contributor

mt5555 commented Jul 11, 2017

after further review: my only concern for this PR is 'fsurdat'. Can you remove that from the CAM defaults XML file and see if everything still works?

@brhillman
Copy link
Contributor Author

@mt5555 I set finidat and fsurdat in clm_namelist_defaults_clm4_5.xml. It does look like fatmlndfrc, and focndomain get set in cam_namelist_defaults.xml, along with the other domain files. This seems to be where they are set for all of the other grids though, even though they are also set in the config_grids.xml file in the top-level cime config.

@mt5555
Copy link
Contributor

mt5555 commented Jul 11, 2017

sorry - my mistake again. this PR looks good except for the CIME issues @bishtgautam pointed out.

That this grid works confirms that fsurdat (and probably a few others) need to be removed for the other RRM grids from the CAM defaults XNL file.

fsnow* variables seem to be used by both CAM and CLM, so they should be there.

Add support for enax4v1_enax4v1 and enax4v1_ne30_enax4v1 resolutions in
cime.
Add horiz_grid entry for ENA to CAM configuration. Sets the grid name
and size (number of columns).
Set dycore parameters and input data paths for CAM when the grid is
ne0np4_enax4v1.
Configure CLM to run on new ENA grid. Set paths for initial condition
(year 2000 conditions) and surface data in namelist defaults, and add
ne0np4_enax4v1 to list of supported grids in namelist definitions.
RRM grids using the se dycore should all start with ne0, but CAM_DYCORE
was only set explicitly when the atmosphere grid started with ne[1-9].
Setting this to se when the grid begins with ne[0-9] sets CAM_DYCORE
properly for all RRM grids. Fixes #1357.
Set ATM_NCPL in driver configuration when atmosphere grid is
ne0np4_enax4v1.
@brhillman
Copy link
Contributor Author

@mt5555 FYI, it looks like fsurdat and finidat are set in the CAM defaults XML for more than just the RRM grids.

I am cleaning up my commit history to separate cime and component changes and running a short test to make sure nothing broke, and I will let you know when this is ready. Thanks.

@brhillman
Copy link
Contributor Author

@mt5555 @bishtgautam this should be cleaned up and ready now.

@rljacob rljacob requested a review from oksanaguba July 11, 2017 22:09
jgfouca added a commit that referenced this pull request Jul 14, 2017
Fix a couple pylint issues.

Fix a critical problem in code_checker that caused it to filter too
many files.

Test suite: pylint, unit-tests
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes [CIME Github issue #]

User interface changes?: None

Code review: None
@rljacob
Copy link
Member

rljacob commented Jul 24, 2017

@mt5555 please start merging this.

@brhillman
Copy link
Contributor Author

@mt5555 do I need to do anything further to get this ready to be merged?

@golaz golaz added this to the v1.0beta2 milestone Aug 7, 2017
@rljacob rljacob self-assigned this Aug 7, 2017
rljacob added a commit that referenced this pull request Aug 8, 2017
Add configuration for a new regionally-refined (ne30 to ne120) grid over the Eastern North Atlantic.
All components run on the RRM grid (enax4v1). All needed input files to run the new configuration
have been uploaded to the input data repository. Supported compsets include only FC5AV1C-04P2
(72 levels), but RTM needs to be turned off (xmlchange RTM_MODE=NULL).

Fixes #1357

* brhillman/atm/add-ena-rrm:
  Set ATM_NCPL for ENA grid
  Set CAM_DYCORE to se for RRM grids
  Set CLM namelist definitions and defaults for ENA
  Set CAM namelist defaults for ENA grid
  Add ENA grid size to CAM configuration
  Add cime configuration for ENA grid
@rljacob
Copy link
Member

rljacob commented Aug 8, 2017

merged to next

brhillman added a commit that referenced this pull request Aug 8, 2017
Set RTM grid to null in grid longname for RRM configurations to turn off
the river runoff model. Required input files do not exist for running
RTM with the RRM grids, so previously this required manually setting
RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the
supported RRM grids (CONUS, TWP, and ENA) should run without further
user intervention. For now, the user still needs to set CAM_DYCORE=se,
due to issue #1357.
@rljacob rljacob merged commit b0b15e3 into master Aug 8, 2017
@brhillman brhillman deleted the brhillman/atm/add-ena-rrm branch August 8, 2017 21:02
brhillman added a commit that referenced this pull request Aug 10, 2017
Set RTM grid to null in grid longname for RRM configurations to turn off
the river runoff model. Required input files do not exist for running
RTM with the RRM grids, so previously this required manually setting
RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the
supported RRM grids (CONUS, TWP, and ENA) should run without further
user intervention. For now, the user still needs to set CAM_DYCORE=se,
due to issue #1357.
jgfouca pushed a commit that referenced this pull request Oct 25, 2017
Set RTM grid to null in grid longname for RRM configurations to turn off
the river runoff model. Required input files do not exist for running
RTM with the RRM grids, so previously this required manually setting
RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the
supported RRM grids (CONUS, TWP, and ENA) should run without further
user intervention. For now, the user still needs to set CAM_DYCORE=se,
due to issue #1357.
jgfouca pushed a commit that referenced this pull request Feb 27, 2018
Set RTM grid to null in grid longname for RRM configurations to turn off
the river runoff model. Required input files do not exist for running
RTM with the RRM grids, so previously this required manually setting
RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the
supported RRM grids (CONUS, TWP, and ENA) should run without further
user intervention. For now, the user still needs to set CAM_DYCORE=se,
due to issue #1357.
jgfouca pushed a commit that referenced this pull request Mar 14, 2018
Set RTM grid to null in grid longname for RRM configurations to turn off
the river runoff model. Required input files do not exist for running
RTM with the RRM grids, so previously this required manually setting
RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the
supported RRM grids (CONUS, TWP, and ENA) should run without further
user intervention. For now, the user still needs to set CAM_DYCORE=se,
due to issue #1357.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants