Provides a fix for a land IC file and a minor fix for an IBM compiler.

[oksanaguba]

PR #1581 changed how area of columns is computed for RRM atmospheric meshes. For an existing compset for 2000 year land IC file was remapped, but 1850 year the IC file was not remapped (issue 1609). This PR removes the 1850 land file from the setup. Below, there is also a discussion about finidat values and where they are/should be defined. This PR also fixes a minor print statement issue with an IBM compiler from a commit in PR1581.

Fixes #1609

[oksanaguba]

As was suggested by @amametjanov I tried to configure a compset with the 1850 year land IC file. After doing

~/acme-master/cime/scripts/create_newcase -case SMS.july10 -res conusx4v1_conusx4v1 -mach skybridge -compiler intel -compset F1850C5AV1C-04  -project fy150001
cd SMS.july10
./xmlchange CAM_DYCORE=se (note, this is broken somewhere else)
./case.setup
./case.build

I found that finidat was still pointing to the old file. It was picked from file
components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml
while for compset FC5AV1C-04 it was enough to change the value in
components/cam/bld/namelist_files/namelist_defaults_cam.xml .

So I removed finidat line for 1850 year compset and now in lnd_in
finidat=' '
Also, finidat value for year 2000 was modified in the same file
components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml
though it is not clear why it is not picked up.

[bishtgautam]

With ACME master:

• FC5AV1C-04 has finidat = clmi.ICRUCLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc and
• F1850C5AV1C-04 has finidat = clmi.I1850CLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc

With oksanaguba/homme/fix1609-and-ibm,

• FC5AV1C-04 has finidat = clmi.ICRUCLM45.0021-0101.conusx4v1.0ac6464_simyr2000_c161130.nc, and
• F1850C5AV1C-04 has finidat = ''

In both branches, the values in namelist_definition_clm4_5.xml is used instead of namelist_definition_cam.xml

[mt5555]

@bishtgautam 's message appears to document that the branch has the correct behavior.

But he does imply that the defaults should be set in namelist_definition_clm4_5.xml, and not in namelist_definition_cam.xml. @bishtgautam - should we remove all the clm finidat defaults from namelist_definition_cam.xml? Those seem like they were added in error, since why are clm settings in a cam xml file?

[bishtgautam]

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

• Following land-related entries:
  1. finidat
  2. fsurdat
  3. fpftdyn
  4. fatmlndfrc
  5. fsnowoptics
  6. fsnowaging
• Following river-related entries:
  1. frivinp_rtm

At this stage, it is not clear to me why namelist_defaults_cam.xml has the above mentioned entries and if simply deleting the above mentioned entries is Ok.

[rljacob]

If you can get the right file picked up, go ahead with this PR. Cleaning up the logic behind finidat should wait for a different PR.

[rljacob]

@oksanaguba , you need to fix the PR title and add a description. See https://acme-climate.atlassian.net/wiki/display/Docs/Development+Reference#DevelopmentReference-Submittingapullrequest(PR)

[oksanaguba]

@rljacob done. The title is 70 characters exactly.

[rljacob]

FYI (From Mariana): Any CLM or river namelists in CAM are a holdover from CAM's separate driver/build/test system.

ACME is not supporting that so they can all be removed.

[oksanaguba]

They should be removed in this PR or in a separate PR?

[rljacob]

Separate one.