Merge branch 'fix_ndep_from_cpl'

Fix ndep from coupler

There was a bug in ndep forcing (forc_ndep_grc) when receiving ndep from
CAM (ndep_from_cpl true). This first appeared in ctsm5.1.dev002. NDEP
forcings have been garbage since then when receiving ndep from CAM.

This tag fixes that issue.

Resolves #1233 (ndep forcing incorrect when receiving ndep
from CAM (starting with ctsm5.1.dev002))

doc/ChangeLog

@@ -1,4 +1,131 @@
 ===============================================================
+Tag name:  ctsm5.1.dev019
+Originator(s):  sacks (Bill Sacks)
+Date:  Sat Dec 19 06:55:46 MST 2020
+One-line Summary: Fix ndep from coupler
+
+Purpose of changes
+------------------
+
+There was a bug in ndep forcing (forc_ndep_grc) when receiving ndep from
+CAM (ndep_from_cpl true). This first appeared in ctsm5.1.dev002. NDEP
+forcings have been garbage since then when receiving ndep from CAM.
+
+This tag fixes that issue.
+
+Bugs fixed or introduced
+------------------------
+
+Issues fixed (include CTSM Issue #):
+- Resolves ESCOMP/CTSM#1233 (ndep forcing incorrect when receiving ndep
+  from CAM (starting with ctsm5.1.dev002))
+
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions): none
+
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): none
+
+Changes made to namelist defaults (e.g., changed parameter values): none
+
+Changes to the datasets (e.g., parameter, surface or initial files): none
+
+Substantial timing or memory changes: none expected (not checked)
+
+Notes of particular relevance for developers: (including Code reviews and testing)
+---------------------------------------------
+NOTE: Be sure to review the steps in README.CHECKLIST.master_tags as well as the coding style in the Developers Guide
+
+Caveats for developers (e.g., code that is duplicated that requires double maintenance): none
+
+Changes to tests or testing: none
+
+CTSM testing:
+
+ [PASS means all tests PASS and OK means tests PASS other than expected fails.]
+
+  build-namelist tests:
+
+    cheyenne - not run
+
+  tools-tests (test/tools):
+
+    cheyenne - not run
+
+  PTCLM testing (tools/shared/PTCLM/test):
+
+    cheyenne - not run
+
+  python testing (see instructions in python/README.md; document testing done):
+
+    (any machine) - not run
+
+  regular tests (aux_clm):
+
+    cheyenne ---- pass
+    izumi ------- pass
+
+    izumi testing: baseline generation failed due to running out of disk
+    space. I have sym linked the ctsm5.1.dev018 baselines to
+    ctsm5.1.dev019, because answers are bit-for-bit between the two tags
+    as far as aux_clm testing is concerned.
+
+If the tag used for baseline comparisons was NOT the previous tag, note that here:
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: YES, but just in select coupled configurations
+
+  [ If a tag changes answers relative to baseline comparison the
+    following should be filled in (otherwise remove this section).
+    And always remove these three lines and parts that don't apply. ]
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: Coupled configurations where CTSM
+      receives NDEP from CAM
+    - what platforms/compilers: all
+    - nature of change (roundoff; larger than roundoff/same climate; new climate): 
+      potentially new climate
+
+   If bitwise differences were observed, how did you show they were no worse
+   than roundoff? N/A
+
+   If this tag changes climate describe the run(s) done to evaluate the new
+   climate (put details of the simulations in the experiment database)
+       - casename: N/A
+
+   URL for LMWG diagnostics output used to validate new climate: N/A
+
+
+Detailed list of changes
+------------------------
+
+List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): none
+
+Pull Requests that document the changes (include PR ids): none
+
+===============================================================
+===============================================================
 Tag name:  ctsm5.1.dev018
 Originator(s):  slevis (Samuel Levis,,303-665-1310)
 Date:  Tue Dec  8 11:19:02 MST 2020

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+  ctsm5.1.dev019    sacks 12/19/2020 Fix ndep from coupler
   ctsm5.1.dev018   slevis 12/08/2020 Add ACTIVE (T/F) column to master hist fields table and alphabetize
   ctsm5.1.dev017   slevis 11/17/2020 Write history fields master list to separate optional file
   ctsm5.1.dev016 multiple 11/17/2020 Updates for nuopc

src/cpl/mct/lnd_import_export.F90

@@ -169,6 +169,7 @@ subroutine lnd_import( bounds, x2l, glc_present, atm2lnd_inst, glc2lnd_inst, wat
     ! Note that forc_pbot is in Pa
 
     do g = begg,endg
+       i = 1 + (g - begg)
 
        forc_pbot = atm2lnd_inst%forc_pbot_not_downscaled_grc(g)