From 9b92a2bfba11229fe8dfa36d16fa3abdc0b7ca75 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 30 Mar 2024 10:05:08 -0600 Subject: [PATCH] Increase stream filename length to CX (512) from CL (256) (#265) * Increase stream filename length to CX (512) from CL (256) * Move testlist from cheyenne to derecho resolving #265 * Change more references of Cheyenne to Derecho in test lists and in datm document * Remove _Vnuopc in testlists since NUOPC is the default and this is unneeded --- datm/cime_config/testdefs/testlist_datm.xml | 54 ++++++++++----------- dice/cime_config/testdefs/testlist_dice.xml | 8 +-- dlnd/cime_config/testdefs/testlist_dlnd.xml | 4 +- doc/source/datm.rst | 2 +- docn/cime_config/testdefs/testlist_docn.xml | 12 ++--- drof/cime_config/testdefs/testlist_drof.xml | 4 +- dwav/cime_config/testdefs/testlist_dwav.xml | 4 +- streams/dshr_strdata_mod.F90 | 22 ++++----- streams/dshr_stream_mod.F90 | 16 +++--- 9 files changed, 63 insertions(+), 63 deletions(-) diff --git a/datm/cime_config/testdefs/testlist_datm.xml b/datm/cime_config/testdefs/testlist_datm.xml index ce9efb45a..eab4c646e 100644 --- a/datm/cime_config/testdefs/testlist_datm.xml +++ b/datm/cime_config/testdefs/testlist_datm.xml @@ -3,108 +3,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/dice/cime_config/testdefs/testlist_dice.xml b/dice/cime_config/testdefs/testlist_dice.xml index eac359d4e..2a05956e0 100644 --- a/dice/cime_config/testdefs/testlist_dice.xml +++ b/dice/cime_config/testdefs/testlist_dice.xml @@ -1,17 +1,17 @@ - + - + - + - + diff --git a/dlnd/cime_config/testdefs/testlist_dlnd.xml b/dlnd/cime_config/testdefs/testlist_dlnd.xml index de52bac4a..9ace7ec7d 100644 --- a/dlnd/cime_config/testdefs/testlist_dlnd.xml +++ b/dlnd/cime_config/testdefs/testlist_dlnd.xml @@ -1,9 +1,9 @@ - + - + diff --git a/doc/source/datm.rst b/doc/source/datm.rst index ff067209c..e70c703da 100644 --- a/doc/source/datm.rst +++ b/doc/source/datm.rst @@ -60,7 +60,7 @@ ERA5 (``datm_datamode_era5_mod.F90``) .. note:: Due to the high temporal and spatial resoultion of ERA5 dataset, only 2019 - data is staged on NCAR's Cheyenne platform under + data is staged on NCAR's Derecho platform under `$CESMDATAROOT/inputdata/atm/datm7/ERA5` .. note:: diff --git a/docn/cime_config/testdefs/testlist_docn.xml b/docn/cime_config/testdefs/testlist_docn.xml index 5dea00d48..2549b1233 100644 --- a/docn/cime_config/testdefs/testlist_docn.xml +++ b/docn/cime_config/testdefs/testlist_docn.xml @@ -1,25 +1,25 @@ - + - + - + - + - + - + diff --git a/drof/cime_config/testdefs/testlist_drof.xml b/drof/cime_config/testdefs/testlist_drof.xml index 0515f0fc6..0fa691baf 100644 --- a/drof/cime_config/testdefs/testlist_drof.xml +++ b/drof/cime_config/testdefs/testlist_drof.xml @@ -1,9 +1,9 @@ - + - + diff --git a/dwav/cime_config/testdefs/testlist_dwav.xml b/dwav/cime_config/testdefs/testlist_dwav.xml index 0fed61eb2..b0e93a65d 100644 --- a/dwav/cime_config/testdefs/testlist_dwav.xml +++ b/dwav/cime_config/testdefs/testlist_dwav.xml @@ -1,9 +1,9 @@ - + - + diff --git a/streams/dshr_strdata_mod.F90 b/streams/dshr_strdata_mod.F90 index c056639d3..e9159f69b 100644 --- a/streams/dshr_strdata_mod.F90 +++ b/streams/dshr_strdata_mod.F90 @@ -21,7 +21,7 @@ module dshr_strdata_mod use ESMF , only : ESMF_REGION_TOTAL, ESMF_FieldGet, ESMF_TraceRegionExit, ESMF_TraceRegionEnter use ESMF , only : ESMF_LOGMSG_INFO, ESMF_LogWrite use shr_kind_mod , only : r8=>shr_kind_r8, r4=>shr_kind_r4, i2=>shr_kind_I2 - use shr_kind_mod , only : cs=>shr_kind_cs, cl=>shr_kind_cl, cxx=>shr_kind_cxx + use shr_kind_mod , only : cs=>shr_kind_cs, cl=>shr_kind_cl, cxx=>shr_kind_cxx, cx=>shr_kind_cx use shr_sys_mod , only : shr_sys_abort use shr_const_mod , only : shr_const_pi, shr_const_cDay, shr_const_spval use shr_cal_mod , only : shr_cal_calendarname, shr_cal_timeSet @@ -389,7 +389,7 @@ subroutine shr_strdata_init(sdat, model_clock, stream_name, rc) character(CS) :: calendar ! calendar name integer :: ns ! stream index integer :: m ! generic index - character(CL) :: fileName ! generic file name + character(CX) :: fileName ! generic file name integer :: nfld ! loop stream field index type(ESMF_Field) :: lfield ! temporary type(ESMF_Field) :: lfield_dst ! temporary @@ -677,7 +677,7 @@ subroutine shr_strdata_get_stream_nlev(sdat, stream_index, rc) type(ESMF_VM) :: vm type(file_desc_t) :: pioid integer :: rcode - character(CL) :: filename + character(CX) :: filename integer :: dimid integer :: stream_nlev character(*), parameter :: subname = '(shr_strdata_set_stream_domain) ' @@ -694,7 +694,7 @@ subroutine shr_strdata_get_stream_nlev(sdat, stream_index, rc) if (sdat%mainproc) then call shr_stream_getData(sdat%stream(stream_index), 1, filename) end if - call ESMF_VMBroadCast(vm, filename, CL, 0, rc=rc) + call ESMF_VMBroadCast(vm, filename, CX, 0, rc=rc) rcode = pio_openfile(sdat%pio_subsystem, pioid, sdat%io_type, trim(filename), pio_nowrite) rcode = pio_inq_dimid(pioid, trim(sdat%stream(stream_index)%lev_dimname), dimid) rcode = pio_inq_dimlen(pioid, dimid, stream_nlev) @@ -726,7 +726,7 @@ subroutine shr_strdata_get_stream_domain(sdat, stream_index, fldname, flddata, r type(var_desc_t) :: varid type(file_desc_t) :: pioid integer :: rcode - character(CL) :: filename + character(CX) :: filename type(io_desc_t) :: pio_iodesc real(r4), allocatable :: data_real(:) real(r8), allocatable :: data_double(:) @@ -743,7 +743,7 @@ subroutine shr_strdata_get_stream_domain(sdat, stream_index, fldname, flddata, r if (sdat%mainproc) then call shr_stream_getData(sdat%stream(stream_index), 1, filename) end if - call ESMF_VMBroadCast(vm, filename, CL, 0, rc=rc) + call ESMF_VMBroadCast(vm, filename, CX, 0, rc=rc) ! Open the file rcode = pio_openfile(sdat%pio_subsystem, pioid, sdat%io_type, trim(filename), pio_nowrite) @@ -1305,10 +1305,10 @@ subroutine shr_strdata_readLBUB(sdat, ns, mDate, mSec, newData, istr, rc) real(r8) :: rDateM,rDateLB,rDateUB ! model,LB,UB dates with fractional days integer :: n_lb, n_ub integer :: i - character(CL) :: filename_lb - character(CL) :: filename_ub - character(CL) :: filename_next - character(CL) :: filename_prev + character(CX) :: filename_lb + character(CX) :: filename_ub + character(CX) :: filename_next + character(CX) :: filename_prev logical :: find_bounds character(*), parameter :: subname = '(shr_strdata_readLBUB) ' character(*), parameter :: F00 = "('(shr_strdata_readLBUB) ',8a)" @@ -1432,7 +1432,7 @@ subroutine shr_strdata_readstrm(sdat, per_stream, stream, fldbun_data, & ! local variables integer :: stream_nlev type(ESMF_Field) :: field_dst, field_vector_dst - character(CL) :: currfile + character(CX) :: currfile logical :: fileexists logical :: fileopen type(file_desc_t) :: pioid diff --git a/streams/dshr_stream_mod.F90 b/streams/dshr_stream_mod.F90 index ac16d18d6..e73fb19ca 100644 --- a/streams/dshr_stream_mod.F90 +++ b/streams/dshr_stream_mod.F90 @@ -15,7 +15,7 @@ module dshr_stream_mod ! containing those dates. ! ------------------------------------------------------------------------------- - use shr_kind_mod , only : r8=>shr_kind_r8, cs=>shr_kind_cs, cl=>shr_kind_cl, cxx=>shr_kind_cxx + use shr_kind_mod , only : r8=>shr_kind_r8, cs=>shr_kind_cs, cl=>shr_kind_cl, cxx=>shr_kind_cxx, cx=>shr_kind_cx use shr_sys_mod , only : shr_sys_abort use shr_const_mod , only : shr_const_cday use shr_string_mod , only : shr_string_leftalign_and_convert_tabs, shr_string_parseCFtunit @@ -85,7 +85,7 @@ module dshr_stream_mod ! a useful derived type to use inside shr_streamType --- type shr_stream_file_type - character(CL) :: name = shr_stream_file_null ! the file name (full pathname) + character(CX) :: name = shr_stream_file_null ! the file name (full pathname) logical :: haveData = .false. ! has t-coord data been read in? integer :: nt = 0 ! size of time dimension integer ,allocatable :: date(:) ! t-coord date: yyyymmdd @@ -125,7 +125,7 @@ module dshr_stream_mod integer :: n_gvd = -1 ! file/sample of greatest valid date logical :: found_gvd = .false. ! T <=> k_gvd,n_gvd have been set logical :: fileopen = .false. ! is current file open - character(CL) :: currfile = ' ' ! current filename + character(CX) :: currfile = ' ' ! current filename integer :: nvars ! number of stream variables character(CL) :: stream_vectors = 'null' ! stream vectors names type(file_desc_t) :: currpioid ! current pio file desc @@ -379,7 +379,7 @@ subroutine shr_stream_init_from_xml(streamfilename, streamdat, isroot_task, logu allocate(streamdat(i)%varlist(streamdat(i)%nvars)) endif do n=1,streamdat(i)%nfiles - call ESMF_VMBroadCast(vm, streamdat(i)%file(n)%name, CL, 0, rc=rc) + call ESMF_VMBroadCast(vm, streamdat(i)%file(n)%name, CX, 0, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return enddo do n=1,streamdat(i)%nvars @@ -1219,7 +1219,7 @@ subroutine shr_stream_readTCoord(strm, k, isroot_task, rc) integer,optional ,intent(out) :: rc ! return code ! local variables - character(CL) :: fileName ! filename to read + character(CX) :: fileName ! filename to read integer :: nt integer :: num,n integer :: din,dout @@ -1513,7 +1513,7 @@ subroutine shr_stream_getCalendar(strm, k, calendar) type(ESMF_VM) :: vm integer :: myid integer :: vid, n - character(CL) :: fileName + character(CX) :: fileName character(CL) :: lcal integer(PIO_OFFSET_KIND) :: attlen integer :: old_handle @@ -1745,13 +1745,13 @@ subroutine shr_stream_restIO(pioid, streams, mode) integer :: maxnt = 0 integer, allocatable :: tmp(:) integer :: logunit - character(len=CL) :: fname, rfname, rsfname + character(len=CX) :: fname, rfname, rsfname !------------------------------------------------------------------------------- if (mode .eq. 'define') then - rcode = pio_def_dim(pioid, 'strlen', CL, dimid_str) + rcode = pio_def_dim(pioid, 'strlen', CX, dimid_str) do k=1,size(streams) ! maxnfiles is the maximum number of files across all streams logunit = streams(k)%logunit