Merge branch 'oksanaguba/homme/fix1609-and-ibm' into next (PR #1612)

Provides a fix for a land IC file and a minor fix for an IBM compiler
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.
This PR also fixes a minor print statement issue with an
IBM compiler from a commit in PR #1581.

Fixes #1609
[BFB]

components/cam/bld/namelist_files/namelist_defaults_cam.xml

@@ -1477,7 +1477,6 @@
 <finidat hgrid="ne30np4"   ic_ymd="101" sim_year="2000">lnd/clm2/initdata/clmi.BCN.2000-01-01_ne30np4_gx1v6_simyr2000_c110328.nc</finidat>
 <finidat hgrid="ne0np4_arm_x8v3_lowcon"  ic_ymd="101" sim_year="2000">lnd/clm2/initdata/clmi.armx8v3.1850-01-01.nc</finidat>
 <!-- for CLM4.0finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="2000">lnd/clm2/initdata/clmi.conusx4v1.2000-01-01_c141106.nc</finidat-->
-<finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="1850">lnd/clm2/initdata_map/clmi.I1850CLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc</finidat>
 <finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45.0021-01-01.conusx4v1.0ac6464_simyr2000_c161130.nc</finidat>
 <finidat hgrid="ne0np4_svalbard_x8v1_lowcon"  ic_ymd="101" sim_year="1850">lnd/clm2/initdata/clmi.svalbardx8v1.1850-01-01.nc</finidat>
 <finidat hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  ic_ymd="101" sim_year="1850">lnd/clm2/initdata/clmi.sooberingoax4x8v1.1850-01-01_c141110.nc</finidat>

components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml

@@ -300,8 +300,7 @@ ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".true." irrigate=".true." >lnd/
 
 <!-- RRM CONUS and ARM resolutions.  maxxpft, mask, bgc unknown -->
 <finidat hgrid="ne0np4_arm_x8v3_lowcon"  ic_ymd="101" sim_year="2000">lnd/clm2/initdata/clmi.armx8v3.1850-01-01.nc</finidat>
-<finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="1850">lnd/clm2/initdata_map/clmi.I1850CLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc</finidat>
-<finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc</finidat>
+<finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45.0021-01-01.conusx4v1.0ac6464_simyr2000_c161130.nc</finidat>
 
 
 

components/homme/src/share/cube_mod.F90

@@ -2211,8 +2211,7 @@ subroutine set_area_correction_map2(elem, nelemd, par, gp)
              call cube_init_atomic(elem(ie),gp%points,1.0d0 + delta)
              else
                 ! Abort since the denominator in correction is too small.
-                call abortmp('Cube_mod, set_area_correction_map2() : Area correction based on eps. bubble &
-                              cannot be done, sum_w is too small.')
+                call abortmp('Cube_mod,set_area_correction_map2(): sum_w is too small.')
              endif
           enddo ! loop over elements
           ! code for verification.