resolve conflicts with master

daleihao · daleihao · commit a1efdde6fd9f · 2025-10-21T04:56:33.000-07:00
diff --git a/components/elm/src/cpl/lnd_import_export.F90 b/components/elm/src/cpl/lnd_import_export.F90
@@ -1383,7 +1383,7 @@ subroutine lnd_export( bounds, lnd2atm_vars, lnd2glc_vars, l2x)
     ! 
     ! !USES:
     use shr_kind_mod       , only : r8 => shr_kind_r8
-    use elm_varctl         , only : iulog, create_glacier_mec_landunit, use_finetop_rad
+    use elm_varctl         , only : iulog, create_glacier_mec_landunit, iac_present, use_finetop_rad
     use elm_time_manager   , only : get_nstep, get_step_size  
     use domainMod          , only : ldomain
     use seq_drydep_mod     , only : n_drydep
diff --git a/components/elm/src/main/elm_initializeMod.F90 b/components/elm/src/main/elm_initializeMod.F90
@@ -249,10 +249,8 @@ subroutine initialize1( )
           write(iulog,*) 'Attempting to read topo parameters for TOP solar radiation parameterization from ',trim(fsurdat)
           call shr_sys_flush(iulog)
        endif
-
        call surfrd_get_topo_for_solar_rad(ldomain, fsurdat)
-    endif
-    
+    endif 
     !-------------------------------------------------------------------------
     ! Topounit
     !-------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -1383,7 +1383,7 @@ subroutine lnd_export( bounds, lnd2atm_vars, lnd2glc_vars, l2x)`
`1383`	`1383`	`!`
`1384`	`1384`	`! !USES:`
`1385`	`1385`	`use shr_kind_mod , only : r8 => shr_kind_r8`
`1386`		`- use elm_varctl , only : iulog, create_glacier_mec_landunit, use_finetop_rad`
	`1386`	`+ use elm_varctl , only : iulog, create_glacier_mec_landunit, iac_present, use_finetop_rad`
`1387`	`1387`	`use elm_time_manager , only : get_nstep, get_step_size`
`1388`	`1388`	`use domainMod , only : ldomain`
`1389`	`1389`	`use seq_drydep_mod , only : n_drydep`