diff --git a/cime_config/buildnml b/cime_config/buildnml
index 6b76b8b1e..46070d9da 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -64,11 +64,13 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     config['ocn_grid'] = ocn_grid
 
     atm_mesh = case.get_value("ATM_DOMAIN_MESH")
+    lnd_mesh = case.get_value("LND_DOMAIN_MESH")
+    rof_mesh = case.get_value("ROF_DOMAIN_MESH")
     config['samegrid_atm_lnd'] = 'true' if atm_mesh == case.get_value("LND_DOMAIN_MESH") else 'false'
+    config['samegrid_atm_ocn'] = 'true' if atm_mesh == case.get_value("OCN_DOMAIN_MESH") else 'false'
     config['samegrid_atm_ice'] = 'true' if atm_mesh == case.get_value("ICE_DOMAIN_MESH") else 'false'
-    config['samegrid_atm_ocn'] = 'true' if atm_grid == case.get_value("OCN_DOMAIN_MESH") else 'false'
-    config['samegrid_atm_wav'] = 'true' if atm_grid == case.get_value("WAV_DOMAIN_MESH") else 'false'
-    config['samegrid_lnd_rof'] = 'true' if lnd_grid == rof_grid else 'false'
+    config['samegrid_atm_wav'] = 'true' if atm_mesh == case.get_value("WAV_DOMAIN_MESH") else 'false'
+    config['samegrid_lnd_rof'] = 'true' if lnd_mesh == rof_mesh else 'false'
 
     # determine if need to set atm_domainfile
     scol_lon = float(case.get_value('PTS_LON'))