diff --git a/datm/atm_comp_nuopc.F90 b/datm/atm_comp_nuopc.F90 index be3469e6b..8e19799c2 100644 --- a/datm/atm_comp_nuopc.F90 +++ b/datm/atm_comp_nuopc.F90 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/dglc/cime_config/testdefs/testlist_dglc.xml b/dglc/cime_config/testdefs/testlist_dglc.xml index f87182fba..f39fbba2e 100644 --- a/dglc/cime_config/testdefs/testlist_dglc.xml +++ b/dglc/cime_config/testdefs/testlist_dglc.xml @@ -29,14 +29,4 @@ - - - - - - - - - - diff --git a/dglc/glc_comp_nuopc.F90 b/dglc/glc_comp_nuopc.F90 index 8cde1db1a..4d87b606e 100644 --- a/dglc/glc_comp_nuopc.F90 +++ b/dglc/glc_comp_nuopc.F90 @@ -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 @@ -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 @@ -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 diff --git a/dice/ice_comp_nuopc.F90 b/dice/ice_comp_nuopc.F90 index 35a25ab15..22f3658ce 100644 --- a/dice/ice_comp_nuopc.F90 +++ b/dice/ice_comp_nuopc.F90 @@ -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 @@ -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 @@ -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 diff --git a/dlnd/lnd_comp_nuopc.F90 b/dlnd/lnd_comp_nuopc.F90 index 3ad783862..df4c37941 100644 --- a/dlnd/lnd_comp_nuopc.F90 +++ b/dlnd/lnd_comp_nuopc.F90 @@ -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 @@ -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 @@ -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 diff --git a/docn/ocn_comp_nuopc.F90 b/docn/ocn_comp_nuopc.F90 index da612f278..accd9ac15 100644 --- a/docn/ocn_comp_nuopc.F90 +++ b/docn/ocn_comp_nuopc.F90 @@ -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 @@ -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 @@ -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 diff --git a/drof/rof_comp_nuopc.F90 b/drof/rof_comp_nuopc.F90 index 739bc1490..1a1cc6669 100644 --- a/drof/rof_comp_nuopc.F90 +++ b/drof/rof_comp_nuopc.F90 @@ -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 @@ -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 @@ -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 diff --git a/dwav/wav_comp_nuopc.F90 b/dwav/wav_comp_nuopc.F90 index 07e6dc50e..b002c5fbc 100644 --- a/dwav/wav_comp_nuopc.F90 +++ b/dwav/wav_comp_nuopc.F90 @@ -23,6 +23,7 @@ module cdeps_dwav_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, chkerr, memcheck, dshr_state_diagnose @@ -68,12 +69,12 @@ module cdeps_dwav_comp character(*) , parameter :: nullstr = 'null' ! dwav_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 @@ -223,11 +224,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