Merge branch 'main' into feature/fix_mpas_input

ESCOMP · Jun 26, 2024 · badd638 · badd638
2 parents 0875610 + 9b73292
commit badd638
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/datm/cime_config/stream_definition_datm.xml b/datm/cime_config/stream_definition_datm.xml
@@ -3578,7 +3578,7 @@
  <meshfile>none</meshfile>
  </stream_meshfile>
  <stream_datafiles>
- <file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_globalSSP3-7.0__simyr_2014-2501_CMIP6_c190506.nc</file>
+ <file>$DIN_LOC_ROOT/atm/datm7/CO2/fco2_datm_globalSSP3-7.0_simyr_1750-2501_CMIP6_c201101.nc</file>
  </stream_datafiles>
  <stream_datavars>
  <var>CO2 Sa_co2diag</var>
@@ -4001,7 +4001,7 @@
  <meshfile>$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</meshfile>
  </stream_meshfile>
  <stream_datafiles>
- <file>$DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2014-2101_monthly_0.9x1.25_c190402.nc</file>
+ <file>$DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_1849-2101_monthly_0.9x1.25_c201103.nc</file>
  </stream_datafiles>
  <stream_datavars>
  <var>BCDEPWET Faxa_bcphiwet</var>

diff --git a/dglc/glc_comp_nuopc.F90 b/dglc/glc_comp_nuopc.F90
@@ -491,7 +491,7 @@ subroutine ModelAdvance(gcomp, rc)
  if (my_task == main_task) then
  call ESMF_TimeGet(currTime, timestring=timestring, rc=rc)
  if (ChkErr(rc,__LINE__,u_FILE_u)) return
- write(logunit,'(a,l)') trim(timestring)//': valid_input for dglc is ',valid_inputs
+ write(logunit,'(a,l6)') trim(timestring)//': valid_input for dglc is ',valid_inputs
  end if
 
  ! determine if will write restart