Skip to content

Use 512-length filenames #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 9, 2025
Merged

Use 512-length filenames #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7724090
lnd_comp_nuopc.F90: Use CX-length filenames.
samsrabin Jul 1, 2025
304d112
Use CX-length filenames for all *_comp_nuopc.F90.
samsrabin Jul 1, 2025
732abf3
Merge tag 'cdeps1.0.77' into cx-length-filenames
samsrabin Jul 7, 2025
786ccc3
Delete DATAMODELTEST test.
samsrabin Jul 7, 2025
3baaa5c
Actually change restfilm to CX in datm/atm_comp_nuopc.F90.
samsrabin Jul 7, 2025
0595593
More CX-length nlfilename and streamfilename.
samsrabin Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions datm/atm_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module cdeps_datm_comp
use NUOPC_Model , only : model_label_Finalize => label_Finalize
use NUOPC_Model , only : NUOPC_ModelGet, setVM
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
use shr_kind_mod , only : cx=>shr_kind_cx
use shr_const_mod , only : shr_const_cday
use shr_cal_mod , only : shr_cal_ymd2date
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
Expand Down Expand Up @@ -100,11 +101,11 @@ module cdeps_datm_comp
character(len=*) , parameter :: nullstr = 'null'

! datm_in namelist input
character(CL) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CL) :: streamfilename = nullstr ! filename to obtain stream info from
character(CX) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CX) :: streamfilename = nullstr ! filename to obtain stream info from
character(CL) :: dataMode = nullstr ! flags physics options wrt input data
character(CL) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CL) :: model_maskfile = nullstr ! full pathname to obtain mask from
character(CX) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CX) :: model_maskfile = nullstr ! full pathname to obtain mask from
integer :: iradsw = 0 ! radiation interval (input namelist)
logical :: nextsw_cday_calc_cam7 ! true => use logic appropriate to cam7 (and later) for calculating nextsw_cday
character(CL) :: factorFn_mesh = 'null' ! file containing correction factors mesh
Expand All @@ -118,7 +119,7 @@ module cdeps_datm_comp
character(CL) :: bias_correct = nullstr ! send bias correction fields to coupler
character(CL) :: anomaly_forcing(8) = nullstr ! send anomaly forcing fields to coupler

character(CL) :: restfilm = nullstr ! model restart file namelist
character(CX) :: restfilm = nullstr ! model restart file namelist
integer :: nx_global ! global nx
integer :: ny_global ! global ny
logical :: skip_restart_read = .false. ! true => skip restart read in continuation run
Expand Down Expand Up @@ -294,15 +295,15 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, anomaly_forcing, CL*8, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, factorFn_data, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, factorFn_mesh, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, nextsw_cday_calc, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
10 changes: 0 additions & 10 deletions dglc/cime_config/testdefs/testlist_dglc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,4 @@
</options>
</test>

<test compset="DATAMODELTEST" grid="f10_f10_ais8gris4_mg37" name="SMS_D_Ld3">
<machines>
<machine name="derecho" compiler="gnu" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>


</testlist>
9 changes: 5 additions & 4 deletions dglc/glc_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module cdeps_dglc_comp
use NUOPC_Model , only : model_label_Finalize => label_Finalize
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
use shr_kind_mod , only : cx=>shr_kind_cx
use shr_cal_mod , only : shr_cal_ymd2date
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
use shr_string_mod , only : shr_string_listGetNum, shr_string_listGetName
Expand Down Expand Up @@ -95,10 +96,10 @@ module cdeps_dglc_comp
character(CL) :: case_name

! dglc_in namelist input
character(CL) :: streamfilename = nullstr ! filename to obtain stream info from
character(CL) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CX) :: streamfilename = nullstr ! filename to obtain stream info from
character(CX) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CL) :: datamode = nullstr ! flags physics options wrt input data
character(CL) :: restfilm = nullstr ! model restart file namelist
character(CX) :: restfilm = nullstr ! model restart file namelist
logical :: skip_restart_read = .false. ! true => skip restart read in continuation run
logical :: export_all = .false. ! true => export all fields, do not check connected or not

Expand Down Expand Up @@ -262,7 +263,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_meshfiles, CL*max_icesheets, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
17 changes: 9 additions & 8 deletions dice/ice_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module cdeps_dice_comp
use NUOPC_Model , only : model_label_Finalize => label_Finalize
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
use shr_kind_mod , only : r8=>shr_kind_r8, cxx=>shr_kind_cxx, cl=>shr_kind_cl, cs=>shr_kind_cs
use shr_kind_mod , only : cx=>shr_kind_cx
use shr_const_mod , only : shr_const_pi
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
use shr_cal_mod , only : shr_cal_ymd2date, shr_cal_ymd2julian
Expand Down Expand Up @@ -78,16 +79,16 @@ module cdeps_dice_comp
character(*) , parameter :: nullstr = 'null'

! dice_in namelist input
character(CL) :: streamfilename = nullstr ! filename to obtain stream info from
character(CL) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CX) :: streamfilename = nullstr ! filename to obtain stream info from
character(CX) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CL) :: dataMode ! flags physics options wrt input data
character(CL) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CL) :: model_maskfile = nullstr ! full pathname to obtain mask from
character(CX) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CX) :: model_maskfile = nullstr ! full pathname to obtain mask from
real(R8) :: flux_swpf ! short-wave penatration factor
real(R8) :: flux_Qmin ! bound on melt rate
logical :: flux_Qacc ! activates water accumulation/melt wrt Q
real(R8) :: flux_Qacc0 ! initial water accumulation value
character(CL) :: restfilm = nullstr ! model restart file namelist
character(CX) :: restfilm = nullstr ! model restart file namelist
integer :: nx_global
integer :: ny_global
logical :: export_all = .false. ! true => export all fields, do not check connected or not
Expand Down Expand Up @@ -250,11 +251,11 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)

call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
17 changes: 9 additions & 8 deletions dlnd/lnd_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module cdeps_dlnd_comp
use NUOPC_Model , only : model_label_Finalize => label_Finalize
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
use shr_kind_mod , only : cx=>shr_kind_cx
use shr_cal_mod , only : shr_cal_ymd2date
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
use dshr_methods_mod , only : dshr_state_getfldptr, dshr_state_diagnose, chkerr, memcheck
Expand Down Expand Up @@ -71,13 +72,13 @@ module cdeps_dlnd_comp

! dlnd_in namelist input
character(CL) :: dataMode = nullstr ! flags physics options wrt input data
character(CL) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CL) :: model_maskfile = nullstr ! full pathname to obtain mask from
character(CL) :: streamfilename ! filename to obtain stream info from
character(CL) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CX) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CX) :: model_maskfile = nullstr ! full pathname to obtain mask from
character(CX) :: streamfilename ! filename to obtain stream info from
character(CX) :: nlfilename = nullstr ! filename to obtain namelist info from
! not currently used
! logical :: force_prognostic_true = .false. ! if true set prognostic true
character(CL) :: restfilm = nullstr ! model restart file namelist
character(CX) :: restfilm = nullstr ! model restart file namelist
integer :: nx_global ! global nx dimension of model mesh
integer :: ny_global ! global ny dimension of model mesh
logical :: skip_restart_read = .false. ! true => skip restart read in continuation
Expand Down Expand Up @@ -219,11 +220,11 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)

call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
17 changes: 9 additions & 8 deletions docn/ocn_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module cdeps_docn_comp
use NUOPC_Model , only : model_label_Finalize => label_Finalize
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
use shr_kind_mod , only : cx=>shr_kind_cx
use shr_cal_mod , only : shr_cal_ymd2date
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
use dshr_methods_mod , only : dshr_state_diagnose, chkerr, memcheck
Expand Down Expand Up @@ -93,14 +94,14 @@ module cdeps_docn_comp
character(*) , parameter :: nullstr = 'null'

! docn_in namelist input
character(CL) :: streamfilename = nullstr ! filename to obtain stream info from
character(CL) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CX) :: streamfilename = nullstr ! filename to obtain stream info from
character(CX) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CL) :: datamode = nullstr ! flags physics options wrt input data
character(CL) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CL) :: model_maskfile = nullstr ! full pathname to obtain mask from
character(CX) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CX) :: model_maskfile = nullstr ! full pathname to obtain mask from
real(R8) :: sst_constant_value ! sst constant value
integer :: aquap_option ! if aqua-planet mode, option to use
character(CL) :: restfilm = nullstr ! model restart file namelist
character(CX) :: restfilm = nullstr ! model restart file namelist
integer :: nx_global
integer :: ny_global
logical :: skip_restart_read = .false. ! true => skip restart read in continuation run
Expand Down Expand Up @@ -262,11 +263,11 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)

call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, import_data_fields, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
17 changes: 9 additions & 8 deletions drof/rof_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module cdeps_drof_comp
use NUOPC_Model , only : model_label_Finalize => label_Finalize
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
use shr_kind_mod , only : cx=>shr_kind_cx
use shr_const_mod , only : SHR_CONST_SPVAL
use shr_cal_mod , only : shr_cal_ymd2date
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
Expand Down Expand Up @@ -67,12 +68,12 @@ module cdeps_drof_comp
character(CL) :: case_name ! case name
character(*) , parameter :: nullstr = 'null'
! drof_in namelist input
character(CL) :: streamfilename = nullstr ! filename to obtain stream info from
character(CL) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CX) :: streamfilename = nullstr ! filename to obtain stream info from
character(CX) :: nlfilename = nullstr ! filename to obtain namelist info from
character(CL) :: dataMode = nullstr ! flags physics options wrt input data
character(CL) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CL) :: model_maskfile = nullstr ! full pathname to obtain mask from
character(CL) :: restfilm = nullstr ! model restart file namelist
character(CX) :: model_meshfile = nullstr ! full pathname to model meshfile
character(CX) :: model_maskfile = nullstr ! full pathname to obtain mask from
character(CX) :: restfilm = nullstr ! model restart file namelist
integer :: nx_global
integer :: ny_global
logical :: skip_restart_read = .false. ! true => skip restart read
Expand Down Expand Up @@ -225,11 +226,11 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)

call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
Loading