more changes for coupled fields naming

esmf-org · Jan 9, 2024 · 5d8319d · 5d8319d
1 parent cf02f98
commit 5d8319d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/drivers/nuopc/docs/source/DriverAndCoupling.rst b/drivers/nuopc/docs/source/DriverAndCoupling.rst
@@ -272,12 +272,12 @@ Model Fields Used for Coupling
      - noahmp%forc%snow
      - total snow precipitation
      -
-   * - vfrac
+   * - Sa_vfrac
      - 1
      - noahmp%forc%vegfrac
      - areal fractional cover of green vegetation
      -
-   * - zorl
+   * - Sa_zorl
      - cm
      - noahmp%forc%zorl
      - surface roughness
@@ -300,7 +300,7 @@ Model Fields Used for Coupling
    * - Sl_sfrac
      - 0-1
      - noahmp%model%sncovr1
-     - mean snow area fraction
+     - instantaneous snow area fraction
      -
    * - Fall_lat
      - kg kg-1 m s-1

diff --git a/drivers/nuopc/lnd_comp_driver.F90 b/drivers/nuopc/lnd_comp_driver.F90
@@ -291,7 +291,7 @@ subroutine drv_run(gcomp, noahmp, rc)
     ! interpolate monthly data, vegetation fraction and mean sfc diffuse sw albedo (NOT used)
     !----------------------
 
-    if (check_for_connected(fldsToLnd, fldsToLnd_num, 'vfrac')) then
+    if (check_for_connected(fldsToLnd, fldsToLnd_num, 'Sa_vfrac')) then
        where(noahmp%forc%vegfrac(:) < 0.01_r8)
           noahmp%model%sigmaf(:) = 0.01_r8
        else where

diff --git a/drivers/nuopc/lnd_comp_import_export.F90 b/drivers/nuopc/lnd_comp_import_export.F90
@@ -117,8 +117,8 @@ subroutine advertise_fields(gcomp, rc)
     call fldlist_add(fldsToLnd_num, fldsToLnd, 'Faxa_snow')
     call fldlist_add(fldsToLnd_num, fldsToLnd, 'Faxa_snowc')
     call fldlist_add(fldsToLnd_num, fldsToLnd, 'Faxa_snowl')
-    call fldlist_add(fldsToLnd_num, fldsToLnd, 'vfrac')
-    call fldlist_add(fldsToLnd_num, fldsToLnd, 'zorl')
+    call fldlist_add(fldsToLnd_num, fldsToLnd, 'Sa_vfrac')
+    call fldlist_add(fldsToLnd_num, fldsToLnd, 'Sa_zorl')
 
     ! Now advertise import fields
     do n = 1,fldsToLnd_num
@@ -331,9 +331,9 @@ subroutine import_fields(gcomp, noahmp, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call state_getimport_1d(importState, 'Faxa_snowl', noahmp%forc%snowl, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call state_getimport_1d(importState, 'vfrac'     , noahmp%forc%vegfrac, rc=rc)
+    call state_getimport_1d(importState, 'Sa_vfrac'  , noahmp%forc%vegfrac, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call state_getimport_1d(importState, 'zorl'      , noahmp%forc%zorl, rc=rc)
+    call state_getimport_1d(importState, 'Sa_zorl'   , noahmp%forc%zorl, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
     call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO)