From 365ac278fdb23a11348d7807792edc375736ced4 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevisconsulting@gmail.com>
Date: Sun, 4 Feb 2024 15:43:36 -0700
Subject: [PATCH] Make convert_ocean_to_land = .true. the default and improve
 error msg

---
 bld/namelist_files/namelist_defaults_ctsm.xml | 3 +--
 src/main/subgridWeightsMod.F90                | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 6de094fd63..d1083213b5 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1865,8 +1865,7 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
 
 <run_zero_weight_urban>.false.</run_zero_weight_urban>
 
-<convert_ocean_to_land>.false.</convert_ocean_to_land>
-<convert_ocean_to_land phys="clm5_1">.true.</convert_ocean_to_land>
+<convert_ocean_to_land>.true.</convert_ocean_to_land>
 
 <collapse_urban structure="standard" >.false.</collapse_urban>
 <collapse_urban structure="fast"     >.true.</collapse_urban>
diff --git a/src/main/subgridWeightsMod.F90 b/src/main/subgridWeightsMod.F90
index 94c7fec504..45e7d32306 100644
--- a/src/main/subgridWeightsMod.F90
+++ b/src/main/subgridWeightsMod.F90
@@ -696,6 +696,10 @@ subroutine check_weights (bounds, active_only)
        write(iulog,*) 'The matching input grid cell had some non-zero-weight subgrid type'
        write(iulog,*) 'that is not present in memory in the new run.'
        write(iulog,*) ' '
+       write(iulog,*) 'If you are using a ctsm5.2 or later fsurdat file containing'
+       write(iulog,*) 'PCT_OCEAN > 0, then you may solve the error by setting'
+       write(iulog,*) 'convert_ocean_to_land = .true.'
+       write(iulog,*) ' '
        call endrun(msg=errMsg(sourcefile, __LINE__))
     end if