Skip to content

Commit 2544107

Browse files
jedwards4bjedwards4b
authored
Merge pull request #343 from samsrabin/cx-length-filenames
Use 512-length filenames
2 parents debc545 + 0595593 commit 2544107

File tree

8 files changed

+59
-62
lines changed

8 files changed

+59
-62
lines changed

‎datm/atm_comp_nuopc.F90‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module cdeps_datm_comp
2626
use NUOPC_Model , only : model_label_Finalize => label_Finalize
2727
use NUOPC_Model , only : NUOPC_ModelGet, setVM
2828
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
29+
use shr_kind_mod , only : cx=>shr_kind_cx
2930
use shr_const_mod , only : shr_const_cday
3031
use shr_cal_mod , only : shr_cal_ymd2date
3132
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
@@ -100,11 +101,11 @@ module cdeps_datm_comp
100101
character(len=*) , parameter :: nullstr = 'null'
101102

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

121-
character(CL) :: restfilm = nullstr ! model restart file namelist
122+
character(CX) :: restfilm = nullstr ! model restart file namelist
122123
integer :: nx_global ! global nx
123124
integer :: ny_global ! global ny
124125
logical :: skip_restart_read = .false. ! true => skip restart read in continuation run
@@ -294,15 +295,15 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
294295
if (ChkErr(rc,__LINE__,u_FILE_u)) return
295296
call ESMF_VMBroadcast(vm, anomaly_forcing, CL*8, main_task, rc=rc)
296297
if (ChkErr(rc,__LINE__,u_FILE_u)) return
297-
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
298+
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
298299
if (ChkErr(rc,__LINE__,u_FILE_u)) return
299-
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
300+
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
300301
if (ChkErr(rc,__LINE__,u_FILE_u)) return
301302
call ESMF_VMBroadcast(vm, factorFn_data, CL, main_task, rc=rc)
302303
if (ChkErr(rc,__LINE__,u_FILE_u)) return
303304
call ESMF_VMBroadcast(vm, factorFn_mesh, CL, main_task, rc=rc)
304305
if (ChkErr(rc,__LINE__,u_FILE_u)) return
305-
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
306+
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
306307
if (ChkErr(rc,__LINE__,u_FILE_u)) return
307308
call ESMF_VMBroadcast(vm, nextsw_cday_calc, CL, main_task, rc=rc)
308309
if (ChkErr(rc,__LINE__,u_FILE_u)) return

‎dglc/cime_config/testdefs/testlist_dglc.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,4 @@
2929
</options>
3030
</test>
3131

32-
<test compset="DATAMODELTEST" grid="f10_f10_ais8gris4_mg37" name="SMS_D_Ld3">
33-
<machines>
34-
<machine name="derecho" compiler="gnu" category="aux_cdeps"/>
35-
</machines>
36-
<options>
37-
<option name="wallclock"> 00:10:00 </option>
38-
</options>
39-
</test>
40-
41-
4232
</testlist>

‎dglc/glc_comp_nuopc.F90‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module cdeps_dglc_comp
2828
use NUOPC_Model , only : model_label_Finalize => label_Finalize
2929
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
3030
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
31+
use shr_kind_mod , only : cx=>shr_kind_cx
3132
use shr_cal_mod , only : shr_cal_ymd2date
3233
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
3334
use shr_string_mod , only : shr_string_listGetNum, shr_string_listGetName
@@ -95,10 +96,10 @@ module cdeps_dglc_comp
9596
character(CL) :: case_name
9697

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

@@ -262,7 +263,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
262263
if (ChkErr(rc,__LINE__,u_FILE_u)) return
263264
call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
264265
if (ChkErr(rc,__LINE__,u_FILE_u)) return
265-
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
266+
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
266267
if (ChkErr(rc,__LINE__,u_FILE_u)) return
267268
call ESMF_VMBroadcast(vm, model_meshfiles, CL*max_icesheets, main_task, rc=rc)
268269
if (ChkErr(rc,__LINE__,u_FILE_u)) return

‎dice/ice_comp_nuopc.F90‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ module cdeps_dice_comp
2525
use NUOPC_Model , only : model_label_Finalize => label_Finalize
2626
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
2727
use shr_kind_mod , only : r8=>shr_kind_r8, cxx=>shr_kind_cxx, cl=>shr_kind_cl, cs=>shr_kind_cs
28+
use shr_kind_mod , only : cx=>shr_kind_cx
2829
use shr_const_mod , only : shr_const_pi
2930
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
3031
use shr_cal_mod , only : shr_cal_ymd2date, shr_cal_ymd2julian
@@ -78,16 +79,16 @@ module cdeps_dice_comp
7879
character(*) , parameter :: nullstr = 'null'
7980

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

