Fix premature finalizes and retrieval of is_moving info in ATM cap (#3093) // Aquaplanet test case (#3013)

tests-dev/baseline_setup.yaml

@@ -1,55 +1,55 @@
 ursa:
   QUEUE: batch
   COMPILE_QUEUE: batch
-  PARTITION: u1
+  PARTITION: u1-compute
   dprefix: /scratch4/NAGAPE/epic/${USER}
   DISKNM: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT
   STMP: /scratch4/NAGAPE/epic/${USER}/RT_BASELINE
   PTMP: /scratch4/NAGAPE/epic/${USER}/RT_RUNDIRS
   RUNDIR_ROOT:
   SCHEDULER: slurm
-  INPUTDATA_ROOT: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
+  INPUTDATA_ROOT: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
   INPUTDATA_ROOT_BMIC: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
 hera:
   QUEUE: batch
   COMPILE_QUEUE: batch
   PARTITION:
-  dprefix: /scratch1/NCEPDEV
-  DISKNM: /scratch2/NAGAPE/epic/UFS-WM_RT
-  STMP: /scratch1/NCEPDEV/stmp4
-  PTMP: /scratch1/NCEPDEV/stmp2
+  dprefix: /scratch3/NCEPDEV/stmp/${USER}
+  DISKNM: /scratch3/NAGAPE/epic/role.epic/UFS-WM_RT
+  STMP: /scratch3/NCEPDEV/stmp/${USER}/RT_BASELINE
+  PTMP: /scratch3/NCEPDEV/stmp/${USER}/RT_RUNDIRS
   RUNDIR_ROOT:
   SCHEDULER: slurm
-  INPUTDATA_ROOT: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
-  INPUTDATA_ROOT_BMIC: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
+  INPUTDATA_ROOT: /scratch3/NAGAPE/epic/role.epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /scratch3/NAGAPE/epic/role.epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
+  INPUTDATA_ROOT_BMIC: /scratch3/NAGAPE/epic/role.epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
 orion:
   QUEUE: batch
   COMPILE_QUEUE: batch
   PARTITION: orion
-  dprefix: /work/noaa/stmp/${USER}
-  DISKNM: /work/noaa/epic/UFS-WM_RT
-  STMP: /work/noaa/stmp/${USER}/stmp
-  PTMP: /work/noaa/stmp/${USER}/stmp
+  dprefix: /work2/noaa/stmp/${USER}
+  DISKNM: /work2/noaa/epic/UFS-WM_RT
+  STMP: /work2/noaa/stmp/${USER}/stmp
+  PTMP: /work2/noaa/stmp/${USER}/stmp
   RUNDIR_ROOT:
   SCHEDULER: slurm
-  INPUTDATA_ROOT: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
-  INPUTDATA_ROOT_BMIC: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207  
+  INPUTDATA_ROOT: /work2/noaa/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /work2/noaa/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
+  INPUTDATA_ROOT_BMIC: /work2/noaa/epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
 hercules:
   QUEUE: batch
   COMPILE_QUEUE: batch
   PARTITION: hercules
   dprefix: /work2/noaa/stmp/${USER}
-  DISKNM: /work/noaa/epic/hercules/UFS-WM_RT
+  DISKNM: /work2/noaa/epic/hercules/UFS-WM_RT
   STMP: /work2/noaa/stmp/${USER}
   PTMP: /work2/noaa/stmp/${USER}
   RUNDIR_ROOT:
   SCHEDULER: slurm
-  INPUTDATA_ROOT: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
-  INPUTDATA_ROOT_BMIC: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
+  INPUTDATA_ROOT: /work2/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /work2/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
+  INPUTDATA_ROOT_BMIC: /work2/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
 gaeac6:
   QUEUE: normal
   COMPILE_QUEUE: normal
@@ -60,8 +60,8 @@ gaeac6:
   PTMP: /gpfs/f6/${ACCNR}/proj-shared/${USER}/RT_RUNDIR
   RUNDIR_ROOT:
   SCHEDULER: slurm
-  INPUTDATA_ROOT: /gpfs/f6/bil-fire8/world-shared/role.epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /gpfs/f6/bil-fire8/world-shared/role.epic/UFS-WM_RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
+  INPUTDATA_ROOT: /gpfs/f6/bil-fire8/world-shared/role.epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /gpfs/f6/bil-fire8/world-shared/role.epic/UFS-WM_RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
   INPUTDATA_ROOT_BMIC: /gpfs/f6/bil-fire8/world-shared/role.epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
 derecho:
   QUEUE: main
@@ -73,21 +73,21 @@ derecho:
   PTMP: /glade/derecho/scratch
   RUNDIR_ROOT:
   SCHEDULER: pbs
-  INPUTDATA_ROOT: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
+  INPUTDATA_ROOT: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
   INPUTDATA_ROOT_BMIC: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/BM_IC-20220207
 noaacloud:
   QUEUE: batch
   COMPILE_QUEUE: batch
   PARTITION:
-  dprefix: /lustre
+  dprefix: /contrib
   DISKNM: /contrib/ufs-weather-model/RT
-  STMP: /lustre/stmp
-  PTMP: /lustre/stmp
+  STMP: /contrib/stmp
+  PTMP: /contrib/stmp
   RUNDIR_ROOT:
   SCHEDULER: slurm
-  INPUTDATA_ROOT: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
+  INPUTDATA_ROOT: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
   INPUTDATA_ROOT_BMIC: /contrib/ufs-weather-model/RT/NEMSfv3gfs/BM_IC-20220207
 s4:
   QUEUE: s4
@@ -99,6 +99,6 @@ s4:
   PTMP: /scratch/users
   RUNDIR_ROOT:
   SCHEDULER: slurm
-  INPUTDATA_ROOT: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20250507
-  INPUTDATA_ROOT_WW3: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20250507/WW3_input_data_20250225
+  INPUTDATA_ROOT: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20251015
+  INPUTDATA_ROOT_WW3: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20251015/WW3_input_data_20250225
   INPUTDATA_ROOT_BMIC: /data/prod/emc.nemspara/RT/NEMSfv3gfs/BM_IC-20220207

tests-dev/machine_config/machine_derecho.config

@@ -2,14 +2,14 @@
 set -eux
 
 module use /glade/work/epicufsrt/contrib/derecho/modulefiles
-module load rocoto/1.3.7-fix
+module load rocoto/1.3.7
 
 module use -a /glade/work/epicufsrt/conda/modulefiles.derecho
 module load anaconda/23.7.4
 
-ROCOTORUN=/glade/work/epicufsrt/contrib/derecho/rocoto-1.3.7-fix/bin/rocotorun
-ROCOTOSTAT=/glade/work/epicufsrt/contrib/derecho/rocoto-1.3.7-fix/bin/rocotostat
-ROCOTOCOMPLETE=/glade/work/epicufsrt/contrib/derecho/rocoto-1.3.7-fix/bin/rocotocomplete
+ROCOTORUN=/glade/work/epicufsrt/contrib/derecho/rocoto-1.3.7/bin/rocotorun
+ROCOTOSTAT=/glade/work/epicufsrt/contrib/derecho/rocoto-1.3.7/bin/rocotostat
+ROCOTOCOMPLETE=/glade/work/epicufsrt/contrib/derecho/rocoto-1.3.7/bin/rocotocomplete
 ROCOTO_SCHEDULER=pbspro
 export ROCOTORUN
 export ROCOTOSTAT

tests-dev/machine_config/machine_noaacloud.config

@@ -1,16 +1,14 @@
 #!/bin/bash
 set -eux
 
-export PATH=/contrib/EPIC/bin:${PATH}
 module use /apps/modules/modulefiles
-module use /contrib/EPIC/rocoto/modulefiles
 
 module load intelpython/2023.2.0
 module load rocoto/1.3.7
 
-ROCOTORUN=/contrib/EPIC/rocoto/1.3.7/bin/rocotorun
-ROCOTOSTAT=/contrib/EPIC/rocoto/1.3.7/bin/rocotostat
-ROCOTOCOMPLETE=/contrib/EPIC/rocoto/1.3.7/bin/rocotocomplete
+ROCOTORUN=/apps/rocoto/1.3.7/bin/rocotorun
+ROCOTOSTAT=/apps/rocoto/1.3.7/bin/rocotostat
+ROCOTOCOMPLETE=/apps/rocoto/1.3.7/bin/rocotocomplete
 ROCOTO_SCHEDULER=slurm
 export ROCOTORUN
 export ROCOTOSTAT

tests-dev/test_cases/exp_conf/2020_CAPE.IN

@@ -128,7 +128,7 @@ if [[ $POSTAPP = 'global' ]]; then
   cp    ${PATHRT}/parm/@[POST_ITAG] itag
   cp    ${PATHRT}/parm/@[POSTXCONFIG] postxconfig-NT.txt
   cp    ${PATHRT}/parm/@[POSTXCONFIG_FH00] postxconfig-NT_FH00.txt
-  cp    ${PATHRT}/../FV3/upp/parm/params_grib2_tbl_new params_grib2_tbl_new
+  cp    ${PATHRT}/../UFSATM/upp/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
 
 #rrtmgp

tests-dev/test_cases/exp_conf/aquaplanet.IN

@@ -0,0 +1,197 @@
+rm -fr INPUT RESTART
+# Set default ores to determine fix_tiled input directory
+if [ $NPX = 97 ]; then
+  inputdir=FV3_input_data
+  ores=100
+elif [ $NPX = 49 ]; then
+  inputdir=FV3_input_data48
+  ores=500
+elif [ $NPX = 193 ]; then
+  inputdir=FV3_input_data192
+  ores=050
+elif [ $NPX = 385 ]; then
+  inputdir=FV3_input_data384
+  ores=025
+elif [ $NPX = 769 ]; then
+  inputdir=FV3_input_data768
+  ores=025
+fi
+
+echo "inputdir=$inputdir,NPX=$NPX,NESTED=$NESTED"
+
+OPNREQ_TEST=${OPNREQ_TEST:-false}
+V2_SFC_FILE=${V2_SFC_FILE:-false}
+HSD_CASE=${HSD_CASE:-false}
+SUFFIX=${RT_SUFFIX}
+if [ $WARM_START = .false. ]; then
+  mkdir INPUT RESTART
+  if [ "$NESTED" = .true. ]; then
+    cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_nested/* ./INPUT/.
+  elif [ "$V2_SFC_FILE" = "true" ]; then
+    cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
+  else
+    cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.
+  fi
+else
+  mkdir INPUT RESTART
+
+  if [[ ${OPNREQ_TEST} == true ]]; then
+    SUFFIX=${BL_SUFFIX}
+  fi
+
+  # WAVE restart file for ATMW ORT tests
+  if [[ $CPLWAV == .true. ]]; then
+    if [[ $med_model == cmeps ]] && [[ $RUNTYPE == continue ]]; then
+      # CMEPS restart and pointer files
+      RFILE=ufs.atmw.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
+      cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
+      ls -1 ${RFILE}>rpointer.cpl
+    fi
+    RFILE=ufs.atmw.ww3.r.${RESTART_FILE_SUFFIX_SECS}.nc
+    cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
+  fi
+
+  if [ $MODEL_INITIALIZATION = false ]; then
+    #read_inc and iau tests restart from fh=24
+    CURRDIR=`pwd`
+    FILEDIR=${CURRDIR}/../${DEP_RUN}${SUFFIX}/RESTART
+  else
+    #for warm start from initialiation time
+    FILEDIR=@[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_GDAS
+  fi
+
+  if [[ ${IAU_OFFSET} != 0 ]] || [[ $READ_INCREMENT = .true. ]]; then
+
+    if [ $MODEL_INITIALIZATION = false ]; then
+      cp ${FILEDIR}/../INPUT/fv3_increment.nc INPUT/.
+      cp ${FILEDIR}/../INPUT/grid_spec.nc INPUT/.
+      cp ${FILEDIR}/../INPUT/*_grid.tile*.nc INPUT/.
+      cp ${FILEDIR}/../INPUT/oro_data.tile*.nc INPUT/.
+    else
+      cp ${FILEDIR}/fv_increment*.nc INPUT/.
+      cp ${FILEDIR}/grid_spec.nc INPUT/.
+      cp ${FILEDIR}/*_grid.tile*.nc INPUT/.
+      cp ${FILEDIR}/oro_data.tile*.nc INPUT/.
+    fi
+    cp ${FILEDIR}/coupler.res INPUT/.
+    cp ${FILEDIR}/fv_core.res.* INPUT/.
+    cp ${FILEDIR}/fv_srf_wnd.res.* INPUT/.
+    cp ${FILEDIR}/fv_tracer.* INPUT/.
+    cp ${FILEDIR}/phy_data.* INPUT/.
+    cp ${FILEDIR}/sfc_data.* INPUT/.
+  else
+    #restart test start from fh FHROT
+    cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
+    rm -f INPUT/fv_core.res.*
+    rm -f INPUT/fv_srf_wnd.res.*
+    rm -f INPUT/fv_tracer.res.*
+    rm -f INPUT/phy_data.*
+    rm -f INPUT/sfc_data.*
+    cp ${FILEDIR}/../INPUT/grid_spec.nc INPUT/.
+    cp ${FILEDIR}/../INPUT/*_grid.tile*.nc INPUT/.
+    cp ${FILEDIR}/../INPUT/oro_data*.nc INPUT/.
+    for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
+      [ -e $RFILE ] || exit 1
+      RFILE_OLD=$(basename $RFILE)
+      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
+      cp $RFILE INPUT/${RFILE_NEW}
+    done
+  fi
+fi
+
+if [ $TILEDFIX = .true. ]; then
+    if [ "$NESTED" = .true. ]; then
+        cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/@[ATMRES]*.nc .
+    else
+        cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]mx${ores}/@[ATMRES]*.nc .
+    fi
+    cp    @[INPUTDATA_ROOT]/FV3_fix/global_glacier.2x2.grb .
+    cp    @[INPUTDATA_ROOT]/FV3_fix/global_maxice.2x2.grb .
+    cp    @[INPUTDATA_ROOT]/FV3_fix/RTGSST.1982.2012.monthly.clim.grb .
+    cp    @[INPUTDATA_ROOT]/FV3_fix/global_snoclim.1.875.grb .
+    cp    @[INPUTDATA_ROOT]/FV3_fix/IMS-NIC.blended.ice.monthly.clim.grb .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/@[FNSMCC] .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/@[FNMSKH_control] .
+else
+    cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
+fi
+
+if [ $CPLWAV = .true. ]; then
+    cp    @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] mod_def.ww3
+    cp    @[INPUTDATA_ROOT_WW3]/@[MESH_WAV] .
+fi
+
+#inline post
+if [[ $POSTAPP = 'global' ]]; then
+  cp    ${PATHRT}/parm/@[POST_ITAG] itag
+  cp    ${PATHRT}/parm/@[POSTXCONFIG] postxconfig-NT.txt
+  cp    ${PATHRT}/parm/@[POSTXCONFIG_FH00] postxconfig-NT_FH00.txt
+  cp    ${PATHRT}/../UFSATM/upp/parm/params_grib2_tbl_new params_grib2_tbl_new
+fi
+
+#rrtmgp
+if [ $DO_RRTMGP = .true. ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+fi
+
+#merra2
+if [ $USE_MERRA2 = .true. ]; then
+if [ $IAER = 1011 ]; then
+  for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
+    cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
+  done
+fi
+if [ $IAER = 6011 ]; then
+  ln -sf @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_40y/2021_03/MERRA2_400.inst3_3d_aer_Nv.20210322.nc4 merra2_20210322.nc
+  ln -sf @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_40y/2021_03/MERRA2_400.inst3_3d_aer_Nv.20210323.nc4 merra2_20210323.nc
+fi
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
+fi
+
+#rad_c_gocart
+if [ $IAER = 2011 ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
+fi
+#ugwpv1
+if [ $DO_UGWP_V1 = .true. ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
+fi
+
+#Thompson
+if [ $IMP_PHYSICS = 8 ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_fix/qr_acr_qsV2.dat .
+  cp    @[INPUTDATA_ROOT]/FV3_fix/qr_acr_qgV2.dat .
+  cp    @[INPUTDATA_ROOT]/FV3_fix/freezeH2O.dat .
+  cp    @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
+fi
+
+#TEMPO
+if [ $IMP_PHYSICS = 88 ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
+  rm qr_acr_qsV2.dat
+  rm qr_acr_qgV2.dat
+  rm freezeH2O.dat
+  cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_freezeH2O.dat .
+  cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQG.dat .
+  cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_HAILAWARE_QRacrQG.dat .
+  cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQS.dat .
+fi
+
+#prognostic aerosols
+if [ $CPLCHM = .true. ]; then
+  cp      ${PATHRT}/parm/gocart/*.rc .
+  ln -sf  @[INPUTDATA_ROOT]/GOCART/p8/ExtData .
+fi
+
+#overwrite ICs created after 90-day spin-up for aquaplanet case
+  cp -r @[INPUTDATA_ROOT]/HSD_input_data/aquaplanet/INPUT/* ./INPUT/.
+#overwrite monthly data (SST, ICE, land-sea mask, ...) for aquaplanet case
+  cp -r @[INPUTDATA_ROOT]/HSD_input_data/aquaplanet/clim/* .

tests-dev/test_cases/exp_conf/baroclinic_wave.IN

@@ -131,7 +131,7 @@ if [[ $POSTAPP = 'global' ]]; then
   cp    ${PATHRT}/parm/@[POST_ITAG] itag
   cp    ${PATHRT}/parm/@[POSTXCONFIG] postxconfig-NT.txt
   cp    ${PATHRT}/parm/@[POSTXCONFIG_FH00] postxconfig-NT_FH00.txt
-  cp    ${PATHRT}/../FV3/upp/parm/params_grib2_tbl_new params_grib2_tbl_new
+  cp    ${PATHRT}/../UFSATM/upp/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
 
 #rrtmgp