diff --git a/tests/fv3_conf/cplhist_cdeps_docn_dice.IN b/tests/fv3_conf/cpld_docn_dice.IN similarity index 57% rename from tests/fv3_conf/cplhist_cdeps_docn_dice.IN rename to tests/fv3_conf/cpld_docn_dice.IN index 6b0b9cf8ac..b7a9d76504 100644 --- a/tests/fv3_conf/cplhist_cdeps_docn_dice.IN +++ b/tests/fv3_conf/cpld_docn_dice.IN @@ -1,8 +1,6 @@ mkdir -p INPUT #CDEPS data files -#rsync -arv @[INPUTDATA_ROOT]/cplhist_DOCN_DICE/. INPUT -#cp /scratch1/NCEPDEV/stmp2/Nick.Szapiro/FV3_RT/rt_301994/cpld_control_nowave_noaero_p8_intel/ufs.cpld.cpl*.nc INPUT cp /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/cplhist_DOCN_DICE/ufs.cpld.cpl*.nc INPUT #CDEPS fix files - same for ocn/ice diff --git a/tests/fv3_conf/cpld_docn_pcice.IN b/tests/fv3_conf/cpld_docn_pcice.IN index 02c03e52b2..e3db9c7d0d 100644 --- a/tests/fv3_conf/cpld_docn_pcice.IN +++ b/tests/fv3_conf/cpld_docn_pcice.IN @@ -1,5 +1,4 @@ mkdir -p INPUT #For consistency, same CDEPS docn and CICE ice prescribed input files (data and ESMF_mesh) -#cp /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/OISST/RT/* INPUT cp /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/ERA5/* INPUT diff --git a/tests/parm/ufs.configure.s2s.IN b/tests/parm/ufs.configure.s2s.IN index de5ee38240..3efa42e6fe 100644 --- a/tests/parm/ufs.configure.s2s.IN +++ b/tests/parm/ufs.configure.s2s.IN @@ -93,20 +93,6 @@ MED_attributes:: coupling_mode = @[CPLMODE] pio_rearranger = @[pio_rearranger] ocean_albedo_limit = @[ocean_albedo_limit] - histaux_ice2med_file1_auxname = ice.ncpl.inst - histaux_ice2med_file1_doavg = .false. - histaux_ice2med_file1_enabled = .true. - histaux_ice2med_file1_flds = all - histaux_ice2med_file1_history_n = 1 - histaux_ice2med_file1_history_option = nsteps - histaux_ice2med_file1_ntperfile = 1 - histaux_ocn2med_file1_auxname = ocn.ncpl.inst - histaux_ocn2med_file1_doavg = .false. - histaux_ocn2med_file1_enabled = .true. - histaux_ocn2med_file1_flds = all - histaux_ocn2med_file1_history_n = 1 - histaux_ocn2med_file1_history_option = nsteps - histaux_ocn2med_file1_ntperfile = 1 :: ALLCOMP_attributes:: diff --git a/tests/tests/atm_ds2s_docn_dice b/tests/tests/atm_ds2s_docn_dice index 68c745f742..9b5af47162 100644 --- a/tests/tests/atm_ds2s_docn_dice +++ b/tests/tests/atm_ds2s_docn_dice @@ -113,5 +113,4 @@ export FIELD_TABLE=field_table_thompson_noaero_tke export INPUT_NML=global_control.nml.IN export MODEL_CONFIGURE=model_configure.IN export UFS_CONFIGURE=ufs.configure.s2s.IN -export FV3_RUN="cpld_control_run.IN cplhist_cdeps_docn_dice.IN" -#export FV3_RUN="control_run.IN cplhist_cdeps_docn_dice.IN" +export FV3_RUN="cpld_control_run.IN cpld_docn_dice.IN"