251252
call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
252253
if (ChkErr(rc,__LINE__,u_FILE_u)) return
253-
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
254+
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
254255
if (ChkErr(rc,__LINE__,u_FILE_u)) return
255-
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
256+
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
256257
if (ChkErr(rc,__LINE__,u_FILE_u)) return
257-
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
258+
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
258259
if (ChkErr(rc,__LINE__,u_FILE_u)) return
259260
call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
260261
if (ChkErr(rc,__LINE__,u_FILE_u)) return

‎dlnd/lnd_comp_nuopc.F90‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module cdeps_dlnd_comp
2323
use NUOPC_Model , only : model_label_Finalize => label_Finalize
2424
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
2525
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
26+
use shr_kind_mod , only : cx=>shr_kind_cx
2627
use shr_cal_mod , only : shr_cal_ymd2date
2728
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
2829
use dshr_methods_mod , only : dshr_state_getfldptr, dshr_state_diagnose, chkerr, memcheck
@@ -71,13 +72,13 @@ module cdeps_dlnd_comp
7172

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

220221
call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
221222
if (ChkErr(rc,__LINE__,u_FILE_u)) return
222-
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
223+
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
223224
if (ChkErr(rc,__LINE__,u_FILE_u)) return
224-
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
225+
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
225226
if (ChkErr(rc,__LINE__,u_FILE_u)) return
226-
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
227+
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
227228
if (ChkErr(rc,__LINE__,u_FILE_u)) return
228229
call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
229230
if (ChkErr(rc,__LINE__,u_FILE_u)) return

‎docn/ocn_comp_nuopc.F90‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module cdeps_docn_comp
2424
use NUOPC_Model , only : model_label_Finalize => label_Finalize
2525
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
2626
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
27+
use shr_kind_mod , only : cx=>shr_kind_cx
2728
use shr_cal_mod , only : shr_cal_ymd2date
2829
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
2930
use dshr_methods_mod , only : dshr_state_diagnose, chkerr, memcheck
@@ -93,14 +94,14 @@ module cdeps_docn_comp
9394
character(*) , parameter :: nullstr = 'null'
9495

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

263264
call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
264265
if (ChkErr(rc,__LINE__,u_FILE_u)) return
265-
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
266+
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
266267
if (ChkErr(rc,__LINE__,u_FILE_u)) return
267-
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
268+
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
268269
if (ChkErr(rc,__LINE__,u_FILE_u)) return
269-
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
270+
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
270271
if (ChkErr(rc,__LINE__,u_FILE_u)) return
271272
call ESMF_VMBroadcast(vm, import_data_fields, CL, main_task, rc=rc)
272273
if (ChkErr(rc,__LINE__,u_FILE_u)) return

‎drof/rof_comp_nuopc.F90‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module cdeps_drof_comp
2424
use NUOPC_Model , only : model_label_Finalize => label_Finalize
2525
use NUOPC_Model , only : NUOPC_ModelGet, SetVM
2626
use shr_kind_mod , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
27+
use shr_kind_mod , only : cx=>shr_kind_cx
2728
use shr_const_mod , only : SHR_CONST_SPVAL
2829
use shr_cal_mod , only : shr_cal_ymd2date
2930
use shr_log_mod , only : shr_log_setLogUnit, shr_log_error
@@ -67,12 +68,12 @@ module cdeps_drof_comp
6768
character(CL) :: case_name ! case name
6869
character(*) , parameter :: nullstr = 'null'
6970
! drof_in namelist input
70-
character(CL) :: streamfilename = nullstr ! filename to obtain stream info from
71-
character(CL) :: nlfilename = nullstr ! filename to obtain namelist info from
71+
character(CX) :: streamfilename = nullstr ! filename to obtain stream info from
72+
character(CX) :: nlfilename = nullstr ! filename to obtain namelist info from
7273
character(CL) :: dataMode = nullstr ! flags physics options wrt input data
73-
character(CL) :: model_meshfile = nullstr ! full pathname to model meshfile
74-
character(CL) :: model_maskfile = nullstr ! full pathname to obtain mask from
75-
character(CL) :: restfilm = nullstr ! model restart file namelist
74+
character(CX) :: model_meshfile = nullstr ! full pathname to model meshfile
75+
character(CX) :: model_maskfile = nullstr ! full pathname to obtain mask from
76+
character(CX) :: restfilm = nullstr ! model restart file namelist
7677
integer :: nx_global
7778
integer :: ny_global
7879
logical :: skip_restart_read = .false. ! true => skip restart read
@@ -225,11 +226,11 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
225226

226227
call ESMF_VMBroadcast(vm, datamode, CL, main_task, rc=rc)
227228
if (ChkErr(rc,__LINE__,u_FILE_u)) return
228-
call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
229+
call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
229230
if (ChkErr(rc,__LINE__,u_FILE_u)) return
230-
call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
231+
call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
231232
if (ChkErr(rc,__LINE__,u_FILE_u)) return
232-
call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
233+
call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
233234
if (ChkErr(rc,__LINE__,u_FILE_u)) return
234235
call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
235236
if (ChkErr(rc,__LINE__,u_FILE_u)) return

0 commit comments

Comments
 (0)