From 40508ade9426e777c344d3d476a4cabb36dd01c1 Mon Sep 17 00:00:00 2001 From: JeffBeck-NOAA <55201531+JeffBeck-NOAA@users.noreply.github.com> Date: Tue, 18 Aug 2020 17:05:42 -0600 Subject: [PATCH] Rename SAR to LAM and JP to ESG, remove fix files (#268) * Remove all references to /lfs3 on Jet * Add Ben and Ratko to the CODEOWNERS file * Replace hard-coded make_orog module file with build-level module file in UFS_UTILS * Remove hard-coded make_sfc_climo module file * Rename all FV3-SAR and SAR-FV3 to FV3-LAM, rename all JPgrid to ESGgrid. Remove fix files in regional_workflow and source from fix_am and EMC_post. * Add alpha/kappa parameter back in exregional_make_grid.sh * Remove dash from FV3LAM_wflow.xml * Change FIXam to FIXgsm to source Thompson CCN file * Remove old, unused grid stanza from exregional_run_post.sh * Change Jet locations of fix_am/fix_orog to EMC paths --- jobs/JREGIONAL_GET_EXTRN_MDL_FILES | 2 +- jobs/JREGIONAL_MAKE_GRID | 8 +- jobs/JREGIONAL_RUN_POST | 2 +- scripts/exregional_get_extrn_mdl_files.sh | 6 +- scripts/exregional_make_grid.sh | 34 +- scripts/exregional_make_ics.sh | 16 +- scripts/exregional_make_lbcs.sh | 18 +- scripts/exregional_make_orog.sh | 12 +- scripts/exregional_make_sfc_climo.sh | 4 +- scripts/exregional_run_fcst.sh | 20 +- scripts/exregional_run_post.sh | 29 +- tests/baseline_configs/config.GSD_RAP13km.sh | 12 +- .../config.community_ensemble_008mems.sh | 2 +- .../config.community_ensemble_2mems.sh | 2 +- tests/baseline_configs/config.nco_conus.sh | 6 +- .../baseline_configs/config.nco_conus_c96.sh | 6 +- tests/baseline_configs/config.nco_ensemble.sh | 6 +- ...ig.new_JPgrid.sh => config.new_ESGgrid.sh} | 38 +- tests/baseline_configs/config.regional_001.sh | 2 +- tests/baseline_configs/config.regional_002.sh | 2 +- tests/baseline_configs/config.regional_003.sh | 2 +- tests/baseline_configs/config.regional_004.sh | 2 +- tests/baseline_configs/config.regional_005.sh | 2 +- tests/baseline_configs/config.regional_006.sh | 8 +- tests/baseline_configs/config.regional_009.sh | 6 +- tests/baseline_configs/config.regional_010.sh | 2 +- tests/baseline_configs/config.regional_011.sh | 2 +- tests/baseline_configs/config.regional_012.sh | 2 +- tests/baseline_configs/config.regional_013.sh | 2 +- tests/baseline_configs/config.regional_014.sh | 2 +- tests/baseline_configs/config.regional_016.sh | 2 +- .../config.user_staged_extrn_files.sh | 2 +- tests/baselines_list.txt | 2 +- tests/run_experiments.sh | 2 +- ush/NCL/NCL_ICs_BCs/generate_ICs_BCs.sh | 26 +- .../generate_RAP_based_ICs_BCs.ncl | 106 +++--- ...RFV3.ncl => interpolate_RAP_to_FV3LAM.ncl} | 46 +-- .../NCL_ICs_BCs/plot_model_field_generic.ncl | 2 +- ...rid_halo.ncl => read_FV3LAM_grid_halo.ncl} | 10 +- ush/NCL/check_filevar_existence_dims.ncl | 2 +- ush/NCL/find_wrtcmp_grid_params.ncl | 8 +- ush/NCL/make_plot_titles.ncl | 12 +- ...ative.ncl => plot_FV3LAM_field_native.ncl} | 116 +++--- ush/NCL/plot_grid.ncl | 98 ++--- ush/NCL/process_plot_params.ncl | 2 +- ...ative.ncl => read_FV3LAM_field_native.ncl} | 8 +- ...rtcmp.ncl => read_FV3LAM_field_wrtcmp.ncl} | 6 +- ...native.ncl => read_FV3LAM_grid_native.ncl} | 12 +- ...wrtcmp.ncl => read_FV3LAM_grid_wrtcmp.ncl} | 22 +- ...e.ncl => read_FV3LAM_gridfield_native.ncl} | 10 +- ush/UFS_plot_domains.py | 32 +- ush/cmp_expt_to_baseline.sh | 2 +- ush/config.community.sh | 2 +- ush/config.nco.sh | 6 +- ush/config_defaults.sh | 66 ++-- ...3SAR_wflow.sh => generate_FV3LAM_wflow.sh} | 34 +- ush/get_extrn_mdl_file_dir_info.sh | 40 +- ...FV3SAR_wflow.sh => launch_FV3LAM_wflow.sh} | 10 +- ush/link_fix.sh | 22 +- ush/load_modules_run_task.sh | 2 +- ush/set_FV3nml_sfc_climo_filenames.sh | 6 +- ush/set_extrn_mdl_params.sh | 4 +- ...ms_JPgrid.sh => set_gridparams_ESGgrid.sh} | 8 +- ush/set_gridparams_GFDLgrid.sh | 2 +- ush/set_predef_grid_params.sh | 354 +++++++++--------- ush/setup.sh | 162 ++++---- .../{FV3SAR_wflow.xml => FV3LAM_wflow.xml} | 2 +- ush/templates/README.xml_templating.md | 2 +- ush/valid_param_vals.sh | 2 +- 69 files changed, 738 insertions(+), 771 deletions(-) rename tests/baseline_configs/{config.new_JPgrid.sh => config.new_ESGgrid.sh} (68%) rename ush/NCL/NCL_ICs_BCs/{interpolate_RAP_to_SARFV3.ncl => interpolate_RAP_to_FV3LAM.ncl} (82%) rename ush/NCL/NCL_ICs_BCs/{read_FV3SAR_grid_halo.ncl => read_FV3LAM_grid_halo.ncl} (98%) rename ush/NCL/{plot_FV3SAR_field_native.ncl => plot_FV3LAM_field_native.ncl} (94%) rename ush/NCL/{read_FV3SAR_field_native.ncl => read_FV3LAM_field_native.ncl} (98%) rename ush/NCL/{read_FV3SAR_field_wrtcmp.ncl => read_FV3LAM_field_wrtcmp.ncl} (97%) rename ush/NCL/{read_FV3SAR_grid_native.ncl => read_FV3LAM_grid_native.ncl} (99%) rename ush/NCL/{read_FV3SAR_grid_wrtcmp.ncl => read_FV3LAM_grid_wrtcmp.ncl} (93%) rename ush/NCL/{read_FV3SAR_gridfield_native.ncl => read_FV3LAM_gridfield_native.ncl} (98%) rename ush/{generate_FV3SAR_wflow.sh => generate_FV3LAM_wflow.sh} (97%) rename ush/{launch_FV3SAR_wflow.sh => launch_FV3LAM_wflow.sh} (98%) rename ush/{set_gridparams_JPgrid.sh => set_gridparams_ESGgrid.sh} (96%) rename ush/templates/{FV3SAR_wflow.xml => FV3LAM_wflow.xml} (99%) diff --git a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES index 94eb6dfc65..27c14192f8 100755 --- a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES +++ b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES @@ -206,7 +206,7 @@ cd_vrfy "${extrn_mdl_staging_dir}" get_extrn_mdl_file_dir_info \ extrn_mdl_name="${EXTRN_MDL_NAME}" \ anl_or_fcst="${anl_or_fcst}" \ - cdate_FV3SAR="${CDATE}" \ + cdate_FV3LAM="${CDATE}" \ time_offset_hrs="${time_offset_hrs}" \ varname_extrn_mdl_cdate="extrn_mdl_cdate" \ varname_extrn_mdl_lbc_spec_fhrs="extrn_mdl_lbc_spec_fhrs" \ diff --git a/jobs/JREGIONAL_MAKE_GRID b/jobs/JREGIONAL_MAKE_GRID index a8b1fbe2e0..0ff122bad1 100755 --- a/jobs/JREGIONAL_MAKE_GRID +++ b/jobs/JREGIONAL_MAKE_GRID @@ -4,7 +4,7 @@ #----------------------------------------------------------------------- # # This script generates grid and orography files in NetCDF format that -# are required as inputs for running the FV3SAR model (i.e. the FV3 mo- +# are required as inputs for running the FV3-LAM model (i.e. the FV3 mo- # del on a regional domain). It in turn calls three other scripts whose # file names are specified in the variables grid_gen_scr, orog_gen_scr, # and orog_fltr_scr and then calls the executable defined in the varia- @@ -28,7 +28,7 @@ # large enough such that the "shave" steps later below (which take # this file as input and generate grid files with thinner halos) # have a wide enough starting halo to work with. More specifical- -# ly, the FV3SAR model needs as inputs two grid files: one with a +# ly, the FV3-LAM model needs as inputs two grid files: one with a # halo that is 3 cells and another with a halo that is 4 cells # wide. Thus, the halo in the grid file that the grid_gen_scr # script generates must be greater than 4 since otherwise, the @@ -38,7 +38,7 @@ # name denotes number of cells, the "h" is used to indicate that # it refers to a halo region, the "w" is used to indicate that it # refers to a wide halo (i.e. wider than the 3-cell and 4-cell ha- -# los that the FV3SAR model requires as inputs, and the "T7" is +# los that the FV3-LAM model requires as inputs, and the "T7" is # used to indicate that the cell count is on tile 7. # # 2) orog_gen_scr: @@ -63,7 +63,7 @@ # generated by script orog_gen_scr (and the grid file generated by # grid_gen_scr). # -# b) In analogy with the input grid files, the FV3SAR model needs as +# b) In analogy with the input grid files, the FV3-LAM model needs as # input two (filtered) orography files -- one with no halo cells # and another with 3. These are obtained later below by "shaving" # off layers of halo cells from the (filtered) orography file ge- diff --git a/jobs/JREGIONAL_RUN_POST b/jobs/JREGIONAL_RUN_POST index 28df0dc032..bddc87aa4e 100755 --- a/jobs/JREGIONAL_RUN_POST +++ b/jobs/JREGIONAL_RUN_POST @@ -4,7 +4,7 @@ #----------------------------------------------------------------------- # # This script runs the post-processor (UPP) on the NetCDF output files -# of the write component of the FV3SAR model. +# of the write component of the FV3-LAM model. # #----------------------------------------------------------------------- # diff --git a/scripts/exregional_get_extrn_mdl_files.sh b/scripts/exregional_get_extrn_mdl_files.sh index f94b0409e9..ab54da8128 100755 --- a/scripts/exregional_get_extrn_mdl_files.sh +++ b/scripts/exregional_get_extrn_mdl_files.sh @@ -631,7 +631,7 @@ file unzip_log_fn in that directory for details: # of each external model file. If any are missing, then the corresponding # files are not in the zip file and thus cannot be extracted. In that # case, print out a message and exit the script because initial condition -# and surface field files for the FV3SAR cannot be generated without all +# and surface field files for the FV3-LAM cannot be generated without all # the external model files. # #----------------------------------------------------------------------- @@ -690,7 +690,7 @@ details: print_info_msg " ======================================================================== External model files needed for generating initial condition and surface -fields for the FV3SAR successfully fetched from HPSS!!! +fields for the FV3-LAM successfully fetched from HPSS!!! Exiting script: \"${scrfunc_fn}\" In directory: \"${scrfunc_dir}\" @@ -701,7 +701,7 @@ In directory: \"${scrfunc_dir}\" print_info_msg " ======================================================================== External model files needed for generating lateral boundary conditions -on the halo of the FV3SAR's regional grid successfully fetched from +on the halo of the FV3-LAM's regional grid successfully fetched from HPSS!!! Exiting script: \"${scrfunc_fn}\" diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh index cfe7ea562a..977c9c99c2 100755 --- a/scripts/exregional_make_grid.sh +++ b/scripts/exregional_make_grid.sh @@ -189,7 +189,7 @@ mkdir_vrfy -p "$tmpdir" # GRID_DIR. Note that the file for tile 7 will include a halo of width # NHW cells. # -# Since tiles 1 through 6 are not needed to run the FV3SAR model and are +# Since tiles 1 through 6 are not needed to run the FV3-LAM model and are # not used later on in any other preprocessing steps, it is not clear # why they are generated. It might be because it is not possible to di- # rectly generate a standalone regional grid using the make_hgrid uti- @@ -283,7 +283,7 @@ mkdir_vrfy -p "$tmpdir" # if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then exec_fn="make_hgrid" -elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then +elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then exec_fn="regional_grid" fi @@ -343,11 +343,11 @@ nonzero exit code. # grid_fn="${grid_name}.tile${TILE_RGNL}.nc" # -# Generate a JPgrid-type of grid. +# Generate a ESGgrid-type of grid. # -elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then +elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then # -# Create the namelist file read in by the JPgrid-type grid generation +# Create the namelist file read in by the ESGgrid-type grid generation # code in the temporary subdirectory. # rgnl_grid_nml_fp="$tmpdir/${RGNL_GRID_NML_FN}" @@ -372,9 +372,9 @@ generation executable (exec_fp): 'dely': ${DEL_ANGLE_Y_SG}, 'lx': ${NEG_NX_OF_DOM_WITH_WIDE_HALO}, 'ly': ${NEG_NY_OF_DOM_WITH_WIDE_HALO}, - 'a': ${JPgrid_ALPHA_PARAM}, - 'k': ${JPgrid_KAPPA_PARAM}, - } + 'a': ${ESGgrid_ALPHA_PARAM}, + 'k': ${ESGgrid_KAPPA_PARAM}, +} " # # Call the python script to create the namelist file. @@ -393,7 +393,7 @@ $settings" # $APRUN ${exec_fp} ${rgnl_grid_nml_fp} || \ print_err_msg_exit "\ -Call to executable (exec_fp) that generates a JPgrid-type regional grid +Call to executable (exec_fp) that generates a ESGgrid-type regional grid returned with nonzero exit code: exec_fp = \"${exec_fp}\"" # @@ -461,7 +461,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then else CRES="C${res_equiv}" fi -elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then +elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then CRES="C${res_equiv}" fi set_file_param "${GLOBAL_VAR_DEFNS_FP}" "CRES" "\"$CRES\"" @@ -482,22 +482,22 @@ mv_vrfy "${grid_fp_orig}" "${grid_fp}" # # If there are pre-existing orography or climatology files that we will # be using (i.e. if RUN_TASK_MAKE_OROG or RUN_TASK_MAKE_SURF_CLIMO is set -# to "FALSE", in which case RES_IN_FIXSAR_FILENAMES will not be set to a +# to "FALSE", in which case RES_IN_FIXLAM_FILENAMES will not be set to a # null string), check that the grid resolution contained in the variable # CRES set above matches the resolution appearing in the names of the # preexisting orography and/or surface climatology files. # #----------------------------------------------------------------------- # -if [ ! -z "${RES_IN_FIXSAR_FILENAMES}" ]; then +if [ ! -z "${RES_IN_FIXLAM_FILENAMES}" ]; then res="${CRES:1}" - if [ "$res" -ne "${RES_IN_FIXSAR_FILENAMES}" ]; then + if [ "$res" -ne "${RES_IN_FIXLAM_FILENAMES}" ]; then print_err_msg_exit "\ The resolution (res) calculated for the grid does not match the resolution -(RES_IN_FIXSAR_FILENAMES) appearing in the names of the orography and/or +(RES_IN_FIXLAM_FILENAMES) appearing in the names of the orography and/or surface climatology files: res = \"$res\" - RES_IN_FIXSAR_FILENAMES = \"${RES_IN_FIXSAR_FILENAMES}\"" + RES_IN_FIXLAM_FILENAMES = \"${RES_IN_FIXLAM_FILENAMES}\"" fi fi # @@ -635,7 +635,7 @@ halo failed." # #----------------------------------------------------------------------- # -# Create symlinks in the FIXsar directory to the grid and mosaic files +# Create symlinks in the FIXLAM directory to the grid and mosaic files # generated above in the GRID_DIR directory. # #----------------------------------------------------------------------- @@ -654,7 +654,7 @@ failed." # paths to the surface climatology files. These files will either already # be avaialable in a user-specified directory (SFC_CLIMO_DIR) or will be # generated by the MAKE_SFC_CLIMO_TN task. They (or symlinks to them) -# will be placed (or wll already exist) in the FIXsar directory. +# will be placed (or wll already exist) in the FIXLAM directory. # # Also, if running ensemble forecasts, call a function (set_FV3nml_stoch_params) # to create a new FV3 namelist file for each ensemble member that contains diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index 0da673482d..f02fd03ea7 100755 --- a/scripts/exregional_make_ics.sh +++ b/scripts/exregional_make_ics.sh @@ -376,7 +376,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..." # These geogrid files need to be moved to more permanent locations. # if [ "${MACHINE}" = "HERA" ]; then - geogrid_file_input_grid="/scratch2/BMC/det/beck/FV3-SAR/geo_em.d01.nc_HRRRX" + geogrid_file_input_grid="/scratch2/BMC/det/beck/FV3-LAM/geo_em.d01.nc_HRRRX" elif [ "${MACHINE}" = "JET" ]; then geogrid_file_input_grid="/misc/whome/rtrr/HRRR/static/WPS/geo_em.d01.nc" fi @@ -415,7 +415,7 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..." # These geogrid files need to be moved to more permanent locations. # if [ "${MACHINE}" = "HERA" ]; then - geogrid_file_input_grid="/scratch2/BMC/det/beck/FV3-SAR/geo_em.d01.nc_RAPX" + geogrid_file_input_grid="/scratch2/BMC/det/beck/FV3-LAM/geo_em.d01.nc_RAPX" elif [ "${MACHINE}" = "JET" ]; then geogrid_file_input_grid="/misc/whome/rtrr/HRRR/static/WPS/geo_em.d01.nc" fi @@ -457,7 +457,7 @@ exec_fn="chgres_cube.exe" exec_fp="$EXECDIR/${exec_fn}" if [ ! -f "${exec_fp}" ]; then print_err_msg_exit "\ -The executable (exec_fp) for generating initial conditions on the FV3SAR +The executable (exec_fp) for generating initial conditions on the FV3-LAM native grid does not exist: exec_fp = \"${exec_fp}\" Please ensure that you've built this executable." @@ -508,7 +508,7 @@ fi # config.C768.nest.atm.theia.nml:23: tracers_input="sphum","liq_wat","o3mr","ice_wat","rainwat","snowwat","graupel" -# fix_dir_target_grid="${BASEDIR}/JP_grid_HRRR_like_fix_files_chgres_cube" +# fix_dir_target_grid="${BASEDIR}/ESG_grid_HRRR_like_fix_files_chgres_cube" # base_install_dir="${SORCDIR}/chgres_cube.fd" # @@ -520,9 +520,9 @@ fi # settings=" 'config': { - 'fix_dir_target_grid': ${FIXsar}, - 'mosaic_file_target_grid': ${FIXsar}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc, - 'orog_dir_target_grid': ${FIXsar}, + 'fix_dir_target_grid': ${FIXLAM}, + 'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc, + 'orog_dir_target_grid': ${FIXLAM}, 'orog_files_target_grid': ${CRES}${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc, 'vcoord_file_target_grid': ${FIXam}/global_hyblev.l65.txt, 'mosaic_file_input_grid': '', @@ -587,7 +587,7 @@ $settings" ${APRUN} ${exec_fp} || \ print_err_msg_exit "\ Call to executable (exec_fp) to generate surface and initial conditions -(ICs) files for the FV3SAR failed: +(ICs) files for the FV3-LAM failed: exec_fp = \"${exec_fp}\" The external model from which the ICs files are to be generated is: EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\" diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh index d9a837439a..c598d2d0ab 100755 --- a/scripts/exregional_make_lbcs.sh +++ b/scripts/exregional_make_lbcs.sh @@ -369,7 +369,7 @@ exec_fn="chgres_cube.exe" exec_fp="$EXECDIR/${exec_fn}" if [ ! -f "${exec_fp}" ]; then print_err_msg_exit "\ -The executable (exec_fp) for generating initial conditions on the FV3SAR +The executable (exec_fp) for generating initial conditions on the FV3-LAM native grid does not exist: exec_fp = \"${exec_fp}\" Please ensure that you've built this executable." @@ -378,7 +378,7 @@ fi #----------------------------------------------------------------------- # # Loop through the LBC update times and run chgres for each such time to -# obtain an LBC file for each that can be used as input to the FV3SAR. +# obtain an LBC file for each that can be used as input to the FV3-LAM. # #----------------------------------------------------------------------- # @@ -450,9 +450,9 @@ list file has not specified for this external model: # settings=" 'config': { - 'fix_dir_target_grid': ${FIXsar}, - 'mosaic_file_target_grid': ${FIXsar}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc, - 'orog_dir_target_grid': ${FIXsar}, + 'fix_dir_target_grid': ${FIXLAM}, + 'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc, + 'orog_dir_target_grid': ${FIXLAM}, 'orog_files_target_grid': ${CRES}${DOT_OR_USCORE}oro_data.tile7.halo${NH4}.nc, 'vcoord_file_target_grid': ${FIXam}/global_hyblev.l65.txt, 'mosaic_file_input_grid': '', @@ -510,7 +510,7 @@ $settings" ${APRUN} ${exec_fp} || \ print_err_msg_exit "\ Call to executable (exec_fp) to generate lateral boundary conditions (LBCs) -file for the FV3SAR for forecast hour fhr failed: +file for the FV3-LAM for forecast hour fhr failed: exec_fp = \"${exec_fp}\" fhr = \"$fhr\" The external model from which the LBCs files are to be generated is: @@ -521,11 +521,11 @@ located in the following directory: # # Move LBCs file for the current lateral boundary update time to the LBCs # work directory. Note that we rename the file by including in its name -# the forecast hour of the FV3SAR (which is not necessarily the same as +# the forecast hour of the FV3-LAM (which is not necessarily the same as # that of the external model since their start times may be offset). # - fcst_hhh_FV3SAR=$( printf "%03d" "${LBC_SPEC_FCST_HRS[$i]}" ) - mv_vrfy gfs_bndy.nc ${lbcs_dir}/gfs_bndy.tile7.${fcst_hhh_FV3SAR}.nc + fcst_hhh_FV3LAM=$( printf "%03d" "${LBC_SPEC_FCST_HRS[$i]}" ) + mv_vrfy gfs_bndy.nc ${lbcs_dir}/gfs_bndy.tile7.${fcst_hhh_FV3LAM}.nc done # diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh index 8f7c1d0740..c3ea845187 100755 --- a/scripts/exregional_make_orog.sh +++ b/scripts/exregional_make_orog.sh @@ -219,10 +219,10 @@ cp_vrfy ${TOPO_DIR}/gmted2010.30sec.int fort.235 #----------------------------------------------------------------------- # mosaic_fn="${CRES}${DOT_OR_USCORE}mosaic.halo${NHW}.nc" -mosaic_fp="$FIXsar/${mosaic_fn}" +mosaic_fp="$FIXLAM/${mosaic_fn}" grid_fn=$( get_charvar_from_netcdf "${mosaic_fp}" "gridfiles" ) -grid_fp="${FIXsar}/${grid_fn}" +grid_fp="${FIXLAM}/${grid_fn}" # #----------------------------------------------------------------------- # @@ -300,7 +300,7 @@ case $MACHINE in ${ufs_utils_ushdir}/${orog_gen_scr} \ $res \ ${TILE_RGNL} \ -${FIXsar} \ +${FIXLAM} \ ${raw_dir} \ ${UFS_UTILS_DIR} \ ${TOPO_DIR} \ @@ -348,7 +348,7 @@ Orography file generation complete." #----------------------------------------------------------------------- # # Note that the orography filtering code assumes that the regional grid -# is a GFDLgrid type of grid; it is not designed to handle JPgrid type +# is a GFDLgrid type of grid; it is not designed to handle ESGgrid type # regional grids. If the flag "regional" in the orography filtering # namelist file is set to .TRUE. (which it always is will be here; see # below), then filtering code will first calculate a resolution (i.e. @@ -370,7 +370,7 @@ Orography file generation complete." # resolution of res_regional. These interpolated/extrapolated values are # then used to perform the orography filtering. # -# The above approach works for a GFDLgrid type of grid. To handle JPgrid +# The above approach works for a GFDLgrid type of grid. To handle ESGgrid # type grids, we set res in the namelist to the orography filtering code # the equivalent global uniform cubed-sphere resolution of the regional # grid, we set stretch_fac to 1 (since the equivalent resolution assumes @@ -398,7 +398,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then # stretch_fac="${GFDLgrid_STRETCH_FAC}" refine_ratio="${GFDLgrid_REFINE_RATIO}" -elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then +elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then res="${CRES:1}" # stretch_fac="${STRETCH_FAC}" diff --git a/scripts/exregional_make_sfc_climo.sh b/scripts/exregional_make_sfc_climo.sh index 938ede5e9d..c581f040a9 100755 --- a/scripts/exregional_make_sfc_climo.sh +++ b/scripts/exregional_make_sfc_climo.sh @@ -110,8 +110,8 @@ input_slope_type_file="${SFC_CLIMO_INPUT_DIR}/slope_type.1.0.nc" input_soil_type_file="${SFC_CLIMO_INPUT_DIR}/soil_type.statsgo.0.05.nc" input_vegetation_type_file="${SFC_CLIMO_INPUT_DIR}/vegetation_type.igbp.0.05.nc" input_vegetation_greenness_file="${SFC_CLIMO_INPUT_DIR}/vegetation_greenness.0.144.nc" -mosaic_file_mdl="${FIXsar}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc" -orog_dir_mdl="${FIXsar}" +mosaic_file_mdl="${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc" +orog_dir_mdl="${FIXLAM}" orog_files_mdl=${CRES}${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc halo=${NH4} maximum_snow_albedo_method="bilinear" diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index 3d6531877d..56b98624be 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -166,7 +166,7 @@ Creating links in the INPUT subdirectory of the current run directory to the grid and (filtered) orography files ..." -# Create links to fix files in the FIXsar directory. +# Create links to fix files in the FIXLAM directory. cd_vrfy ${run_dir}/INPUT @@ -177,8 +177,8 @@ if [ "${RUN_TASK_MAKE_GRID}" = "TRUE" ]; then fi # Symlink to mosaic file with a completely different name. -#target="${FIXsar}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc" # Should this point to this halo4 file or a halo3 file??? -target="${FIXsar}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH3}.nc" # Should this point to this halo4 file or a halo3 file??? +#target="${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH4}.nc" # Should this point to this halo4 file or a halo3 file??? +target="${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo${NH3}.nc" # Should this point to this halo4 file or a halo3 file??? symlink="grid_spec.nc" if [ -f "${target}" ]; then ln_vrfy -sf ${relative_or_null} $target $symlink @@ -189,7 +189,7 @@ Cannot create symlink because target does not exist: fi ## Symlink to halo-3 grid file with "halo3" stripped from name. -#target="${FIXsar}/${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH3}.nc" +#target="${FIXLAM}/${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH3}.nc" #if [ "${RUN_TASK_MAKE_SFC_CLIMO}" = "TRUE" ] && \ # [ "${GRID_GEN_METHOD}" = "GFDLgrid" ] && \ # [ "${GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES}" = "FALSE" ]; then @@ -202,7 +202,7 @@ fi mosaic_fn="grid_spec.nc" grid_fn=$( get_charvar_from_netcdf "${mosaic_fn}" "gridfiles" ) -target="${FIXsar}/${grid_fn}" +target="${FIXLAM}/${grid_fn}" symlink="${grid_fn}" if [ -f "${target}" ]; then ln_vrfy -sf ${relative_or_null} $target $symlink @@ -224,7 +224,7 @@ fi # Note that even though the message says "Stopped", the task still con- # sumes core-hours. # -target="${FIXsar}/${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH4}.nc" +target="${FIXLAM}/${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH4}.nc" symlink="grid.tile${TILE_RGNL}.halo${NH4}.nc" if [ -f "${target}" ]; then ln_vrfy -sf ${relative_or_null} $target $symlink @@ -242,7 +242,7 @@ if [ "${RUN_TASK_MAKE_OROG}" = "TRUE" ]; then fi # Symlink to halo-0 orography file with "${CRES}_" and "halo0" stripped from name. -target="${FIXsar}/${CRES}${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" +target="${FIXLAM}/${CRES}${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH0}.nc" symlink="oro_data.nc" if [ -f "${target}" ]; then ln_vrfy -sf ${relative_or_null} $target $symlink @@ -265,7 +265,7 @@ fi # Note that even though the message says "Stopped", the task still con- # sumes core-hours. # -target="${FIXsar}/${CRES}${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" +target="${FIXLAM}/${CRES}${DOT_OR_USCORE}oro_data.tile${TILE_RGNL}.halo${NH4}.nc" symlink="oro_data.tile${TILE_RGNL}.halo${NH4}.nc" if [ -f "${target}" ]; then ln_vrfy -sf ${relative_or_null} $target $symlink @@ -465,7 +465,7 @@ export OMP_STACKSIZE=1024m # #----------------------------------------------------------------------- # -# Run the FV3SAR model. Note that we have to launch the forecast from +# Run the FV3-LAM model. Note that we have to launch the forecast from # the current cycle's directory because the FV3 executable will look for # input files in the current directory. Since those files have been # staged in the cycle directory, the current directory must be the cycle @@ -474,7 +474,7 @@ export OMP_STACKSIZE=1024m #----------------------------------------------------------------------- # $APRUN ${FV3_EXEC_FP} || print_err_msg_exit "\ -Call to executable to run FV3SAR forecast returned with nonzero exit +Call to executable to run FV3-LAM forecast returned with nonzero exit code." # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_post.sh b/scripts/exregional_run_post.sh index 36992736cb..2768e56bdd 100755 --- a/scripts/exregional_run_post.sh +++ b/scripts/exregional_run_post.sh @@ -143,9 +143,9 @@ esac #----------------------------------------------------------------------- # rm_vrfy -f fort.* -cp_vrfy $FIXupp/nam_micro_lookup.dat ./eta_micro_lookup.dat -cp_vrfy $FIXupp/postxconfig-NT-fv3sar.txt ./postxconfig-NT.txt -cp_vrfy $FIXupp/params_grib2_tbl_new ./params_grib2_tbl_new +cp_vrfy ${EMC_POST_DIR}/parm/nam_micro_lookup.dat ./eta_micro_lookup.dat +cp_vrfy ${EMC_POST_DIR}/parm/postxconfig-NT-fv3sar.txt ./postxconfig-NT.txt +cp_vrfy ${EMC_POST_DIR}/parm/params_grib2_tbl_new ./params_grib2_tbl_new cp_vrfy ${EXECDIR}/ncep_post . # #----------------------------------------------------------------------- @@ -206,29 +206,6 @@ zero exit code." # #----------------------------------------------------------------------- # -if [ -n "${PREDEF_GRID_NAME}" ]; then - - grid_name="${PREDEF_GRID_NAME}" - -else - - grid_name="${GRID_GEN_METHOD}" - - if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then - stretch_str="S$( printf "%s" "${STRETCH_FAC}" | sed "s|\.|p|" )" - refine_str="RR${GFDLgrid_REFINE_RATIO}" - grid_name="${grid_name}_${CRES}_${stretch_str}_${refine_str}" - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then - nx_str="NX$( printf "%s" "$NX" | sed "s|\.|p|" )" - ny_str="NY$( printf "%s" "$NY" | sed "s|\.|p|" )" - JPgrid_alpha_param_str="A"$( printf "%s" "${JPgrid_ALPHA_PARAM}" | \ - sed "s|-|mns|" | sed "s|\.|p|" ) - JPgrid_kappa_param_str="K"$( printf "%s" "${JPgrid_KAPPA_PARAM}" | \ - sed "s|-|mns|" | sed "s|\.|p|" ) - grid_name="${grid_name}_${nx_str}_${ny_str}_${JPgrid_alpha_param_str}_${JPgrid_kappa_param_str}" - fi - -fi mv_vrfy BGDAWP.GrbF${fhr} ${postprd_dir}/RRFS.t${cyc}z.bgdawp${fhr}.${tmmark} mv_vrfy BGRD3D.GrbF${fhr} ${postprd_dir}/RRFS.t${cyc}z.bgrd3d${fhr}.${tmmark} diff --git a/tests/baseline_configs/config.GSD_RAP13km.sh b/tests/baseline_configs/config.GSD_RAP13km.sh index ae1616671a..18185f0c22 100644 --- a/tests/baseline_configs/config.GSD_RAP13km.sh +++ b/tests/baseline_configs/config.GSD_RAP13km.sh @@ -1,27 +1,27 @@ # -# MACHINE will be set by the workflow launch script (launch_FV3SAR_- +# MACHINE will be set by the workflow launch script (launch_FV3LAM_- # wflow.sh) to value passed in as an argument to that script. # MACHINE="" # -# ACCOUNT will be set by the workflow launch script (launch_FV3SAR_- +# ACCOUNT will be set by the workflow launch script (launch_FV3LAM_- # wflow.sh) to value passed in as an argument to that script. # ACCOUNT="" # -# EXPT_SUBDIR will be set by the workflow launch script (launch_FV3SAR_- +# EXPT_SUBDIR will be set by the workflow launch script (launch_FV3LAM_- # wflow.sh) to a value obtained from the name of this file. # EXPT_SUBDIR="" # # USE_CRON_TO_RELAUNCH may be reset by the workflow launch script -# (launch_FV3SAR_wflow.sh) to value passed in as an argument to that +# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that # script, but in case it is not, we give it a default value here. # USE_CRON_TO_RELAUNCH="TRUE" # # CRON_RELAUNCH_INTVL_MNTS may be reset by the workflow launch script -# (launch_FV3SAR_wflow.sh) to value passed in as an argument to that +# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that # script, but in case it is not, we give it a default value here. # CRON_RELAUNCH_INTVL_MNTS="02" @@ -37,7 +37,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_RAP13km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GSD_v0" diff --git a/tests/baseline_configs/config.community_ensemble_008mems.sh b/tests/baseline_configs/config.community_ensemble_008mems.sh index 309495631e..71063ebdaa 100644 --- a/tests/baseline_configs/config.community_ensemble_008mems.sh +++ b/tests/baseline_configs/config.community_ensemble_008mems.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" diff --git a/tests/baseline_configs/config.community_ensemble_2mems.sh b/tests/baseline_configs/config.community_ensemble_2mems.sh index 80965edb0a..09e1453ac8 100644 --- a/tests/baseline_configs/config.community_ensemble_2mems.sh +++ b/tests/baseline_configs/config.community_ensemble_2mems.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" diff --git a/tests/baseline_configs/config.nco_conus.sh b/tests/baseline_configs/config.nco_conus.sh index 9da21f187e..4237a14f09 100644 --- a/tests/baseline_configs/config.nco_conus.sh +++ b/tests/baseline_configs/config.nco_conus.sh @@ -111,15 +111,15 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" # # In NCO mode, the user must manually (e.g. after doing the build step) -# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar +# create the symlink "${FIXrrfs}/fix_lam" that points to EMC's FIXLAM # directory on the machine. For example, on hera, the symlink's target # needs to be # # /scratch2/NCEPDEV/fv3-cam/emc.campara/fix_fv3cam/fix_sar # -# The experiment generation script will then set FIXsar to +# The experiment generation script will then set FIXLAM to # -# FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" +# FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}" # # where EMC_GRID_NAME has the value set above. # diff --git a/tests/baseline_configs/config.nco_conus_c96.sh b/tests/baseline_configs/config.nco_conus_c96.sh index ba07895a80..1840c3b16c 100644 --- a/tests/baseline_configs/config.nco_conus_c96.sh +++ b/tests/baseline_configs/config.nco_conus_c96.sh @@ -111,15 +111,15 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" # # In NCO mode, the user must manually (e.g. after doing the build step) -# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar +# create the symlink "${FIXrrfs}/fix_lam" that points to EMC's FIXLAM # directory on the machine. For example, on hera, the symlink's target # needs to be # # /scratch2/NCEPDEV/fv3-cam/emc.campara/fix_fv3cam/fix_sar # -# The experiment generation script will then set FIXsar to +# The experiment generation script will then set FIXLAM to # -# FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" +# FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}" # # where EMC_GRID_NAME has the value set above. # diff --git a/tests/baseline_configs/config.nco_ensemble.sh b/tests/baseline_configs/config.nco_ensemble.sh index 9dc1472227..a6f65c7dba 100644 --- a/tests/baseline_configs/config.nco_ensemble.sh +++ b/tests/baseline_configs/config.nco_ensemble.sh @@ -114,15 +114,15 @@ NUM_ENS_MEMBERS="2" # # In NCO mode, the user must manually (e.g. after doing the build step) -# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar +# create the symlink "${FIXrrfs}/fix_lam" that points to EMC's FIXLAM # directory on the machine. For example, on hera, the symlink's target # needs to be # # /scratch2/NCEPDEV/fv3-cam/emc.campara/fix_fv3cam/fix_sar # -# The experiment generation script will then set FIXsar to +# The experiment generation script will then set FIXLAM to # -# FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" +# FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}" # # where EMC_GRID_NAME has the value set above. # diff --git a/tests/baseline_configs/config.new_JPgrid.sh b/tests/baseline_configs/config.new_ESGgrid.sh similarity index 68% rename from tests/baseline_configs/config.new_JPgrid.sh rename to tests/baseline_configs/config.new_ESGgrid.sh index c1fc566cd3..1aa5db8a2e 100644 --- a/tests/baseline_configs/config.new_JPgrid.sh +++ b/tests/baseline_configs/config.new_ESGgrid.sh @@ -1,27 +1,27 @@ # -# MACHINE will be set by the workflow launch script (launch_FV3SAR_- +# MACHINE will be set by the workflow launch script (launch_FV3LAM_- # wflow.sh) to value passed in as an argument to that script. # MACHINE="" # -# ACCOUNT will be set by the workflow launch script (launch_FV3SAR_- +# ACCOUNT will be set by the workflow launch script (launch_FV3LAM_- # wflow.sh) to value passed in as an argument to that script. # ACCOUNT="" # -# EXPT_SUBDIR will be set by the workflow launch script (launch_FV3SAR_- +# EXPT_SUBDIR will be set by the workflow launch script (launch_FV3LAM_- # wflow.sh) to a value obtained from the name of this file. # EXPT_SUBDIR="" # # USE_CRON_TO_RELAUNCH may be reset by the workflow launch script -# (launch_FV3SAR_wflow.sh) to value passed in as an argument to that +# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that # script, but in case it is not, we give it a default value here. # USE_CRON_TO_RELAUNCH="TRUE" # # CRON_RELAUNCH_INTVL_MNTS may be reset by the workflow launch script -# (launch_FV3SAR_wflow.sh) to value passed in as an argument to that +# (launch_FV3LAM_wflow.sh) to value passed in as an argument to that # script, but in case it is not, we give it a default value here. # CRON_RELAUNCH_INTVL_MNTS="02" @@ -36,18 +36,18 @@ VERBOSE="TRUE" RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" -JPgrid_LON_CTR=-97.5 -JPgrid_LAT_CTR=41.25 +ESGgrid_LON_CTR=-97.5 +ESGgrid_LAT_CTR=41.25 -JPgrid_DELX="25000.0" -JPgrid_DELY="25000.0" +ESGgrid_DELX="25000.0" +ESGgrid_DELY="25000.0" -JPgrid_NX=216 -JPgrid_NY=156 +ESGgrid_NX=216 +ESGgrid_NY=156 -JPgrid_WIDE_HALO_WIDTH=6 +ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="40" @@ -59,16 +59,16 @@ if [ "$QUILTING" = "TRUE" ]; then WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group=$(( 1*LAYOUT_Y )) WRTCMP_output_grid="lambert_conformal" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" WRTCMP_nx="200" WRTCMP_ny="150" WRTCMP_lon_lwr_left="-122.21414225" WRTCMP_lat_lwr_left="22.41403305" - WRTCMP_dx="${JPgrid_DELX}" - WRTCMP_dy="${JPgrid_DELY}" + WRTCMP_dx="${ESGgrid_DELX}" + WRTCMP_dy="${ESGgrid_DELY}" fi USE_CCPP="TRUE" diff --git a/tests/baseline_configs/config.regional_001.sh b/tests/baseline_configs/config.regional_001.sh index 1b0ee39161..6a8f6655a6 100644 --- a/tests/baseline_configs/config.regional_001.sh +++ b/tests/baseline_configs/config.regional_001.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" diff --git a/tests/baseline_configs/config.regional_002.sh b/tests/baseline_configs/config.regional_002.sh index 2521ccade4..80f7f895ae 100644 --- a/tests/baseline_configs/config.regional_002.sh +++ b/tests/baseline_configs/config.regional_002.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" diff --git a/tests/baseline_configs/config.regional_003.sh b/tests/baseline_configs/config.regional_003.sh index c2cb036d25..d0fb807d03 100644 --- a/tests/baseline_configs/config.regional_003.sh +++ b/tests/baseline_configs/config.regional_003.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GSD_v0" diff --git a/tests/baseline_configs/config.regional_004.sh b/tests/baseline_configs/config.regional_004.sh index e83a70dcaf..7f19f0d178 100644 --- a/tests/baseline_configs/config.regional_004.sh +++ b/tests/baseline_configs/config.regional_004.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GSD_SAR" diff --git a/tests/baseline_configs/config.regional_005.sh b/tests/baseline_configs/config.regional_005.sh index 9662e34714..bfd9258858 100644 --- a/tests/baseline_configs/config.regional_005.sh +++ b/tests/baseline_configs/config.regional_005.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR_AK_50km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GSD_SAR" diff --git a/tests/baseline_configs/config.regional_006.sh b/tests/baseline_configs/config.regional_006.sh index 9ad8eb981a..f5a0aa25b8 100644 --- a/tests/baseline_configs/config.regional_006.sh +++ b/tests/baseline_configs/config.regional_006.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" @@ -42,13 +42,13 @@ EXTRN_MDL_NAME_ICS="FV3GFS" EXTRN_MDL_NAME_LBCS="FV3GFS" RUN_TASK_MAKE_GRID="FALSE" -GRID_DIR="/scratch2/BMC/det/FV3SAR_pregen/grid/GSD_HRRR25km" +GRID_DIR="/scratch2/BMC/det/FV3LAM_pregen/grid/GSD_HRRR25km" RUN_TASK_MAKE_OROG="FALSE" -OROG_DIR="/scratch2/BMC/det/FV3SAR_pregen/orog/GSD_HRRR25km" +OROG_DIR="/scratch2/BMC/det/FV3LAM_pregen/orog/GSD_HRRR25km" RUN_TASK_MAKE_SFC_CLIMO="FALSE" -SFC_CLIMO_DIR="/scratch2/BMC/det/FV3SAR_pregen/sfc_climo/GSD_HRRR25km" +SFC_CLIMO_DIR="/scratch2/BMC/det/FV3LAM_pregen/sfc_climo/GSD_HRRR25km" #On Jet #GRID_DIR="" diff --git a/tests/baseline_configs/config.regional_009.sh b/tests/baseline_configs/config.regional_009.sh index 935039f601..2fc79bfa28 100644 --- a/tests/baseline_configs/config.regional_009.sh +++ b/tests/baseline_configs/config.regional_009.sh @@ -110,15 +110,15 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" # # In NCO mode, the user must manually (e.g. after doing the build step) -# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar +# create the symlink "${FIXrrfs}/fix_lam" that points to EMC's FIXLAM # directory on the machine. For example, on hera, the symlink's target # needs to be # # /scratch2/NCEPDEV/fv3-cam/emc.campara/fix_fv3cam/fix_sar # -# The experiment generation script will then set FIXsar to +# The experiment generation script will then set FIXLAM to # -# FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" +# FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}" # # where EMC_GRID_NAME has the value set above. # diff --git a/tests/baseline_configs/config.regional_010.sh b/tests/baseline_configs/config.regional_010.sh index 4a4c7bade3..d8898cb04a 100644 --- a/tests/baseline_configs/config.regional_010.sh +++ b/tests/baseline_configs/config.regional_010.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_CPT_v0" diff --git a/tests/baseline_configs/config.regional_011.sh b/tests/baseline_configs/config.regional_011.sh index 4a8c384623..9f0393f26c 100644 --- a/tests/baseline_configs/config.regional_011.sh +++ b/tests/baseline_configs/config.regional_011.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_v15p2" diff --git a/tests/baseline_configs/config.regional_012.sh b/tests/baseline_configs/config.regional_012.sh index ac1b0a68d2..f2286353e3 100644 --- a/tests/baseline_configs/config.regional_012.sh +++ b/tests/baseline_configs/config.regional_012.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_v16beta" diff --git a/tests/baseline_configs/config.regional_013.sh b/tests/baseline_configs/config.regional_013.sh index 87016c739a..30cdca248a 100644 --- a/tests/baseline_configs/config.regional_013.sh +++ b/tests/baseline_configs/config.regional_013.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GSD_SAR_v1" diff --git a/tests/baseline_configs/config.regional_014.sh b/tests/baseline_configs/config.regional_014.sh index c9829016af..c65e62bd44 100644 --- a/tests/baseline_configs/config.regional_014.sh +++ b/tests/baseline_configs/config.regional_014.sh @@ -28,7 +28,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" diff --git a/tests/baseline_configs/config.regional_016.sh b/tests/baseline_configs/config.regional_016.sh index e03a741fbe..df69233a85 100644 --- a/tests/baseline_configs/config.regional_016.sh +++ b/tests/baseline_configs/config.regional_016.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_RRFS_v0" diff --git a/tests/baseline_configs/config.user_staged_extrn_files.sh b/tests/baseline_configs/config.user_staged_extrn_files.sh index cd6669f003..7eb170f370 100644 --- a/tests/baseline_configs/config.user_staged_extrn_files.sh +++ b/tests/baseline_configs/config.user_staged_extrn_files.sh @@ -27,7 +27,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt index b8b7f9fefd..8d40475ee7 100644 --- a/tests/baselines_list.txt +++ b/tests/baselines_list.txt @@ -4,7 +4,7 @@ community_ensemble_2mems nco_conus nco_conus_c96 nco_ensemble -new_JPgrid +new_ESGgrid regional_001 regional_002 regional_003 diff --git a/tests/run_experiments.sh b/tests/run_experiments.sh index 2e3cdfdb80..c3d22e2373 100755 --- a/tests/run_experiments.sh +++ b/tests/run_experiments.sh @@ -449,7 +449,7 @@ fi # #----------------------------------------------------------------------- # - $ushdir/generate_FV3SAR_wflow.sh || \ + $ushdir/generate_FV3LAM_wflow.sh || \ print_err_msg_exit "\ Could not generate an experiment/workflow for the test specified by expt_name: diff --git a/ush/NCL/NCL_ICs_BCs/generate_ICs_BCs.sh b/ush/NCL/NCL_ICs_BCs/generate_ICs_BCs.sh index c7c07fa412..fd6a08fd79 100755 --- a/ush/NCL/NCL_ICs_BCs/generate_ICs_BCs.sh +++ b/ush/NCL/NCL_ICs_BCs/generate_ICs_BCs.sh @@ -20,8 +20,8 @@ BC_interval_hrs="3" plot_RAP_fields="True" #plot_RAP_fields="False" -plot_SARFV3_fields="True" -#plot_SARFV3_fields="False" +plot_FV3LAM_fields="True" +#plot_FV3LAM_fields="False" #grid_dir="/scratch3/BMC/det/beck/FV3-CAM/work.C384r0p7n3_regional_RAP/INPUT" #grid_dir="/scratch3/BMC/fim/Gerard.Ketefian/regional_FV3_EMC_visit_20180509/work_FV3_regional_C96_2018032900/INPUT" @@ -48,37 +48,37 @@ ncl -n generate_RAP_based_ICs_BCs.ncl \ fcst_len_hrs=${fcst_len_hrs} \ BC_interval_hrs=${BC_interval_hrs} \ plot_RAP_fields=${plot_RAP_fields} \ - plot_SARFV3_fields=${plot_SARFV3_fields} \ + plot_FV3LAM_fields=${plot_FV3LAM_fields} \ 'regions=[/ [/ "GLOBE", (/-180, 180, -90, 90/), False, False /], \ - [/ "SARFV3", (/-140, -60, 20, 55/), False, False /], \ - [/ "SARFV3NW", (/-145, -135, 50, 60/), True, True /], \ - [/ "SARFV3SE", (/ -75, -70, 20, 25/), True, False /], \ + [/ "FV3LAM", (/-140, -60, 20, 55/), False, False /], \ + [/ "FV3LAMNW", (/-145, -135, 50, 60/), True, True /], \ + [/ "FV3LAMSE", (/ -75, -70, 20, 25/), True, False /], \ [/ "dummy_list_element_dont_remove" /] \ /]' \ map_proj=\"cyln\" # 'regions=[/ [/ "GLOBE", (/-180, 180, -90, 90/), False, False /], \ -# [/ "SARFV3", (/-140, -60, 20, 55/), False, False /], \ -# [/ "SARFV3NW", (/-135, -130, 45, 50/), True, True /], \ -# [/ "SARFV3SE", (/ -75, -70, 20, 25/), True, False /], \ +# [/ "FV3LAM", (/-140, -60, 20, 55/), False, False /], \ +# [/ "FV3LAMNW", (/-135, -130, 45, 50/), True, True /], \ +# [/ "FV3LAMSE", (/ -75, -70, 20, 25/), True, False /], \ # [/ "dummy_list_element_dont_remove" /] \ # /]' \ -# 'regions=[/ [/ "SARFV3NW", (/-135, -130, 45, 50/), True, True /], \ +# 'regions=[/ [/ "FV3LAMNW", (/-135, -130, 45, 50/), True, True /], \ # [/ "dummy_list_element_dont_remove" /] \ # /]' \ -# 'regions=[/ [/ "SARFV3", (/-140, -60, 20, 55/), False, False /], \ +# 'regions=[/ [/ "FV3LAM", (/-140, -60, 20, 55/), False, False /], \ # [/ "dummy_list_element_dont_remove" /] \ # /]' \ # draw_RAP_grid=False \ -# draw_SARFV3_grid=True \ +# draw_FV3LAM_grid=True \ # plot_subregs=True \ # subreg_names=\(/\"haloAll\",\"haloNW\",\"haloSE\"/\) \ # subreg_coords=\(/\(/-140,-60,20,55/\),\(/-135,-130,45,50/\),\(/-75,-70,20,25/\)/\) \ # subreg_draw_RAP_grid=\(/False,True,False/\) \ -# subreg_draw_SARFV3_grid=\(/False,True,True/\) \ +# subreg_draw_FV3LAM_grid=\(/False,True,True/\) \ # bbb=\[/\[/\"globe\",\(/-140,-60,20,55/\),True,True/\],\[/\"RAP\",\(/-140,-60,20,55/\),True,True/\],\[/\"RAPNW\",\(/-140,-60,20,55/\),False,False/\],\[/\"dummy\"/\]/\] \ # bbb=\[/\[/\"globe\",\(/-140,-60,20,55/\),True,True/\],\ diff --git a/ush/NCL/NCL_ICs_BCs/generate_RAP_based_ICs_BCs.ncl b/ush/NCL/NCL_ICs_BCs/generate_RAP_based_ICs_BCs.ncl index 6e8055f1f1..4e57166850 100644 --- a/ush/NCL/NCL_ICs_BCs/generate_RAP_based_ICs_BCs.ncl +++ b/ush/NCL/NCL_ICs_BCs/generate_RAP_based_ICs_BCs.ncl @@ -14,9 +14,9 @@ load "$NCARG_ROOT/lib/ncarg/nclscripts/contrib/cd_string.ncl" load "pause.ncl" load "strcmp.ncl" -load "interpolate_RAP_to_SARFV3.ncl" +load "interpolate_RAP_to_FV3LAM.ncl" load "read_RAP_grid.ncl" -load "read_FV3SAR_grid_halo.ncl" +load "read_FV3LAM_grid_halo.ncl" load "calc_field_stats.ncl" load "read_RAP_horiz_field.ncl" load "adjust_longitude_range.ncl" @@ -99,7 +99,7 @@ end if ; ********************************************************************** ; * ; Check whether draw_RAP_grid has been specified on the command line. -; If not, set it to False. Do same for draw_SARFV3_grid. +; If not, set it to False. Do same for draw_FV3LAM_grid. ; * ; ********************************************************************** ; @@ -107,8 +107,8 @@ end if draw_RAP_grid = False end if - if (.not. isvar("draw_SARFV3_grid")) then - draw_SARFV3_grid = False + if (.not. isvar("draw_FV3LAM_grid")) then + draw_FV3LAM_grid = False end if ; ; ********************************************************************** @@ -303,10 +303,10 @@ end if region_names = new((/ num_regions /), "string") region_bounds = new((/ num_regions, 4 /), "float") ; region_draw_RAP_grid = new((/ num_regions /), "logical") -; region_draw_SARFV3_grid = new((/ num_regions /), "logical") +; region_draw_FV3LAM_grid = new((/ num_regions /), "logical") draw_grid_by_region = True draw_grid_by_region@RAP = new((/ num_regions /), "logical") - draw_grid_by_region@SARFV3 = new((/ num_regions /), "logical") + draw_grid_by_region@FV3LAM = new((/ num_regions /), "logical") do i=0, num_regions-1 ;print("") @@ -316,9 +316,9 @@ end if region_names(i) = curnt_region[0] region_bounds(i,:) = curnt_region[1] ; region_draw_RAP_grid(i) = curnt_region[2] -; region_draw_SARFV3_grid(i) = curnt_region[3] +; region_draw_FV3LAM_grid(i) = curnt_region[3] draw_grid_by_region@RAP(i) = curnt_region[2] - draw_grid_by_region@SARFV3(i) = curnt_region[3] + draw_grid_by_region@FV3LAM(i) = curnt_region[3] ;pause end do @@ -330,8 +330,8 @@ end if ;;print(region_draw_RAP_grid) ;print(draw_grid_by_region@RAP) ;print("") -;;print(region_draw_SARFV3_grid) -;print(draw_grid_by_region@SARFV3) +;;print(region_draw_FV3LAM_grid) +;print(draw_grid_by_region@FV3LAM) ;pause @@ -397,7 +397,7 @@ print("") print("==============================================================") print("==============================================================") print("") -print("Reading in SARFV3 grid...") +print("Reading in FV3LAM grid...") print("") print("==============================================================") print("==============================================================") @@ -414,24 +414,24 @@ print("") ; nh = 4 nh = 50 -; SARFV3_grid_dir = "/scratch3/BMC/fim/Gerard.Ketefian/regional_FV3_EMC_visit_20180509/fv3gfs/fix/fix_fv3/rgnl_C384_strch_1p8_rfn_5_HRRR" - SARFV3_grid_dir = "/scratch3/BMC/fim/Gerard.Ketefian/regional_FV3_EMC_visit_20180509/work_dirs/rgnl_C384_strch_1p5_rfn_3_descriptive_str/filter_topo" +; FV3LAM_grid_dir = "/scratch3/BMC/fim/Gerard.Ketefian/regional_FV3_EMC_visit_20180509/fv3gfs/fix/fix_fv3/rgnl_C384_strch_1p8_rfn_5_HRRR" + FV3LAM_grid_dir = "/scratch3/BMC/fim/Gerard.Ketefian/regional_FV3_EMC_visit_20180509/work_dirs/rgnl_C384_strch_1p5_rfn_3_descriptive_str/filter_topo" CRES = "C384" - SARFV3_halo4_grid_file = CRES + "_grid.tile7.halo4.nc" - SARFV3_halo4_grid_file_full = SARFV3_grid_dir + "/" + SARFV3_halo4_grid_file + FV3LAM_halo4_grid_file = CRES + "_grid.tile7.halo4.nc" + FV3LAM_halo4_grid_file_full = FV3LAM_grid_dir + "/" + FV3LAM_halo4_grid_file - out := read_FV3SAR_grid_halo(SARFV3_halo4_grid_file_full, nh) + out := read_FV3LAM_grid_halo(FV3LAM_halo4_grid_file_full, nh) -;; num_cells_SARFV3 = out@num_cells_total -; lon_cntrs_by_cell_SARFV3 = out@lon_cntrs_by_cell -; lat_cntrs_by_cell_SARFV3 = out@lat_cntrs_by_cell -; lon_verts_by_cell_SARFV3 = out@lon_verts_by_cell -; lat_verts_by_cell_SARFV3 = out@lat_verts_by_cell +;; num_cells_FV3LAM = out@num_cells_total +; lon_cntrs_by_cell_FV3LAM = out@lon_cntrs_by_cell +; lat_cntrs_by_cell_FV3LAM = out@lat_cntrs_by_cell +; lon_verts_by_cell_FV3LAM = out@lon_verts_by_cell +; lat_verts_by_cell_FV3LAM = out@lat_verts_by_cell - lon_cntrs_by_cell@SARFV3 = out@lon_cntrs_by_cell - lat_cntrs_by_cell@SARFV3 = out@lat_cntrs_by_cell - lon_verts_by_cell@SARFV3 = out@lon_verts_by_cell - lat_verts_by_cell@SARFV3 = out@lat_verts_by_cell + lon_cntrs_by_cell@FV3LAM = out@lon_cntrs_by_cell + lat_cntrs_by_cell@FV3LAM = out@lat_cntrs_by_cell + lon_verts_by_cell@FV3LAM = out@lon_verts_by_cell + lat_verts_by_cell@FV3LAM = out@lat_verts_by_cell @@ -667,7 +667,7 @@ print("") print("==============================================================") print("==============================================================") print("") -print("Interpolating RAP field onto halo of SARFV3 regional domain...") +print("Interpolating RAP field onto halo of FV3LAM regional domain...") print("") print("==============================================================") print("==============================================================") @@ -696,8 +696,8 @@ print("") gen_weights = False src_grid_filename = "src_grid_RAP.nc" - dst_grid_filename = "dst_grid_SARFV3halo" + nh + ".nc" - weights_filename = "weights_RAP_to_SARFV3halo" + nh + ".nc" + dst_grid_filename = "dst_grid_FV3LAMhalo" + nh + ".nc" + weights_filename = "weights_RAP_to_FV3LAMhalo" + nh + ".nc" print("") print("Source grid, destination grid, and weights files are:") @@ -711,13 +711,13 @@ print("") fileexists(dst_grid_filename) .and. \ fileexists(weights_filename)) then print("") - print("Source grid (RAP), destination grid (SARFV3), and " + \ + print("Source grid (RAP), destination grid (FV3LAM), and " + \ "weights files " + char_nl + \ "already exist. Not regenerating these files.") gen_weights = False else print("") - print("Source grid (RAP), destination grid (SARFV3), and/or " + \ + print("Source grid (RAP), destination grid (FV3LAM), and/or " + \ "weights file do " + char_nl + \ "not exist and must be generated.") gen_weights = True @@ -732,7 +732,7 @@ print("") print("") print("gen_weights has been set to True, but the source grid (RAP) " + \ "file, the destination " + char_nl + \ - "grid (SARFV3) file, and/or the weights file does/do not exist:") + "grid (FV3LAM) file, and/or the weights file does/do not exist:") print(" fileexists(src_grid_filename) = " + fileexists(src_grid_filename)) print(" fileexists(dst_grid_filename) = " + fileexists(dst_grid_filename)) print(" fileexists(weights_filename) = " + fileexists(weights_filename)) @@ -744,42 +744,42 @@ print("") ; ********************************************************************** ; * ; Perform interpolation (regridding) of the field on the RAP grid to the -; halo of the SARFV3 grid. +; halo of the FV3LAM grid. ; * ; ********************************************************************** ; -; out := interpolate_RAP_to_SARFV3( \ +; out := interpolate_RAP_to_FV3LAM( \ ; lon_cntrs_by_cell_RAP, lat_cntrs_by_cell_RAP, \ ; lon_verts_by_cell_RAP, lat_verts_by_cell_RAP, \ -; lon_cntrs_by_cell_SARFV3, lat_cntrs_by_cell_SARFV3, \ -; lon_verts_by_cell_SARFV3, lat_verts_by_cell_SARFV3, \ +; lon_cntrs_by_cell_FV3LAM, lat_cntrs_by_cell_FV3LAM, \ +; lon_verts_by_cell_FV3LAM, lat_verts_by_cell_FV3LAM, \ ; field_by_cell_RAP, \ ; gen_weights, \ ; src_grid_filename, dst_grid_filename, weights_filename) - out := interpolate_RAP_to_SARFV3( \ + out := interpolate_RAP_to_FV3LAM( \ lon_cntrs_by_cell@RAP, lat_cntrs_by_cell@RAP, \ lon_verts_by_cell@RAP, lat_verts_by_cell@RAP, \ - lon_cntrs_by_cell@SARFV3, lat_cntrs_by_cell@SARFV3, \ - lon_verts_by_cell@SARFV3, lat_verts_by_cell@SARFV3, \ + lon_cntrs_by_cell@FV3LAM, lat_cntrs_by_cell@FV3LAM, \ + lon_verts_by_cell@FV3LAM, lat_verts_by_cell@FV3LAM, \ field_by_cell@RAP, \ gen_weights, \ src_grid_filename, dst_grid_filename, weights_filename) - field_by_cell@SARFV3 = out@field_by_cell_SARFV3 + field_by_cell@FV3LAM = out@field_by_cell_FV3LAM ; ; ********************************************************************** ; * ; Calculate and print out basic statistics of the regridded field on the -; SARFV3 grid. +; FV3LAM grid. ; * ; ********************************************************************** ; print_field_stats = True out := calc_field_stats( \ - field_by_cell@SARFV3, field_desc, field_units, print_field_stats) -; field_min_SARFV3 = out@field_min -; field_max_SARFV3 = out@field_max + field_by_cell@FV3LAM, field_desc, field_units, print_field_stats) +; field_min_FV3LAM = out@field_min +; field_max_FV3LAM = out@field_max @@ -801,18 +801,18 @@ print("") ; ; ********************************************************************** ; * -; If plot_RAP_fields or plot_SARFV3_fields is set to True, plot the +; If plot_RAP_fields or plot_FV3LAM_fields is set to True, plot the ; * ; ********************************************************************** ; - if (plot_RAP_fields .or. plot_SARFV3_fields) then + if (plot_RAP_fields .or. plot_FV3LAM_fields) then print("") print("") print("==============================================================") print("==============================================================") print("") -print("Plotting RAP and/or (interpolated) SARFV3 fields...") +print("Plotting RAP and/or (interpolated) FV3LAM fields...") print("") print("==============================================================") print("==============================================================") @@ -903,19 +903,19 @@ print("") ; * ; ********************************************************************** ; - if (plot_SARFV3_fields) then + if (plot_FV3LAM_fields) then - model_name = "SARFV3" + model_name = "FV3LAM" out := plot_model_field_generic( \ model_name, \ - lon_cntrs_by_cell@SARFV3, lat_cntrs_by_cell@SARFV3, \ - lon_verts_by_cell@SARFV3, lat_verts_by_cell@SARFV3, \ - field_by_cell@SARFV3, \ + lon_cntrs_by_cell@FV3LAM, lat_cntrs_by_cell@FV3LAM, \ + lon_verts_by_cell@FV3LAM, lat_verts_by_cell@FV3LAM, \ + field_by_cell@FV3LAM, \ field_name, field_desc, field_units, \ func_t, func_z, \ fcst_hr, k, \ - draw_grid_by_region@SARFV3(s), \ + draw_grid_by_region@FV3LAM(s), \ plot_options) end if diff --git a/ush/NCL/NCL_ICs_BCs/interpolate_RAP_to_SARFV3.ncl b/ush/NCL/NCL_ICs_BCs/interpolate_RAP_to_FV3LAM.ncl similarity index 82% rename from ush/NCL/NCL_ICs_BCs/interpolate_RAP_to_SARFV3.ncl rename to ush/NCL/NCL_ICs_BCs/interpolate_RAP_to_FV3LAM.ncl index 217aa5a109..c3c4a3d004 100644 --- a/ush/NCL/NCL_ICs_BCs/interpolate_RAP_to_SARFV3.ncl +++ b/ush/NCL/NCL_ICs_BCs/interpolate_RAP_to_FV3LAM.ncl @@ -1,31 +1,31 @@ ; ********************************************************************** ; -; File name: interpolate_RAP_to_SARFV3.ncl +; File name: interpolate_RAP_to_FV3LAM.ncl ; Author: Gerard Ketefian ; ; Description: ; ^^^^^^^^^^^ ; This function interpolates (regrids) a field on the RAP grid to the -; halo of the SARFV3 grid. +; halo of the FV3-LAM grid. ; * ; ********************************************************************** -undef("interpolate_RAP_to_SARFV3") +undef("interpolate_RAP_to_FV3LAM") -function interpolate_RAP_to_SARFV3( \ +function interpolate_RAP_to_FV3LAM( \ lon_cntrs_by_cell_RAP:snumeric, \ lat_cntrs_by_cell_RAP:snumeric, \ lon_verts_by_cell_RAP:snumeric, \ lat_verts_by_cell_RAP:snumeric, \ - lon_cntrs_by_cell_SARFV3:snumeric, \ - lat_cntrs_by_cell_SARFV3:snumeric, \ - lon_verts_by_cell_SARFV3:snumeric, \ - lat_verts_by_cell_SARFV3:snumeric, \ + lon_cntrs_by_cell_FV3LAM:snumeric, \ + lat_cntrs_by_cell_FV3LAM:snumeric, \ + lon_verts_by_cell_FV3LAM:snumeric, \ + lat_verts_by_cell_FV3LAM:snumeric, \ field_by_cell_RAP:snumeric, \ gen_weights:logical, \ src_grid_filename:string, dst_grid_filename:string, weights_filename:string) -local opt, field_by_cell_SARFV3, out +local opt, field_by_cell_FV3LAM, out begin ; @@ -33,9 +33,9 @@ begin ; * ; If gen_weights is set to True, call the function ESMF_regrid(...) to ; generate a set of weights and interpolate the specified field from the -; RAP to the SARFV3 grid. The ESMF_regrid(...) function will also save +; RAP to the FV3-LAM grid. The ESMF_regrid(...) function will also save ; the weights it generates in the specified file (opt@WgtFileName), and -; it will save descriptions of the source (RAP) and destination (SARFV3) +; it will save descriptions of the source (RAP) and destination (FV3-LAM) ; grids in two additional NetCDF files (opt@SrcFileName and opt@ Dst- ; FileName, respectively). ; * @@ -86,11 +86,11 @@ begin ; opt@DstGridType = "unstructured" ; - opt@DstGridLon = lon_cntrs_by_cell_SARFV3 - opt@DstGridLat = lat_cntrs_by_cell_SARFV3 + opt@DstGridLon = lon_cntrs_by_cell_FV3LAM + opt@DstGridLat = lat_cntrs_by_cell_FV3LAM ; - opt@DstGridCornerLon = lon_verts_by_cell_SARFV3 - opt@DstGridCornerLat = lat_verts_by_cell_SARFV3 + opt@DstGridCornerLon = lon_verts_by_cell_FV3LAM + opt@DstGridCornerLat = lat_verts_by_cell_FV3LAM ; ; ********************************************************************** ; * @@ -110,15 +110,15 @@ print("opt@WgtFileName = " + opt@WgtFileName) print("") print("Generating source grid (RAP), destination grid " + \ - "(SARFV3), and weights file and regridding field " + \ - "to destination (SARFV3) grid...") - field_by_cell_SARFV3 = ESMF_regrid(field_by_cell_RAP, opt) + "(FV3-LAM), and weights file and regridding field " + \ + "to destination (FV3-LAM) grid...") + field_by_cell_FV3LAM = ESMF_regrid(field_by_cell_RAP, opt) ; ; ********************************************************************** ; * ; If gen_weights is set to False, call the function ESMF_regrid_with_- ; weights(...) to interpolate the specified field from the RAP to the -; SARFV3 grid using the precomputed weights specified in the file opt@ +; FV3-LAM grid using the precomputed weights specified in the file opt@ ; WgtFileName. ; * ; ********************************************************************** @@ -126,14 +126,14 @@ print("opt@WgtFileName = " + opt@WgtFileName) else print("") - print("Regridding field to destination (SARFV3) grid...") - field_by_cell_SARFV3 \ + print("Regridding field to destination (FV3-LAM) grid...") + field_by_cell_FV3LAM \ = ESMF_regrid_with_weights(field_by_cell_RAP, weights_filename, False) end if print("") -printVarSummary(field_by_cell_SARFV3) +printVarSummary(field_by_cell_FV3LAM) ; ; ********************************************************************** ; * @@ -144,7 +144,7 @@ printVarSummary(field_by_cell_SARFV3) ; ********************************************************************** ; out = True - out@field_by_cell_SARFV3 = field_by_cell_SARFV3 + out@field_by_cell_FV3LAM = field_by_cell_FV3LAM return(out) end diff --git a/ush/NCL/NCL_ICs_BCs/plot_model_field_generic.ncl b/ush/NCL/NCL_ICs_BCs/plot_model_field_generic.ncl index 04743733db..1fe34c0e97 100644 --- a/ush/NCL/NCL_ICs_BCs/plot_model_field_generic.ncl +++ b/ush/NCL/NCL_ICs_BCs/plot_model_field_generic.ncl @@ -164,7 +164,7 @@ begin ; All attributes of the output variable "out" are plotting attributes ; that should be reused for the plot generated by the next call to ; plot_horiz_field(...) (which will plot a regridded version of the -; field above on the SARFV3 grid). For this purpose, here we copy all +; field above on the FV3-LAM grid). For this purpose, here we copy all ; attributes of "out" into the variable plot_options. We will then use ; plot_options as an input arguemnt to plot_horiz_field(...). ; * diff --git a/ush/NCL/NCL_ICs_BCs/read_FV3SAR_grid_halo.ncl b/ush/NCL/NCL_ICs_BCs/read_FV3LAM_grid_halo.ncl similarity index 98% rename from ush/NCL/NCL_ICs_BCs/read_FV3SAR_grid_halo.ncl rename to ush/NCL/NCL_ICs_BCs/read_FV3LAM_grid_halo.ncl index 33c9fef056..e8dd9e92a5 100644 --- a/ush/NCL/NCL_ICs_BCs/read_FV3SAR_grid_halo.ncl +++ b/ush/NCL/NCL_ICs_BCs/read_FV3LAM_grid_halo.ncl @@ -1,12 +1,12 @@ ; ; ********************************************************************** ; -; File name: read_FV3SAR_grid_halo.ncl +; File name: read_FV3LAM_grid_halo.ncl ; Author: Gerard Ketefian ; ; Description: ; ^^^^^^^^^^^ -; This function reads in the coordinates of the FV3SAR regional grid +; This function reads in the coordinates of the FV3-LAM regional grid ; from the specified grid file and extracts from it the coordinates of ; the halo. ; @@ -15,9 +15,9 @@ load "strcmp.ncl" load "adjust_longitude_range.ncl" -undef("read_FV3SAR_grid_halo") +undef("read_FV3LAM_grid_halo") -function read_FV3SAR_grid_halo(grid_file:string, nh:integer) +function read_FV3LAM_grid_halo(grid_file:string, nh:integer) local f_grid, \ two_nx, two_ny, nx, ny, nxp, nyp, \ @@ -60,7 +60,7 @@ begin ; ; ********************************************************************** ; -; Open the FV3SAR grid file containing grid information. +; Open the FV3-LAM grid file containing grid information. ; ; ********************************************************************** ; diff --git a/ush/NCL/check_filevar_existence_dims.ncl b/ush/NCL/check_filevar_existence_dims.ncl index 4d654c1812..b301a2d49c 100644 --- a/ush/NCL/check_filevar_existence_dims.ncl +++ b/ush/NCL/check_filevar_existence_dims.ncl @@ -98,7 +98,7 @@ begin ; ********************************************************************** ; ; Set the dimension names we expect to see in the file(s) from which we -; will read in the FV3SAR field. This depends on the file base name. +; will read in the FV3-LAM field. This depends on the file base name. ; These dimension names will be used to check the consistency of the di- ; mensions of the specified field. ; diff --git a/ush/NCL/find_wrtcmp_grid_params.ncl b/ush/NCL/find_wrtcmp_grid_params.ncl index 149b12f895..c70045d133 100644 --- a/ush/NCL/find_wrtcmp_grid_params.ncl +++ b/ush/NCL/find_wrtcmp_grid_params.ncl @@ -25,7 +25,7 @@ loadscript(lib_location + "strcmp_exact.ncl") load "calc_wrtcmp_grid_params_rotated_latlon.ncl" load "calc_wrtcmp_grid_params_lambert_cnfrml.ncl" -load "read_FV3SAR_grid_native.ncl" +load "read_FV3LAM_grid_native.ncl" begin ; @@ -169,14 +169,14 @@ begin ; ; ********************************************************************** ; -; Read in the native FV3SAR grid. +; Read in the native FV3-LAM grid. ; ; ********************************************************************** ; remove_rgnl_halo = True get_tile_bdies = False - grid_info := read_FV3SAR_grid_native( \ + grid_info := read_FV3LAM_grid_native( \ expt_dir, \ gtype, \ CRES, \ @@ -211,7 +211,7 @@ begin ; output from the grid-read operation above. Then call the function ; that calculates the write-component grid parameters for a lambert- ; conformal grid that is guaranteed to lie completely inside the native -; FV3SAR grid. +; FV3-LAM grid. ; ; ********************************************************************** ; diff --git a/ush/NCL/make_plot_titles.ncl b/ush/NCL/make_plot_titles.ncl index 5bbb8f51d1..2cb3788f2e 100644 --- a/ush/NCL/make_plot_titles.ncl +++ b/ush/NCL/make_plot_titles.ncl @@ -52,7 +52,7 @@ function make_plot_titles( \ local inds_tiles_to_plot_str, fmt_str, vert_indx_str, \ func_code_zoom, \ left_str, right_str, main_str, \ - num_newlines_FV3SAR, num_newlines_RAP, num_newlines_to_add, \ + num_newlines_FV3LAM, num_newlines_RAP, num_newlines_to_add, \ line, field_min_str, field_max_str, \ num_lines, line_lengths, line_length_max, num_pad_spaces_before, \ add_half_horiz_space, vert_offset_one_line, vert_offsets, \ @@ -87,7 +87,7 @@ begin ; ; First, consider the case in which the RAP grid and/or a RAP field is ; displayed in the plot. In this case, the main middle string will be -; blank, the left string will contain the FV3SAR grid and/or field in- +; blank, the left string will contain the FV3-LAM grid and/or field in- ; formation, and the right string will contain the RAP grid and/or field ; information. ; @@ -98,7 +98,7 @@ begin main_str = "" left_str \ - := "~F30~FV3SAR field info:~C~" \ + := "~F30~FV3-LAM field info:~C~" \ + "~F29~" + field_desc + " (" + char_dq + field_name + char_dq + ")" \ + " [" + field_units + "]" @@ -113,7 +113,7 @@ begin if (show_tile_bdies) then left_str = left_str + "~C~" + "Tile boundaries in " + tile_bdy_color end if - num_newlines_FV3SAR \ + num_newlines_FV3LAM \ = dimsizes(str_index_of_substr(left_str, "~C~", 0)) right_str \ @@ -130,7 +130,7 @@ begin ; newlines so that they both have the same number (looks better in the ; plot. ; - num_newlines_to_add = num_newlines_FV3SAR - num_newlines_RAP + num_newlines_to_add = num_newlines_FV3LAM - num_newlines_RAP if (num_newlines_to_add .ge. 1) then right_str = right_str + repeat_str("~C~ ", num_newlines_to_add) ; For some reason, after the last newline (~C~), the spacing isn't quite @@ -212,7 +212,7 @@ begin main_str := new(1, "string") line := field_desc + " (" + char_dq + field_name + char_dq \ - + ") on FV3SAR grid" + + ") on FV3-LAM grid" main_str := array_append_record(main_str, line, 0) main_str := main_str(1:) diff --git a/ush/NCL/plot_FV3SAR_field_native.ncl b/ush/NCL/plot_FV3LAM_field_native.ncl similarity index 94% rename from ush/NCL/plot_FV3SAR_field_native.ncl rename to ush/NCL/plot_FV3LAM_field_native.ncl index db511b9dd0..a28dc77e6e 100644 --- a/ush/NCL/plot_FV3SAR_field_native.ncl +++ b/ush/NCL/plot_FV3LAM_field_native.ncl @@ -18,10 +18,10 @@ ;help = True -expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3SAR_demo_PASPBL_20190725/expt_dirs/test_GSD_HRRR25km" -expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3SAR_demo_PASPBL_20190725/expt_dirs/test_GSD_HRRR13km" -expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3SAR_demo_PASPBL_20190725/expt_dirs/test_GSD_HRRR3km" -expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3SAR_demo_PASPBL_20190725/expt_dirs/test_GSD_HAFSV0.A" +expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3LAM_demo_PASPBL_20190725/expt_dirs/test_GSD_HRRR25km" +expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3LAM_demo_PASPBL_20190725/expt_dirs/test_GSD_HRRR13km" +expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3LAM_demo_PASPBL_20190725/expt_dirs/test_GSD_HRRR3km" +expt_dir = "/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/FV3LAM_demo_PASPBL_20190725/expt_dirs/test_GSD_HAFSV0.A" tile_inds := (/ 1, 7, 4 /) @@ -215,11 +215,11 @@ loadscript(lib_location + "get_rect_grid_bdy.ncl") loadscript(lib_location + "set_cnLevels_lbLabels.ncl") load "process_plot_params.ncl" -load "read_FV3SAR_grid_native.ncl" -load "read_FV3SAR_gridfield_native.ncl" -load "read_FV3SAR_field_native.ncl" -load "read_FV3SAR_grid_wrtcmp.ncl" -load "read_FV3SAR_field_wrtcmp.ncl" +load "read_FV3LAM_grid_native.ncl" +load "read_FV3LAM_gridfield_native.ncl" +load "read_FV3LAM_field_native.ncl" +load "read_FV3LAM_grid_wrtcmp.ncl" +load "read_FV3LAM_field_wrtcmp.ncl" load "read_RAP_grid.ncl" load "read_RAP_field.ncl" load "plot_horiz_field.ncl" @@ -563,7 +563,7 @@ pause ; ; ********************************************************************** ; -; Read in the FV3SAR grid. +; Read in the FV3-LAM grid. ; ; ********************************************************************** ; @@ -576,15 +576,15 @@ pause ; "native", since then it will have the flexibility to plot fields on ; either the native or the wrtcmp grid. -; read_FV3SAR_wrtcmp = True - read_FV3SAR_wrtcmp = False +; read_FV3LAM_wrtcmp = True + read_FV3LAM_wrtcmp = False - if (read_FV3SAR_wrtcmp) then + if (read_FV3LAM_wrtcmp) then - FV3SAR_wrtcmp_fn = expt_dir + "/" + CDATE + "/" + "dynf000.nc" + FV3LAM_wrtcmp_fn = expt_dir + "/" + CDATE + "/" + "dynf000.nc" get_domain_bdy = True - grid_info := read_FV3SAR_grid_wrtcmp( \ - FV3SAR_wrtcmp_fn, \ + grid_info := read_FV3LAM_grid_wrtcmp( \ + FV3LAM_wrtcmp_fn, \ get_domain_bdy) fp_wrtcmp = grid_info@fp @@ -596,11 +596,11 @@ pause lat_verts_unstruc = grid_info@lat_verts_unstruc lon_bdy = grid_info@lon_bdy lat_bdy = grid_info@lat_bdy - coord_data_type_FV3SAR = grid_info@coord_data_type + coord_data_type_FV3LAM = grid_info@coord_data_type else - grid_info := read_FV3SAR_grid_native( \ + grid_info := read_FV3LAM_grid_native( \ expt_dir, \ gtype, \ cres, \ @@ -641,7 +641,7 @@ pause lat_tile_corners_face_midpts_tiles_to_plot \ = grid_info@lat_tile_corners_face_midpts_all_tiles - coord_data_type_FV3SAR = grid_info@coord_data_type + coord_data_type_FV3LAM = grid_info@coord_data_type end if ; @@ -651,8 +651,8 @@ pause ; ; ********************************************************************** ; - lon_bdy_all_bdies := new(1, coord_data_type_FV3SAR) - lat_bdy_all_bdies := new(1, coord_data_type_FV3SAR) + lon_bdy_all_bdies := new(1, coord_data_type_FV3LAM) + lat_bdy_all_bdies := new(1, coord_data_type_FV3LAM) ; ; ********************************************************************** ; @@ -783,33 +783,33 @@ pause ; ********************************************************************** ; ; If the RAP coordinate arrays are not of the same data type as the FV3- -; SAR coordinate arrays, convert the data type of the former to that of +; LAM coordinate arrays, convert the data type of the former to that of ; the latter. ; ; ********************************************************************** ; - if (.not. strcmp_exact(coord_data_type_FV3SAR, coord_data_type_RAP)) then + if (.not. strcmp_exact(coord_data_type_FV3LAM, coord_data_type_RAP)) then lon_cntrs_unstruc_RAP \ - := totype(lon_cntrs_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lon_cntrs_unstruc_RAP, coord_data_type_FV3LAM) lat_cntrs_unstruc_RAP \ - := totype(lat_cntrs_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lat_cntrs_unstruc_RAP, coord_data_type_FV3LAM) lon_verts_unstruc_RAP \ - := totype(lon_verts_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lon_verts_unstruc_RAP, coord_data_type_FV3LAM) lat_verts_unstruc_RAP \ - := totype(lat_verts_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lat_verts_unstruc_RAP, coord_data_type_FV3LAM) end if ; ; ********************************************************************** ; -; Prepend RAP coordinates to the corresponding arrays for the FV3SAR. +; Prepend RAP coordinates to the corresponding arrays for the FV3LAM. ; This is done for plotting convenience. Note that the RAP coordinates ; are prepended insted of appended so that the RAP grid (and any field -; associated with it) is drawn first and the FV3SAR tiles (and any +; associated with it) is drawn first and the FV3LAM tiles (and any ; fields on them) are then drawn on top. ; ; ********************************************************************** @@ -843,33 +843,33 @@ pause ; ********************************************************************** ; ; If the write-component coordinate arrays are not of the same data type -; as the FV3SAR coordinate arrays, convert the data type of the former +; as the FV3LAM coordinate arrays, convert the data type of the former ; to that of the latter. ; ; ********************************************************************** ; - if (.not. strcmp_exact(coord_data_type_FV3SAR, coord_data_type_wrtcmp)) then + if (.not. strcmp_exact(coord_data_type_FV3LAM, coord_data_type_wrtcmp)) then lon_cntrs_unstruc_wrtcmp \ - := totype(lon_cntrs_unstruc_wrtcmp, coord_data_type_FV3SAR) + := totype(lon_cntrs_unstruc_wrtcmp, coord_data_type_FV3LAM) lat_cntrs_unstruc_wrtcmp \ - := totype(lat_cntrs_unstruc_wrtcmp, coord_data_type_FV3SAR) + := totype(lat_cntrs_unstruc_wrtcmp, coord_data_type_FV3LAM) lon_verts_unstruc_wrtcmp \ - := totype(lon_verts_unstruc_wrtcmp, coord_data_type_FV3SAR) + := totype(lon_verts_unstruc_wrtcmp, coord_data_type_FV3LAM) lat_verts_unstruc_wrtcmp \ - := totype(lat_verts_unstruc_wrtcmp, coord_data_type_FV3SAR) + := totype(lat_verts_unstruc_wrtcmp, coord_data_type_FV3LAM) end if ; ; ********************************************************************** ; -; Prepend write-component coordinates to the corresponding arrays for the FV3SAR. +; Prepend write-component coordinates to the corresponding arrays for the FV3LAM. ; This is done for plotting convenience. Note that the write-component coordinates ; are prepended insted of appended so that the write-component grid (and any field -; associated with it) is drawn first and the FV3SAR tiles (and any +; associated with it) is drawn first and the FV3LAM tiles (and any ; fields on them) are then drawn on top. ; ; ********************************************************************** @@ -904,9 +904,9 @@ pause num_bdies_to_plot = num_bdies_to_plot + 1 - if (.not. strcmp_exact(coord_data_type_FV3SAR, coord_data_type_RAP)) then - lon_bdy_RAP := totype(lon_bdy_RAP, coord_data_type_FV3SAR) - lat_bdy_RAP := totype(lat_bdy_RAP, coord_data_type_FV3SAR) + if (.not. strcmp_exact(coord_data_type_FV3LAM, coord_data_type_RAP)) then + lon_bdy_RAP := totype(lon_bdy_RAP, coord_data_type_FV3LAM) + lat_bdy_RAP := totype(lat_bdy_RAP, coord_data_type_FV3LAM) end if lon_bdy_all_bdies \ @@ -929,9 +929,9 @@ pause num_bdies_to_plot = num_bdies_to_plot + 1 - if (.not. strcmp_exact(coord_data_type_FV3SAR, coord_data_type_wrtcmp)) then - lon_bdy_wrtcmp := totype(lon_bdy_wrtcmp, coord_data_type_FV3SAR) - lat_bdy_wrtcmp := totype(lat_bdy_wrtcmp, coord_data_type_FV3SAR) + if (.not. strcmp_exact(coord_data_type_FV3LAM, coord_data_type_wrtcmp)) then + lon_bdy_wrtcmp := totype(lon_bdy_wrtcmp, coord_data_type_FV3LAM) + lat_bdy_wrtcmp := totype(lat_bdy_wrtcmp, coord_data_type_FV3LAM) end if lon_bdy_all_bdies \ @@ -1024,7 +1024,7 @@ pause ; ; ********************************************************************** ; -; Read in the FV3SAR field for the current forecast hour and vertical +; Read in the FV3LAM field for the current forecast hour and vertical ; index. ; ; ********************************************************************** @@ -1032,7 +1032,7 @@ pause if (is_gridfield) then field_info \ - := read_FV3SAR_gridfield_native( \ + := read_FV3LAM_gridfield_native( \ field_names_by_tile, \ file_names_by_tile, \ gtype, inds_tiles_to_plot, \ @@ -1047,7 +1047,7 @@ pause else field_info \ - := read_FV3SAR_field_native( \ + := read_FV3LAM_field_native( \ field_names_by_tile, \ file_names_by_tile, \ gtype, inds_tiles_to_plot, \ @@ -1061,7 +1061,7 @@ pause end if -; fp_field_FV3SAR = field_info@fp ; This would in general be an array or list of file pointers. +; fp_field_FV3LAM = field_info@fp ; This would in general be an array or list of file pointers. field_desc := field_info@field_desc field_units := field_info@field_units nz_by_tile := field_info@nz_by_tile @@ -1071,10 +1071,10 @@ pause field_max_tiles_to_plot := field_info@field_max_by_tile field_median_tiles_to_plot := field_info@field_median_by_tile field_mean_tiles_to_plot := field_info@field_mean_by_tile - field_data_type_FV3SAR := field_info@field_data_type + field_data_type_FV3LAM := field_info@field_data_type ; Not sure why setting field_name to "none" doesn't do this, but do this ; here temporarily to make the field transparent. -;field_unstruc = default_fillvalue(field_data_type_FV3SAR) +;field_unstruc = default_fillvalue(field_data_type_FV3LAM) ; ; ********************************************************************** ; @@ -1124,8 +1124,8 @@ inds_tiles_to_plot_str + " ..." ; ********************************************************************** ; ; Initialize the 1-D unstructured array that will contain the field val- -; ues on all grids (FV3SAR and possibly also RAP) and initialize it to -; the field values on the FV3SAR tile grids. +; ues on all grids (FV3LAM and possibly also RAP) and initialize it to +; the field values on the FV3LAM tile grids. ; ; ********************************************************************** ; @@ -1174,23 +1174,23 @@ inds_tiles_to_plot_str + " ..." ; ; ********************************************************************** ; -; For plotting convenience, we will combine the fields on the FV3SAR andi +; For plotting convenience, we will combine the fields on the FV3LAM andi ; RAP grids into a single array. For this purpose, if necessary we -; first convert the data type of the RAP field to that of the FV3SAR +; first convert the data type of the RAP field to that of the FV3LAM ; field. ; ; ********************************************************************** ; - if (.not. strcmp_exact(field_data_type_FV3SAR, field_data_type_RAP)) then + if (.not. strcmp_exact(field_data_type_FV3LAM, field_data_type_RAP)) then field_unstruc_RAP \ - := totype(field_unstruc_RAP, field_data_type_FV3SAR) + := totype(field_unstruc_RAP, field_data_type_FV3LAM) end if ; ; ********************************************************************** ; ; For plotting convenience, prepend the RAP field to the array contain- -; ing the FV3SAR field. We prepend instead of append so that the RAP -; field is drawn first and the FV3SAR field on the tiles are then drawn +; ing the FV3LAM field. We prepend instead of append so that the RAP +; field is drawn first and the FV3LAM field on the tiles are then drawn ; on top. ; ; ********************************************************************** @@ -1322,7 +1322,7 @@ inds_tiles_to_plot_str + " ..." ; ********************************************************************** ; ; Calculate "nice" contour level values to use for making a color con- -; tour plot of the combined FV3SAR and RAP field. +; tour plot of the combined FV3LAM and RAP field. ; ; ********************************************************************** ; diff --git a/ush/NCL/plot_grid.ncl b/ush/NCL/plot_grid.ncl index 21c056bcf6..6f9a10e2a1 100644 --- a/ush/NCL/plot_grid.ncl +++ b/ush/NCL/plot_grid.ncl @@ -185,10 +185,10 @@ loadscript(lib_location + "get_rect_grid_bdy.ncl") loadscript(lib_location + "set_cnLevels_lbLabels.ncl") load "process_plot_params.ncl" -load "read_FV3SAR_grid_native.ncl" -load "read_FV3SAR_field_native.ncl" -load "read_FV3SAR_grid_wrtcmp.ncl" -load "read_FV3SAR_field_wrtcmp.ncl" +load "read_FV3LAM_grid_native.ncl" +load "read_FV3LAM_field_native.ncl" +load "read_FV3LAM_grid_wrtcmp.ncl" +load "read_FV3LAM_field_wrtcmp.ncl" load "read_RAP_grid.ncl" load "read_RAP_field.ncl" load "plot_horiz_field.ncl" @@ -406,19 +406,19 @@ char_dq + "ncgm" + char_dq + "." + char_nl ; ; ********************************************************************** ; -; Read in the FV3SAR grid. +; Read in the FV3-LAM grid. ; ; ********************************************************************** ; -read_FV3SAR_wrtcmp = True -;read_FV3SAR_wrtcmp = False +read_FV3LAM_wrtcmp = True +;read_FV3LAM_wrtcmp = False -if (read_FV3SAR_wrtcmp) then +if (read_FV3LAM_wrtcmp) then - FV3SAR_wrtcmp_fn = run_dir + "/" + CDATE + "/" + "dynf000.nc" + FV3LAM_wrtcmp_fn = run_dir + "/" + CDATE + "/" + "dynf000.nc" get_domain_bdy = True - grid_info := read_FV3SAR_grid_wrtcmp( \ - FV3SAR_wrtcmp_fn, \ + grid_info := read_FV3LAM_grid_wrtcmp( \ + FV3LAM_wrtcmp_fn, \ get_domain_bdy) fp_wrtcmp = grid_info@fp @@ -430,7 +430,7 @@ if (read_FV3SAR_wrtcmp) then lat_verts_unstruc = grid_info@lat_verts_unstruc lon_bdy = grid_info@lon_bdy lat_bdy = grid_info@lat_bdy - coord_data_type_FV3SAR = grid_info@coord_data_type + coord_data_type_FV3LAM = grid_info@coord_data_type else @@ -438,7 +438,7 @@ else ; or be a requird input that gets processed along with the other ; command linea arguments? - grid_info := read_FV3SAR_grid_native( \ + grid_info := read_FV3LAM_grid_native( \ work_dir, \ gtype, \ cres, \ @@ -479,7 +479,7 @@ else lat_tile_corners_face_midpts_tiles_to_plot \ = grid_info@lat_tile_corners_face_midpts_all_tiles - coord_data_type_FV3SAR = grid_info@coord_data_type + coord_data_type_FV3LAM = grid_info@coord_data_type end if ; @@ -507,7 +507,7 @@ num_vert = dimsizes(vert_inds_to_plot) ; Must set to 0 for write-component files since those each contain output for only one time. -if (read_FV3SAR_wrtcmp) then +if (read_FV3LAM_wrtcmp) then time_inds_to_plot = 0*time_inds_to_plot end if @@ -547,15 +547,15 @@ do n=0, num_fcst_hrs-1 ; ; ********************************************************************** ; -if (read_FV3SAR_wrtcmp) then +if (read_FV3LAM_wrtcmp) then ; ; Set the file name. This depends on the time index/ forecast output hour. ; -; FV3SAR_wrtcmp_fn = run_dir + "/dynf000.nc" -; FV3SAR_wrtcmp_fn = run_dir + "/phyf000.nc" -; FV3SAR_wrtcmp_fn = run_dir + "/phyf" + fcst_hr_str + ".nc" - FV3SAR_wrtcmp_fn = run_dir + "/" + CDATE + "/" + "phyf" + fcst_hr_str + ".nc" +; FV3LAM_wrtcmp_fn = run_dir + "/dynf000.nc" +; FV3LAM_wrtcmp_fn = run_dir + "/phyf000.nc" +; FV3LAM_wrtcmp_fn = run_dir + "/phyf" + fcst_hr_str + ".nc" + FV3LAM_wrtcmp_fn = run_dir + "/" + CDATE + "/" + "phyf" + fcst_hr_str + ".nc" ; ; ********************************************************************** @@ -595,7 +595,7 @@ if (read_FV3SAR_wrtcmp) then ; t_filedim_names = (/ "time" /) var_info := check_filevar_existence_dims( \ - FV3SAR_wrtcmp_fn, \ + FV3LAM_wrtcmp_fn, \ field_name, \ nx, ny, \ vert_inds_to_plot, \ @@ -622,20 +622,20 @@ if (read_FV3SAR_wrtcmp) then ; ; ********************************************************************** ; -; Read the specified field on the FV3SAR write-component grid. +; Read the specified field on the FV3-LAM write-component grid. ; ; ********************************************************************** ; field_info \ - := read_FV3SAR_field_wrtcmp( \ + := read_FV3LAM_field_wrtcmp( \ field_name, \ horiz_dist_units, horiz_area_units, \ - FV3SAR_wrtcmp_fn, \ + FV3LAM_wrtcmp_fn, \ nx, ny, \ vert_indx, time_indx, \ func_xy_only, func_xyz_only, func_xyt_only, func_xyzt_only) - fp_field_FV3SAR = field_info@fp + fp_field_FV3LAM = field_info@fp field_desc = field_info@field_desc field_units = field_info@field_units field_unstruc = field_info@field_unstruc @@ -643,7 +643,7 @@ if (read_FV3SAR_wrtcmp) then field_max = field_info@field_max field_median = field_info@field_median field_mean = field_info@field_mean - field_data_type_FV3SAR = field_info@field_data_type + field_data_type_FV3LAM = field_info@field_data_type plot_title = field_desc + " [" + field_units + "]" print("") @@ -978,7 +978,7 @@ n_tile_prev + " to " + char_nl + \ ; ********************************************************************** ; field_info \ - := read_FV3SAR_field_native( \ + := read_FV3LAM_field_native( \ field_names_by_tile, \ file_names_by_tile, \ gtype, inds_tiles_to_plot, \ @@ -990,7 +990,7 @@ n_tile_prev + " to " + char_nl + \ func_xy_only, func_xyz_only, func_xyt_only, func_xyzt_only, \ average_in_x, average_in_y) -; fp_field_FV3SAR = field_info@fp ; This would in general be an array or list of file pointers. +; fp_field_FV3LAM = field_info@fp ; This would in general be an array or list of file pointers. field_desc = field_info@field_desc field_units = field_info@field_units field_unstruc = field_info@field_all_tiles_unstruc @@ -998,7 +998,7 @@ n_tile_prev + " to " + char_nl + \ field_max_all_tiles = field_info@field_max_all_tiles field_median_all_tiles = field_info@field_median_all_tiles field_mean_all_tiles = field_info@field_mean_all_tiles - field_data_type_FV3SAR = field_info@field_data_type + field_data_type_FV3LAM = field_info@field_data_type plot_title = field_desc + " [" + field_units + "]" print("") @@ -1014,7 +1014,7 @@ n_tile_prev + " to " + char_nl + \ temp := tostring(inds_tiles_to_plot) temp := str_join(temp, ", ") temp := str_concat( (/"[tile(s) ", temp, "]"/) ) - msg := "Calculating statistics of field over all FV3SAR tiles to be plotted " + \ + msg := "Calculating statistics of field over all FV3-LAM tiles to be plotted " + \ temp + " ..." print("") print("" + separator_line) @@ -1029,7 +1029,7 @@ n_tile_prev + " to " + char_nl + \ print("") print("" + msg) - msg := "Done calculating statistics of field over all FV3SAR tiles to be plotted." + msg := "Done calculating statistics of field over all FV3-LAM tiles to be plotted." print("") print("" + msg) print("" + separator_line) @@ -1184,7 +1184,7 @@ end if ; ********************************************************************** ; ; If plot_RAP_field is set to True, combine the coordinate arrays for -; the FV3SAR and the RAP into a single set of arrays for plotting. +; the FV3-LAM and the RAP into a single set of arrays for plotting. ; ; ********************************************************************** ; @@ -1193,45 +1193,45 @@ end if ; ********************************************************************** ; ; If the RAP coordinate arrays are not of the same data type as the FV3- -; SAR coordinate arrays, convert the data type of the former to that of +; LAM coordinate arrays, convert the data type of the former to that of ; the latter. ; ; ********************************************************************** ; - if (.not. strcmp_exact(coord_data_type_FV3SAR, coord_data_type_RAP)) then + if (.not. strcmp_exact(coord_data_type_FV3LAM, coord_data_type_RAP)) then lon_cntrs_unstruc_RAP \ - := totype(lon_cntrs_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lon_cntrs_unstruc_RAP, coord_data_type_FV3LAM) lat_cntrs_unstruc_RAP \ - := totype(lat_cntrs_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lat_cntrs_unstruc_RAP, coord_data_type_FV3LAM) lon_verts_unstruc_RAP \ - := totype(lon_verts_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lon_verts_unstruc_RAP, coord_data_type_FV3LAM) lat_verts_unstruc_RAP \ - := totype(lat_verts_unstruc_RAP, coord_data_type_FV3SAR) + := totype(lat_verts_unstruc_RAP, coord_data_type_FV3LAM) end if ; ; ********************************************************************** ; -; If the RAP field is not of the same data type as the FV3SAR field, +; If the RAP field is not of the same data type as the FV3-LAM field, ; convert the data type of the former to that of the latter. ; ; ********************************************************************** ; - if (.not. strcmp_exact(field_data_type_FV3SAR, field_data_type_RAP)) then + if (.not. strcmp_exact(field_data_type_FV3LAM, field_data_type_RAP)) then field_unstruc_RAP \ - := totype(field_unstruc_RAP, field_data_type_FV3SAR) + := totype(field_unstruc_RAP, field_data_type_FV3LAM) end if ; ; ********************************************************************** ; ; Prepend RAP coordinates and fields to the corresponding arrays for the -; FV3SAR so that the RAP grid is drawn first and the FV3SAR tiles are +; FV3-LAM so that the RAP grid is drawn first and the FV3-LAM tiles are ; then drawn on top. ; ; ********************************************************************** @@ -1258,7 +1258,7 @@ end if ; ; ********************************************************************** ; - msg := "Calculating statistics of combined field on FV3SAR and RAP grids ..." + msg := "Calculating statistics of combined field on FV3-LAM and RAP grids ..." print("") print("" + separator_line) print("" + msg) @@ -1277,7 +1277,7 @@ end if field_median := field_stat_info@field_median field_mean := field_stat_info@field_mean - msg := "Done calculating statistics of combined field on FV3SAR and RAP grids." + msg := "Done calculating statistics of combined field on FV3-LAM and RAP grids." print("") print("" + msg) print("" + separator_line) @@ -1285,7 +1285,7 @@ end if ; ********************************************************************** ; ; If show_RAP_bdy is set to True, prepend the RAP boundary coordinates -; to those for the FV3SAR tiles. +; to those for the FV3-LAM tiles. ; ; ********************************************************************** ; @@ -1293,9 +1293,9 @@ end if ; ; Perform data conversion if necessary. ; - if (strcmp_exact(coord_data_type_FV3SAR, coord_data_type_RAP) .eq. False) then - lon_bdy_RAP := totype(lon_bdy_RAP, coord_data_type_FV3SAR) - lat_bdy_RAP := totype(lat_bdy_RAP, coord_data_type_FV3SAR) + if (strcmp_exact(coord_data_type_FV3LAM, coord_data_type_RAP) .eq. False) then + lon_bdy_RAP := totype(lon_bdy_RAP, coord_data_type_FV3LAM) + lat_bdy_RAP := totype(lat_bdy_RAP, coord_data_type_FV3LAM) end if if (.not. show_tile_bdies) then @@ -1452,7 +1452,7 @@ bdy_opts@bdy_dash_patterns = 1 ; Old way of calling plot_horiz_field + changes to get it to work with ; new way, but doesn't work. Use the new call further below, but some ; input arguments not yet defined. Should be defined as in file -; plot_FV3SAR_field_native.ncl. +; plot_FV3LAM_field_native.ncl. ; plot_info := plot_horiz_field( \ ; fn_graphics, \ ; lon_cntrs_unstruc, lat_cntrs_unstruc, \ diff --git a/ush/NCL/process_plot_params.ncl b/ush/NCL/process_plot_params.ncl index a038c37de6..b58b42320f 100644 --- a/ush/NCL/process_plot_params.ncl +++ b/ush/NCL/process_plot_params.ncl @@ -252,7 +252,7 @@ example_usage_and_help_str ; ; ********************************************************************** ; -; Note: Can't use this for JPgrid because that has no such standard values. +; Note: Can't use this for ESGgrid because that has no such standard values. ; At some point, change this if-statement so that it's entered only for ; GFDLgrid. if (False) then diff --git a/ush/NCL/read_FV3SAR_field_native.ncl b/ush/NCL/read_FV3LAM_field_native.ncl similarity index 98% rename from ush/NCL/read_FV3SAR_field_native.ncl rename to ush/NCL/read_FV3LAM_field_native.ncl index 88a463e2e8..6a551194a0 100644 --- a/ush/NCL/read_FV3SAR_field_native.ncl +++ b/ush/NCL/read_FV3LAM_field_native.ncl @@ -1,7 +1,7 @@ ; ; ********************************************************************** ; -; File name: read_FV3SAR_field_native.ncl +; File name: read_FV3LAM_field_native.ncl ; Author: Gerard Ketefian ; ; Description: @@ -18,9 +18,9 @@ loadscript(lib_location + "calc_field_stats.ncl") load "get_gridfield_info.ncl" -undef("read_FV3SAR_field_native") +undef("read_FV3LAM_field_native") -function read_FV3SAR_field_native( \ +function read_FV3LAM_field_native( \ field_names_by_tile[*]:string, \ file_names_by_tile[*]:string, \ gtype:string, \ @@ -72,7 +72,7 @@ begin ; ; ********************************************************************** ; - id_str := "Message from procedure/function read_FV3SAR_field_native():" + id_str := "Message from procedure/function read_FV3LAM_field_native():" ; ; ********************************************************************** ; diff --git a/ush/NCL/read_FV3SAR_field_wrtcmp.ncl b/ush/NCL/read_FV3LAM_field_wrtcmp.ncl similarity index 97% rename from ush/NCL/read_FV3SAR_field_wrtcmp.ncl rename to ush/NCL/read_FV3LAM_field_wrtcmp.ncl index 2b2378e0ee..440bdb81c9 100644 --- a/ush/NCL/read_FV3SAR_field_wrtcmp.ncl +++ b/ush/NCL/read_FV3LAM_field_wrtcmp.ncl @@ -1,7 +1,7 @@ ; ; ********************************************************************** ; -; File name: read_FV3SAR_field_wrtcmp.ncl +; File name: read_FV3LAM_field_wrtcmp.ncl ; Author: Gerard Ketefian ; ; Description: @@ -15,9 +15,9 @@ loadscript(lib_location + "special_chars.ncl") loadscript(lib_location + "strcmp_exact.ncl") loadscript(lib_location + "calc_field_stats.ncl") -undef("read_FV3SAR_field_wrtcmp") +undef("read_FV3LAM_field_wrtcmp") -function read_FV3SAR_field_wrtcmp( \ +function read_FV3LAM_field_wrtcmp( \ field_name:string, \ horiz_dist_units:string, \ horiz_area_units:string, \ diff --git a/ush/NCL/read_FV3SAR_grid_native.ncl b/ush/NCL/read_FV3LAM_grid_native.ncl similarity index 99% rename from ush/NCL/read_FV3SAR_grid_native.ncl rename to ush/NCL/read_FV3LAM_grid_native.ncl index 0905e9e1fe..7862666d82 100644 --- a/ush/NCL/read_FV3SAR_grid_native.ncl +++ b/ush/NCL/read_FV3LAM_grid_native.ncl @@ -1,7 +1,7 @@ ; ; ********************************************************************** ; -; File name: read_FV3SAR_grid_native.ncl +; File name: read_FV3LAM_grid_native.ncl ; Author: Gerard Ketefian ; ; Description: @@ -15,13 +15,13 @@ ; The input arguments to this function are as follows: ; ; expt_dir: -; This is the experiment directory created by the FV3SAR workflow gene- +; This is the experiment directory created by the FV3-LAM workflow gene- ; ration script. The grid specification files corresponding to the ; cubed-sphere tiles are within subdirectories under this directory. ; ; gtype: ; This is a string containing the grid type of the FV3 cubed-sphere grid -; being read in. For files generated by the FV3SAR workflow, this will +; being read in. For files generated by the FV3-LAMR workflow, this will ; be equal to "regional". ; ; cres: @@ -67,9 +67,9 @@ loadscript(lib_location + "get_rect_grid_bdy.ncl") loadscript(lib_location + "get_rect_grid_corners.ncl") loadscript(lib_location + "adjust_longitude_range.ncl") -undef("read_FV3SAR_grid_native") +undef("read_FV3LAM_grid_native") -function read_FV3SAR_grid_native( \ +function read_FV3LAM_grid_native( \ expt_dir:string, \ gtype:string, \ cres:string, \ @@ -233,7 +233,7 @@ begin else grid_fn = grid_fn + ".nc" end if - grid_fn = expt_dir + "/fix_sar/" + grid_fn + grid_fn = expt_dir + "/fix_lam/" + grid_fn grid_fn_all_tiles(nn) = grid_fn print(" grid_fn_all_tiles(" + nn + ") = " + \ diff --git a/ush/NCL/read_FV3SAR_grid_wrtcmp.ncl b/ush/NCL/read_FV3LAM_grid_wrtcmp.ncl similarity index 93% rename from ush/NCL/read_FV3SAR_grid_wrtcmp.ncl rename to ush/NCL/read_FV3LAM_grid_wrtcmp.ncl index b2434eea09..77bddcef3d 100644 --- a/ush/NCL/read_FV3SAR_grid_wrtcmp.ncl +++ b/ush/NCL/read_FV3LAM_grid_wrtcmp.ncl @@ -1,15 +1,15 @@ ; ; ********************************************************************** ; -; File name: read_FV3SAR_grid_wrtcmp.ncl +; File name: read_FV3LAM_grid_wrtcmp.ncl ; Author: Gerard Ketefian ; ; Description: ; ^^^^^^^^^^^ ; This function returns the dimensions, cell center coordinates, and -; cell vertex coordinates of the grid that discretizes the FV3SAR's +; cell vertex coordinates of the grid that discretizes the FV3-LAM's ; write-component output domain. The file to read is specified by -; FV3SAR_wrtcmp_fn. If get_domain_bdy is set to True, this function +; FV3LAM_wrtcmp_fn. If get_domain_bdy is set to True, this function ; also returns the coordinates of the cell vertices lying on the bounda- ; ry of the domain. ; @@ -20,10 +20,10 @@ loadscript(lib_location + "constants.ncl") loadscript(lib_location + "strcmp_exact.ncl") loadscript(lib_location + "get_rect_grid_bdy.ncl") -undef("read_FV3SAR_grid_wrtcmp") +undef("read_FV3LAM_grid_wrtcmp") -function read_FV3SAR_grid_wrtcmp( \ - FV3SAR_wrtcmp_fn:string, \ +function read_FV3LAM_grid_wrtcmp( \ + FV3LAM_wrtcmp_fn:string, \ get_domain_bdy:logical) local fp, \ @@ -54,17 +54,17 @@ begin ; ; ********************************************************************** ; -; Open the specified FV3SAR wrtcmp-generated output file for reading. +; Open the specified FV3-LAM wrtcmp-generated output file for reading. ; ; ********************************************************************** ; print("") print("" + separator_line) - print("Reading in FV3SAR's write-component grid coordinates from file ...") + print("Reading in FV3LAM's write-component grid coordinates from file ...") print("") - print(" FV3SAR_wrtcmp_fn = " + char_dq + FV3SAR_wrtcmp_fn + char_dq) + print(" FV3LAM_wrtcmp_fn = " + char_dq + FV3LAM_wrtcmp_fn + char_dq) - fp = addfile(FV3SAR_wrtcmp_fn, "r") + fp = addfile(FV3LAM_wrtcmp_fn, "r") ; ; ********************************************************************** ; @@ -228,7 +228,7 @@ lat_verts = lat_verts*degs_per_rad end do print("") - print("Done reading in FV3SAR's write-component grid coordinates from file.") + print("Done reading in FV3-LAM's write-component grid coordinates from file.") print("" + separator_line) ; ; ********************************************************************** diff --git a/ush/NCL/read_FV3SAR_gridfield_native.ncl b/ush/NCL/read_FV3LAM_gridfield_native.ncl similarity index 98% rename from ush/NCL/read_FV3SAR_gridfield_native.ncl rename to ush/NCL/read_FV3LAM_gridfield_native.ncl index 95aa9e4e46..287b68a054 100644 --- a/ush/NCL/read_FV3SAR_gridfield_native.ncl +++ b/ush/NCL/read_FV3LAM_gridfield_native.ncl @@ -1,7 +1,7 @@ ; ; ********************************************************************** ; -; File name: read_FV3SAR_gridfield_native.ncl +; File name: read_FV3LAM_gridfield_native.ncl ; Author: Gerard Ketefian ; ; Description: @@ -18,9 +18,9 @@ loadscript(lib_location + "calc_field_stats.ncl") load "get_gridfield_info.ncl" -undef("read_FV3SAR_gridfield_native") +undef("read_FV3LAM_gridfield_native") -function read_FV3SAR_gridfield_native( \ +function read_FV3LAM_gridfield_native( \ field_names_by_tile[*]:string, \ file_names_by_tile[*]:string, \ gtype:string, \ @@ -108,7 +108,7 @@ begin ; ; ********************************************************************** ; - id_str := "Message from procedure/function read_FV3SAR_gridfield_native():" + id_str := "Message from procedure/function read_FV3LAM_gridfield_native():" ; ; ********************************************************************** ; @@ -648,7 +648,7 @@ begin ; ; Set to missing values the variables containing the vertical and time ; dimensions of the field on each tile. These need to be returned only -; for consistency with the read_FV3SAR_field_native(...) function. +; for consistency with the read_FV3LAM_field_native(...) function. ; ; ********************************************************************** ; diff --git a/ush/UFS_plot_domains.py b/ush/UFS_plot_domains.py index 46a74ec359..a6e629bd15 100755 --- a/ush/UFS_plot_domains.py +++ b/ush/UFS_plot_domains.py @@ -10,12 +10,12 @@ # Computational grid definitions -JPgrid_LON_CTR=-153.0 -JPgrid_LAT_CTR=61.0 -JPgrid_DELX=3000.0 -JPgrid_DELY=3000.0 -JPgrid_NX=1344 -JPgrid_NY=1152 +ESGgrid_LON_CTR=-153.0 +ESGgrid_LAT_CTR=61.0 +ESGgrid_DELX=3000.0 +ESGgrid_DELY=3000.0 +ESGgrid_NX=1344 +ESGgrid_NY=1152 # Write component grid definitions @@ -23,8 +23,8 @@ WRTCMP_ny=1132 WRTCMP_lon_lwr_left=151.5 WRTCMP_lat_lwr_left=42.360 -WRTCMP_dx=JPgrid_DELX -WRTCMP_dy=JPgrid_DELY +WRTCMP_dx=ESGgrid_DELX +WRTCMP_dy=ESGgrid_DELY # Plot-specific definitions @@ -39,11 +39,11 @@ -JPgrid_width = JPgrid_NX * JPgrid_DELX -JPgrid_height = JPgrid_NY * JPgrid_DELY +ESGgrid_width = ESGgrid_NX * ESGgrid_DELX +ESGgrid_height = ESGgrid_NY * ESGgrid_DELY -big_grid_width=np.ceil(JPgrid_width*1.25) -big_grid_height=np.ceil(JPgrid_height*1.25) +big_grid_width=np.ceil(ESGgrid_width*1.25) +big_grid_height=np.ceil(ESGgrid_height*1.25) WRTCMP_width = WRTCMP_nx * WRTCMP_dx WRTCMP_height = WRTCMP_ny * WRTCMP_dy @@ -53,15 +53,15 @@ #ax1 = plt.axes ax1 = plt.subplot2grid((1,1), (0,0)) -map1 = Basemap(projection='gnom', resolution=plot_res, lon_0 = JPgrid_LON_CTR, lat_0 = JPgrid_LAT_CTR, +map1 = Basemap(projection='gnom', resolution=plot_res, lon_0 = ESGgrid_LON_CTR, lat_0 = ESGgrid_LAT_CTR, width = big_grid_width, height=big_grid_height) map1.drawmapboundary(fill_color='#9999FF') map1.fillcontinents(color='#ddaa66',lake_color='#9999FF') map1.drawcoastlines() -map2 = Basemap(projection='gnom', lon_0 = JPgrid_LON_CTR, lat_0 = JPgrid_LAT_CTR, - width = JPgrid_width, height=JPgrid_height) +map2 = Basemap(projection='gnom', lon_0 = ESGgrid_LON_CTR, lat_0 = ESGgrid_LAT_CTR, + width = ESGgrid_width, height=ESGgrid_height) #map2.drawmapboundary(fill_color='#9999FF') #map2.fillcontinents(color='#ddaa66',lake_color='#9999FF') @@ -69,7 +69,7 @@ map3 = Basemap(llcrnrlon= WRTCMP_lon_lwr_left, llcrnrlat=WRTCMP_lat_lwr_left, width=WRTCMP_width, height=WRTCMP_height, - resolution=plot_res, projection='lcc', lat_0 = JPgrid_LAT_CTR, lon_0 = JPgrid_LON_CTR) + resolution=plot_res, projection='lcc', lat_0 = ESGgrid_LAT_CTR, lon_0 = ESGgrid_LON_CTR) #map3.drawmapboundary(fill_color='#9999FF') #map3.fillcontinents(color='#ddaa66',lake_color='#9999FF',alpha=0.5) diff --git a/ush/cmp_expt_to_baseline.sh b/ush/cmp_expt_to_baseline.sh index e0582417c3..94e6e0c477 100755 --- a/ush/cmp_expt_to_baseline.sh +++ b/ush/cmp_expt_to_baseline.sh @@ -165,7 +165,7 @@ The experiment and baseline directories are: # "orog" \ # "sfc_climo" \ subdirs=( "." \ - "fix_sar" \ + "fix_lam" \ "$CDATE/${EXTRN_MDL_NAME_ICS}/ICS" \ "$CDATE/${EXTRN_MDL_NAME_LBCS}/LBCS" \ "$CDATE/INPUT" \ diff --git a/ush/config.community.sh b/ush/config.community.sh index 1fb2b283c6..38dbad21c0 100644 --- a/ush/config.community.sh +++ b/ush/config.community.sh @@ -12,7 +12,7 @@ RUN_ENVIR="community" PREEXISTING_DIR_METHOD="rename" PREDEF_GRID_NAME="GSD_HRRR25km" -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" QUILTING="TRUE" USE_CCPP="TRUE" CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp" diff --git a/ush/config.nco.sh b/ush/config.nco.sh index 4c10c9eb22..6f176789c7 100644 --- a/ush/config.nco.sh +++ b/ush/config.nco.sh @@ -43,15 +43,15 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp" # Path to direct # # In NCO mode, the user must manually (e.g. after doing the build step) -# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXsar +# create the symlink "${FIXrrfs}/fix_sar" that points to EMC's FIXLAM # directory on the machine. For example, on hera, the symlink's target # needs to be # # /scratch2/NCEPDEV/fv3-cam/emc.campara/fix_fv3cam/fix_sar # -# The experiment generation script will then set FIXsar to +# The experiment generation script will then set FIXLAM to # -# FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" +# FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}" # # where EMC_GRID_NAME has the value set above. # diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh index 7f91c08198..8fbabb3d1c 100644 --- a/ush/config_defaults.sh +++ b/ush/config_defaults.sh @@ -151,7 +151,7 @@ EXPT_SUBDIR="" # The beginning portion of the directory containing files generated by # the external model (FV3GFS) that the initial and lateral boundary # condition generation tasks need in order to create initial and boundary -# condition files for a given cycle on the native FV3SAR grid. For a +# condition files for a given cycle on the native FV3-LAM grid. For a # cycle that starts on the date specified by the variable yyyymmdd # (consisting of the 4-digit year followed by the 2-digit month followed # by the 2-digit day of the month) and hour specified by the variable hh @@ -227,7 +227,7 @@ DOT_OR_USCORE="_" # # RGNL_GRID_NML_FN: # Name of file containing the namelist settings for the code that generates -# a "JPgrid" type of regional grid. +# a "ESGgrid" type of regional grid. # # FV3_NML_BASE_SUITE_FN: # Name of Fortran namelist file containing the forecast model's base suite @@ -317,12 +317,12 @@ MODEL_CONFIG_FN="model_configure" NEMS_CONFIG_FN="nems.configure" FV3_EXEC_FN="fv3_gfs.x" -WFLOW_XML_FN="FV3SAR_wflow.xml" +WFLOW_XML_FN="FV3LAM_wflow.xml" GLOBAL_VAR_DEFNS_FN="var_defns.sh" EXTRN_MDL_ICS_VAR_DEFNS_FN="extrn_mdl_ics_var_defns.sh" EXTRN_MDL_LBCS_VAR_DEFNS_FN="extrn_mdl_lbcs_var_defns.sh" -WFLOW_LAUNCH_SCRIPT_FN="launch_FV3SAR_wflow.sh" -WFLOW_LAUNCH_LOG_FN="log.launch_FV3SAR_wflow" +WFLOW_LAUNCH_SCRIPT_FN="launch_FV3LAM_wflow.sh" +WFLOW_LAUNCH_LOG_FN="log.launch_FV3LAM_wflow" # #----------------------------------------------------------------------- # @@ -407,7 +407,7 @@ FV3GFS_FILE_FMT_LBCS="nemsio" # YYYY is the 4-digit year, MM the 2-digit month, DD the 2-digit day of # the month, and HH the 2-digit hour of the day) for the external model # files specified by the array EXTRN_MDL_FILES_ICS (these files will be -# used to generate the ICs on the native FV3SAR grid. If this is set to +# used to generate the ICs on the native FV3-LAM grid. If this is set to # an empty string, then the workflow will look for the external model # files for generating ICS in a default machine-dependent location. In # this case, EXTRN_MDL_FILES_ICS is not used. @@ -484,13 +484,13 @@ OZONE_PARAM_NO_CCPP="ozphys" # and using it as the regional grid. Note that the forecast is run on # only on the regional grid (i.e. tile 7, not tiles 1 through 6). # -# * "JPgrid": +# * "ESGgrid": # This will generate a regional grid using the map projection developed # by Jim Purser of EMC. # #----------------------------------------------------------------------- # -GRID_GEN_METHOD="JPgrid" +GRID_GEN_METHOD="ESGgrid" # #----------------------------------------------------------------------- # @@ -645,29 +645,29 @@ GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES="TRUE" # #----------------------------------------------------------------------- # -# Set parameters specific to the "JPgrid" method of generating a regional -# grid (i.e. for GRID_GEN_METHOD set to "JPgrid"). Definitions: +# Set parameters specific to the "ESGgrid" method of generating a regional +# grid (i.e. for GRID_GEN_METHOD set to "ESGgrid"). Definitions: # -# JPgrid_LON_CTR: +# ESGgrid_LON_CTR: # The longitude of the center of the grid (in degrees). # -# JPgrid_LAT_CTR: +# ESGgrid_LAT_CTR: # The latitude of the center of the grid (in degrees). # -# JPgrid_DELX: +# ESGgrid_DELX: # The cell size in the zonal direction of the regional grid (in meters). # -# JPgrid_DELY: +# ESGgrid_DELY: # The cell size in the meridional direction of the regional grid (in # meters). # -# JPgrid_NX: +# ESGgrid_NX: # The number of cells in the zonal direction on the regional grid. # -# JPgrid_NY: +# ESGgrid_NY: # The number of cells in the meridional direction on the regional grid. # -# JPgrid_WIDE_HALO_WIDTH: +# ESGgrid_WIDE_HALO_WIDTH: # The width (in units of number of grid cells) of the halo to add around # the regional grid before shaving the halo down to the width(s) expected # by the forecast model. @@ -676,7 +676,7 @@ GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES="TRUE" # 4-cell wide and orography files with halos that are 0-cell and 3-cell # wide (all of which are required as inputs to the forecast model), the # grid and orography tasks first create files with halos around the regional -# domain of width JPgrid_WIDE_HALO_WIDTH cells. These are first stored +# domain of width ESGgrid_WIDE_HALO_WIDTH cells. These are first stored # in files. The files are then read in and "shaved" down to obtain grid # files with 3-cell-wide and 4-cell-wide halos and orography files with # 0-cell-wide (i.e. no halo) and 3-cell-wide halos. For this reason, we @@ -689,27 +689,27 @@ GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES="TRUE" # to change this parameter from its default value set here. # # NOTE: Probably don't need to make this a user-specified variable. -# Just set it in the function set_gridparams_JPgrid.sh. +# Just set it in the function set_gridparams_ESGgrid.sh. # -# JPgrid_ALPHA_PARAM: +# ESGgrid_ALPHA_PARAM: # The alpha parameter used in the Jim Purser map projection/grid generation # method. # -# JPgrid_KAPPA_PARAM: +# ESGgrid_KAPPA_PARAM: # The kappa parameter used in the Jim Purser map projection/grid generation # method. # #----------------------------------------------------------------------- # -JPgrid_LON_CTR="-97.5" -JPgrid_LAT_CTR="35.5" -JPgrid_DELX="3000.0" -JPgrid_DELY="3000.0" -JPgrid_NX="1000" -JPgrid_NY="1000" -JPgrid_WIDE_HALO_WIDTH="6" -JPgrid_ALPHA_PARAM="0.21423" -JPgrid_KAPPA_PARAM="-0.23209" +ESGgrid_LON_CTR="-97.5" +ESGgrid_LAT_CTR="35.5" +ESGgrid_DELX="3000.0" +ESGgrid_DELY="3000.0" +ESGgrid_NX="1000" +ESGgrid_NY="1000" +ESGgrid_WIDE_HALO_WIDTH="6" +ESGgrid_ALPHA_PARAM="0.21423" +ESGgrid_KAPPA_PARAM="-0.23209" # #----------------------------------------------------------------------- # @@ -923,7 +923,7 @@ SFC_CLIMO_DIR="/path/to/pregenerated/surface/climo/files" #----------------------------------------------------------------------- # # Set the array parameter containing the names of all the fields that the -# MAKE_SFC_CLIMO_TN task generates on the native FV3SAR grid. +# MAKE_SFC_CLIMO_TN task generates on the native FV3-LAM grid. # #----------------------------------------------------------------------- # @@ -944,7 +944,7 @@ SFC_CLIMO_FIELDS=( \ # # FIXgsm: # System directory in which the majority of fixed (i.e. time-independent) -# files that are needed to run the FV3SAR model are located +# files that are needed to run the FV3-LAM model are located # # TOPO_DIR: # The location on disk of the static input files used by the make_orog @@ -987,7 +987,7 @@ SFC_CLIMO_FIELDS=( \ # model's namelist file that represent the relative or absolute paths of # various fixed files (the first column of the array, where columns are # delineated by the pipe symbol "|") to the full paths to surface climatology -# files (on the native FV3SAR grid) in the FIXsar directory derived from +# files (on the native FV3-LAM grid) in the FIXLAM directory derived from # the corresponding surface climatology fields (the second column of the # array). # diff --git a/ush/generate_FV3SAR_wflow.sh b/ush/generate_FV3LAM_wflow.sh similarity index 97% rename from ush/generate_FV3SAR_wflow.sh rename to ush/generate_FV3LAM_wflow.sh index 2c24392d56..e80666c39b 100755 --- a/ush/generate_FV3SAR_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -9,7 +9,7 @@ # #----------------------------------------------------------------------- # -function generate_FV3SAR_wflow() { +function generate_FV3LAM_wflow() { # #----------------------------------------------------------------------- # @@ -435,7 +435,7 @@ added: print_info_msg " Adding the following line to the cron table in order to automatically -resubmit FV3SAR workflow: +resubmit FV3-LAM workflow: CRONTAB_LINE = \"${CRONTAB_LINE}\"" ( crontab -l; echo "${CRONTAB_LINE}" ) | crontab - @@ -522,7 +522,7 @@ the forecast model directory sturcture to the experiment directory..." Copying the fixed file containing cloud condensation nuclei (CCN) data (needed by the Thompson microphysics parameterization) to the experiment directory..." - cp_vrfy "$FIXgsd/CCN_ACTIVATE.BIN" "$EXPTDIR" + cp_vrfy "${FIXgsm}/CCN_ACTIVATE.BIN" "$EXPTDIR" fi fi @@ -599,7 +599,7 @@ fi if [ ! -e "${FV3_EXEC_FP}" ] || \ [ "${exec_fp}" -nt "${FV3_EXEC_FP}" ]; then print_info_msg "$VERBOSE" " -Copying the FV3SAR executable (exec_fp) to the executables directory +Copying the FV3-LAM executable (exec_fp) to the executables directory (EXECDIR): exec_fp = \"${exec_fp}\" EXECDIR = \"$EXECDIR\"" @@ -610,7 +610,7 @@ fi # #----------------------------------------------------------------------- # -# Set parameters in the FV3SAR namelist file. +# Set parameters in the FV3-LAM namelist file. # #----------------------------------------------------------------------- # @@ -619,7 +619,7 @@ Setting parameters in FV3 namelist file (FV3_NML_FP): FV3_NML_FP = \"${FV3_NML_FP}\"" # # Set npx and npy, which are just NX plus 1 and NY plus 1, respectively. -# These need to be set in the FV3SAR Fortran namelist file. They represent +# These need to be set in the FV3-LAM Fortran namelist file. They represent # the number of cell vertices in the x and y directions on the regional # grid. # @@ -672,9 +672,9 @@ settings="\ 'target_lat': ${LAT_CTR}, # # Question: -# For a JPgrid type grid, what should stretch_fac be set to? This depends +# For a ESGgrid type grid, what should stretch_fac be set to? This depends # on how the FV3 code uses the stretch_fac parameter in the namelist file. -# Recall that for a JPgrid, it gets set in the function set_gridparams_JPgrid(.sh) +# Recall that for a ESGgrid, it gets set in the function set_gridparams_ESGgrid(.sh) # to something like 0.9999, but is it ok to set it to that here in the # FV3 namelist file? # @@ -803,7 +803,7 @@ $settings" # If not running the MAKE_GRID_TN task (which implies the workflow will # use pregenerated grid files), set the namelist variables specifying # the paths to surface climatology files. These files are located in -# (or have symlinks that point to them) in the FIXsar directory. +# (or have symlinks that point to them) in the FIXLAM directory. # # Note that if running the MAKE_GRID_TN task, this action usually cannot # be performed here but must be performed in that task because the names @@ -922,7 +922,7 @@ For automatic resubmission of the workflow (say every 3 minutes), the following line can be added to the user's crontab (use \"crontab -e\" to edit the cron table): -*/3 * * * * cd $EXPTDIR && ./launch_FV3SAR_wflow.sh +*/3 * * * * cd $EXPTDIR && ./launch_FV3LAM_wflow.sh Done. " @@ -983,11 +983,11 @@ rm -f "${tmp_fp}" # Set the name of and full path to the log file in which the output from # the experiment/workflow generation function will be saved. # -log_fn="log.generate_FV3SAR_wflow" +log_fn="log.generate_FV3LAM_wflow" log_fp="$ushdir/${log_fn}" rm -f "${log_fp}" # -# Call the generate_FV3SAR_wflow function defined above to generate the +# Call the generate_FV3LAM_wflow function defined above to generate the # experiment/workflow. Note that we pipe the output of the function # (and possibly other commands) to the "tee" command in order to be able # to both save it to a file and print it out to the screen (stdout). @@ -1000,7 +1000,7 @@ rm -f "${log_fp}" # temporary file and read them in outside the subshell later below. # { -generate_FV3SAR_wflow 2>&1 # If this exits with an error, the whole {...} group quits, so things don't work... +generate_FV3LAM_wflow 2>&1 # If this exits with an error, the whole {...} group quits, so things don't work... retval=$? echo "$EXPTDIR" >> "${tmp_fp}" echo "$retval" >> "${tmp_fp}" @@ -1008,8 +1008,8 @@ echo "$retval" >> "${tmp_fp}" # # Read in experiment/workflow variables needed later below from the tem- # porary file created in the subshell above containing the call to the -# generate_FV3SAR_wflow function. These variables are not directly -# available here because the call to generate_FV3SAR_wflow above takes +# generate_FV3LAM_wflow function. These variables are not directly +# available here because the call to generate_FV3LAM_wflow above takes # place in a subshell (due to the fact that we are then piping its out- # put to the "tee" command). Then remove the temporary file. # @@ -1017,14 +1017,14 @@ exptdir=$( sed "1q;d" "${tmp_fp}" ) retval=$( sed "2q;d" "${tmp_fp}" ) rm "${tmp_fp}" # -# If the call to the generate_FV3SAR_wflow function above was success- +# If the call to the generate_FV3LAM_wflow function above was success- # ful, move the log file in which the "tee" command saved the output of # the function to the experiment directory. # if [ $retval -eq 0 ]; then mv "${log_fp}" "$exptdir" # -# If the call to the generate_FV3SAR_wflow function above was not suc- +# If the call to the generate_FV3LAM_wflow function above was not suc- # cessful, print out an error message and exit with a nonzero return # code. # diff --git a/ush/get_extrn_mdl_file_dir_info.sh b/ush/get_extrn_mdl_file_dir_info.sh index 29099ce19f..f9ce609bc0 100755 --- a/ush/get_extrn_mdl_file_dir_info.sh +++ b/ush/get_extrn_mdl_file_dir_info.sh @@ -60,7 +60,7 @@ function get_extrn_mdl_file_dir_info() { local valid_args=( \ "extrn_mdl_name" \ "anl_or_fcst" \ - "cdate_FV3SAR" \ + "cdate_FV3LAM" \ "time_offset_hrs" \ "varname_extrn_mdl_cdate" \ "varname_extrn_mdl_lbc_spec_fhrs" \ @@ -105,7 +105,7 @@ Usage: ${func_name} \ extrn_mdl_name \ anl_or_fcst \ - cdate_FV3SAR \ + cdate_FV3LAM \ time_offset_hrs \ varname_extrn_mdl_cdate \ varname_extrn_mdl_lbc_spec_fhrs \ @@ -121,13 +121,13 @@ where the arguments are defined as follows: extrn_mdl_name: Name of the external model, i.e. the name of the model providing the fields from which files containing initial conditions, surface fields, - and/or lateral boundary conditions for the FV3SAR will be generated. + and/or lateral boundary conditions for the FV3-LAM will be generated. anl_or_fcst: Flag that specifies whether the external model files we are interested in obtaining are analysis or forecast files. - cdate_FV3SAR: + cdate_FV3LAM: The cycle date and time (hours only) for which we want to obtain file and directory information. This has the form YYYYMMDDHH, where YYYY is the four-digit starting year of the cycle, MM is the two-digit @@ -137,15 +137,15 @@ where the arguments are defined as follows: time_offset_hrs: The number of hours by which to shift back in time the start time of the external model forecast from the specified cycle start time of the - FV3SAR (cdate_FV3SAR). When getting directory and file information on + FV3-LAM (cdate_FV3LAM). When getting directory and file information on external model analysis files, this is normally set to 0. When get- ting directory and file information on external model forecast files, this may be set to a nonzero value to obtain information for an exter- - nal model run that started time_offset_hrs hours before cdate_FV3SAR - (instead of exactly at cdate_FV3SAR). Note that in this case, the + nal model run that started time_offset_hrs hours before cdate_FV3LAM + (instead of exactly at cdate_FV3LAM). Note that in this case, the forecast hours (relative to the external model run's start time) at which the lateral boundary conditions will be updated must be shifted - forward by time_offset_hrs hours relative to those for the FV3SAR in + forward by time_offset_hrs hours relative to those for the FV3-LAM in order to make up for the backward-in-time shift in the starting time of the external model. @@ -156,9 +156,9 @@ where the arguments are defined as follows: varname_extrn_mdl_lbc_spec_fhrs: Name of the global variable that will contain the forecast hours (re- lative to the starting time of the external model run, which is earli- - er than that of the FV3SAR by time_offset_hrs hours) at which lateral + er than that of the FV3-LAM by time_offset_hrs hours) at which lateral boundary condition (LBC) output files are obtained from the external - model (and will be used to update the LBCs of the FV3SAR). + model (and will be used to update the LBCs of the FV3-LAM). varname_extrn_mdl_fns: Name of the global variable that will contain the names of the exter- @@ -219,20 +219,20 @@ fi # #----------------------------------------------------------------------- # -# Extract from cdate_FV3SAR the starting year, month, day, and hour of -# the FV3SAR cycle. Then subtract the temporal offset specified in -# time_offset_hrs (assumed to be given in units of hours) from cdate_FV3SAR +# Extract from cdate_FV3LAM the starting year, month, day, and hour of +# the FV3-LAM cycle. Then subtract the temporal offset specified in +# time_offset_hrs (assumed to be given in units of hours) from cdate_FV3LAM # to obtain the starting date and time of the external model, express the # result in YYYYMMDDHH format, and save it in cdate. This is the starting # time of the external model forecast. # #----------------------------------------------------------------------- # - yyyy=${cdate_FV3SAR:0:4} - mm=${cdate_FV3SAR:4:2} - dd=${cdate_FV3SAR:6:2} - hh=${cdate_FV3SAR:8:2} - yyyymmdd=${cdate_FV3SAR:0:8} + yyyy=${cdate_FV3LAM:0:4} + mm=${cdate_FV3LAM:4:2} + dd=${cdate_FV3LAM:6:2} + hh=${cdate_FV3LAM:8:2} + yyyymmdd=${cdate_FV3LAM:0:8} cdate=$( date --utc --date "${yyyymmdd} ${hh} UTC - ${time_offset_hrs} hours" "+%Y%m%d%H" ) # @@ -701,8 +701,8 @@ has not been specified for this external model: "FV3GFS") if [ "${fv3gfs_file_fmt}" = "nemsio" ]; then - if [ "${cdate_FV3SAR}" -le "2019061206" ]; then - arcv_dir="/NCEPDEV/emc-global/5year/emc.glopara/WCOSS_C/Q2FY19/prfv3rt3/${cdate_FV3SAR}" + if [ "${cdate_FV3LAM}" -le "2019061206" ]; then + arcv_dir="/NCEPDEV/emc-global/5year/emc.glopara/WCOSS_C/Q2FY19/prfv3rt3/${cdate_FV3LAM}" arcv_fns="" else arcv_dir="/NCEPPROD/hpssprod/runhistory/rh${yyyy}/${yyyy}${mm}/${yyyymmdd}" diff --git a/ush/launch_FV3SAR_wflow.sh b/ush/launch_FV3LAM_wflow.sh similarity index 98% rename from ush/launch_FV3SAR_wflow.sh rename to ush/launch_FV3LAM_wflow.sh index db583d62df..0b5aba00b7 100755 --- a/ush/launch_FV3SAR_wflow.sh +++ b/ush/launch_FV3LAM_wflow.sh @@ -36,28 +36,28 @@ scrfunc_dir=$( dirname "${scrfunc_fp}" ) # # 1) Call this script from the experiment directory: # > cd /path/to/experiment/directory -# > launch_FV3SAR_wflow.sh +# > launch_FV3LAM_wflow.sh # # 2) Call this script from the experiment directory but using "./" be- # fore the script name: # > cd /path/to/experiment/directory -# > ./launch_FV3SAR_wflow.sh +# > ./launch_FV3LAM_wflow.sh # # 3) Call this script from any directory using the absolute path to the # symlink in the experiment directory: -# > /path/to/experiment/directory/launch_FV3SAR_wflow.sh +# > /path/to/experiment/directory/launch_FV3LAM_wflow.sh # # 4) Call this script from a directory that is several levels up from # the experiment directory (but not necessarily at the root directo- # ry): # > cd /path/to -# > experiment/directory/launch_FV3SAR_wflow.sh +# > experiment/directory/launch_FV3LAM_wflow.sh # # Note that given just a file name, e.g. the name of this script without # any path before it, the "dirname" command will return a ".", e.g. in # bash, # -# > exptdir=$( dirname "launch_FV3SAR_wflow.sh" ) +# > exptdir=$( dirname "launch_FV3LAM_wflow.sh" ) # > echo $exptdir # # will print out ".". diff --git a/ush/link_fix.sh b/ush/link_fix.sh index e07cee4112..a3996a1d0c 100755 --- a/ush/link_fix.sh +++ b/ush/link_fix.sh @@ -106,7 +106,7 @@ function link_fix() { # #----------------------------------------------------------------------- # -# Create symlinks in the FIXsar directory pointing to the grid files. +# Create symlinks in the FIXLAM directory pointing to the grid files. # These symlinks are needed by the make_orog, make_sfc_climo, make_ic, # make_lbc, and/or run_fcst tasks. # @@ -118,7 +118,7 @@ function link_fix() { #----------------------------------------------------------------------- # print_info_msg "$verbose" " -Creating links in the FIXsar directory to the grid files..." +Creating links in the FIXLAM directory to the grid files..." # #----------------------------------------------------------------------- # @@ -127,7 +127,7 @@ Creating links in the FIXsar directory to the grid files..." # # # For grid files (i.e. file_group set to "grid"), symlinks are created -# in the FIXsar directory to files (of the same names) in the GRID_DIR. +# in the FIXLAM directory to files (of the same names) in the GRID_DIR. # These symlinks/files and the reason each is needed is listed below: # # 1) "C*.mosaic.halo${NHW}.nc" @@ -336,17 +336,17 @@ Please ensure that all files have the same resolution." #----------------------------------------------------------------------- # # In creating the various symlinks below, it is convenient to work in -# the FIXsar directory. We will change directory back to the original +# the FIXLAM directory. We will change directory back to the original # later below. # #----------------------------------------------------------------------- # - cd_vrfy "$FIXsar" + cd_vrfy "$FIXLAM" # #----------------------------------------------------------------------- # # Use the set of full file paths generated above as the link targets to -# create symlinks to these files in the FIXsar directory. +# create symlinks to these files in the FIXLAM directory. # #----------------------------------------------------------------------- # @@ -392,8 +392,8 @@ Cannot create symlink because target file (fp) does not exist: else print_err_msg_exit "\ Cannot create symlink because the target file (target) in the directory -specified by FIXsar does not exist: - FIXsar = \"${FIXsar}\" +specified by FIXLAM does not exist: + FIXLAM = \"${FIXLAM}\" target = \"${target}\"" fi # @@ -418,8 +418,8 @@ specified by FIXsar does not exist: else print_err_msg_exit "\ Cannot create symlink because the target file (target) in the directory -specified by FIXsar does not exist: - FIXsar = \"${FIXsar}\" +specified by FIXLAM does not exist: + FIXLAM = \"${FIXLAM}\" target = \"${target}\"" fi @@ -455,7 +455,7 @@ Cannot create symlink because target file (target) does not exist: done # # In order to be able to specify the surface climatology file names in -# the forecast model's namelist file, in the FIXsar directory a symlink +# the forecast model's namelist file, in the FIXLAM directory a symlink # must be created for each surface climatology field that has "tile1" in # its name (and no "halo") and which points to the corresponding "tile7.halo0" # file. diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh index 9e2caccff9..16de7ee465 100755 --- a/ush/load_modules_run_task.sh +++ b/ush/load_modules_run_task.sh @@ -153,7 +153,7 @@ jjob_fp="$2" # and loads modules. # # The regional_workflow repository contains module files for all the -# workflow tasks in the template rocoto XML file for the FV3SAR work- +# workflow tasks in the template rocoto XML file for the FV3-LAM work- # flow. The full path to a module file for a given task is # # $HOMErrfs/modulefiles/$machine/${task_name} diff --git a/ush/set_FV3nml_sfc_climo_filenames.sh b/ush/set_FV3nml_sfc_climo_filenames.sh index d79a333cb0..2d44a9d0c2 100644 --- a/ush/set_FV3nml_sfc_climo_filenames.sh +++ b/ush/set_FV3nml_sfc_climo_filenames.sh @@ -3,10 +3,10 @@ # # This file defines a function that sets the values of the variables in # the forecast model's namelist file that specify the paths to the surface -# climatology files on the FV3SAR native grid (which are either pregenerated +# climatology files on the FV3LAM native grid (which are either pregenerated # or created by the MAKE_SFC_CLIMO_TN task). Note that the workflow # generation scripts create symlinks to these surface climatology files -# in the FIXsar directory, and the values in the namelist file that get +# in the FIXLAM directory, and the values in the namelist file that get # set by this function are relative or full paths to these links. # #----------------------------------------------------------------------- @@ -156,7 +156,7 @@ for (( i=0; i<${num_nml_vars}; i++ )); do # # Set the full path to the surface climatology file. # - fp="${FIXsar}/${CRES}.${sfc_climo_field_name}.$suffix" + fp="${FIXLAM}/${CRES}.${sfc_climo_field_name}.$suffix" # # If not in NCO mode, for portability and brevity change fp so that it # is a relative path (relative to any cycle directory immediately under diff --git a/ush/set_extrn_mdl_params.sh b/ush/set_extrn_mdl_params.sh index 39f299eef6..fac2e50bc7 100644 --- a/ush/set_extrn_mdl_params.sh +++ b/ush/set_extrn_mdl_params.sh @@ -34,7 +34,7 @@ local func_name="${FUNCNAME[0]}" # Set the system directory (i.e. location on disk, not on HPSS) in which # the files generated by the external model specified by EXTRN_MDL_- # NAME_ICS that are necessary for generating initial condition (IC) -# and surface files for the FV3SAR are stored (usually for a limited +# and surface files for the FV3-LAM are stored (usually for a limited # time, e.g. for the GFS external model, 2 weeks on WCOSS and 2 days on # theia). If for a given cycle these files are available in this system # directory, they will be copied over to a subdirectory within the cy- @@ -192,7 +192,7 @@ esac # Set the system directory (i.e. location on disk, not on HPSS) in which # the files generated by the external model specified by EXTRN_MDL_- # NAME_LBCS that are necessary for generating lateral boundary condition -# (LBC) files for the FV3SAR are stored (usually for a limited time, +# (LBC) files for the FV3-LAM are stored (usually for a limited time, # e.g. for the GFS external model, 2 weeks on WCOSS and 2 days on the- # ia). If for a given cycle these files are available in this system # directory, they will be copied over to a subdirectory within the cy- diff --git a/ush/set_gridparams_JPgrid.sh b/ush/set_gridparams_ESGgrid.sh similarity index 96% rename from ush/set_gridparams_JPgrid.sh rename to ush/set_gridparams_ESGgrid.sh index c8c52d425d..669efb7712 100644 --- a/ush/set_gridparams_JPgrid.sh +++ b/ush/set_gridparams_ESGgrid.sh @@ -2,12 +2,12 @@ #----------------------------------------------------------------------- # # This file defines and then calls a function that sets the parameters -# for a grid that is to be generated using the "JPgrid" grid generation -# method (i.e. GRID_GEN_METHOD set to "JPgrid"). +# for a grid that is to be generated using the "ESGgrid" grid generation +# method (i.e. GRID_GEN_METHOD set to "ESGgrid"). # #----------------------------------------------------------------------- # -function set_gridparams_JPgrid() { +function set_gridparams_ESGgrid() { # #----------------------------------------------------------------------- # @@ -103,7 +103,7 @@ function set_gridparams_JPgrid() { # #----------------------------------------------------------------------- # -# For a JPgrid-type grid, the orography filtering is performed by pass- +# For a ESGgrid-type grid, the orography filtering is performed by pass- # ing to the orography filtering the parameters for an "equivalent" glo- # bal uniform cubed-sphere grid. These are the parameters that a global # uniform cubed-sphere grid needs to have in order to have a nominal diff --git a/ush/set_gridparams_GFDLgrid.sh b/ush/set_gridparams_GFDLgrid.sh index 2eb4ed2105..7d47affb1c 100644 --- a/ush/set_gridparams_GFDLgrid.sh +++ b/ush/set_gridparams_GFDLgrid.sh @@ -255,7 +255,7 @@ fi # denote these limits. The reason we include "_wide_halo" in these va- # riable names is that the halo of the grid that we will first generate # will be wider than the halos that are actually needed as inputs to the -# FV3SAR model (i.e. the 0-cell-wide, 3-cell-wide, and 4-cell-wide halos +# FV3LAM model (i.e. the 0-cell-wide, 3-cell-wide, and 4-cell-wide halos # described above). We will generate the grids with narrower halos that # the model needs later on by "shaving" layers of cells from this wide- # halo grid. Next, we describe how to calculate the above indices. diff --git a/ush/set_predef_grid_params.sh b/ush/set_predef_grid_params.sh index 55a162cd63..b9e435efc7 100644 --- a/ush/set_predef_grid_params.sh +++ b/ush/set_predef_grid_params.sh @@ -90,18 +90,18 @@ predefined domain: PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\" GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\"" - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-62.0 - JPgrid_LAT_CTR=22.0 + ESGgrid_LON_CTR=-62.0 + ESGgrid_LAT_CTR=22.0 - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" - JPgrid_NX=2880 - JPgrid_NY=1920 + ESGgrid_NX=2880 + ESGgrid_NY=1920 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="40" @@ -113,7 +113,7 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="32" WRTCMP_output_grid="regional_latlon" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" WRTCMP_cen_lat="25.0" WRTCMP_lon_lwr_left="-114.5" WRTCMP_lat_lwr_left="-5.0" @@ -142,18 +142,18 @@ predefined domain: PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\" GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\"" - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-62.0 - JPgrid_LAT_CTR=22.0 + ESGgrid_LON_CTR=-62.0 + ESGgrid_LAT_CTR=22.0 - JPgrid_DELX="13000.0" - JPgrid_DELY="13000.0" + ESGgrid_DELX="13000.0" + ESGgrid_DELY="13000.0" - JPgrid_NX=665 - JPgrid_NY=444 + ESGgrid_NX=665 + ESGgrid_NY=444 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="180" @@ -165,7 +165,7 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="32" WRTCMP_output_grid="regional_latlon" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" WRTCMP_cen_lat="25.0" WRTCMP_lon_lwr_left="-114.5" WRTCMP_lat_lwr_left="-5.0" @@ -194,18 +194,18 @@ predefined domain: PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\" GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\"" - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-62.0 - JPgrid_LAT_CTR=22.0 + ESGgrid_LON_CTR=-62.0 + ESGgrid_LAT_CTR=22.0 - JPgrid_DELX="25000.0" - JPgrid_DELY="25000.0" + ESGgrid_DELX="25000.0" + ESGgrid_DELY="25000.0" - JPgrid_NX=345 - JPgrid_NY=230 + ESGgrid_NX=345 + ESGgrid_NY=230 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="300" @@ -217,7 +217,7 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="32" WRTCMP_output_grid="regional_latlon" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" WRTCMP_cen_lat="25.0" WRTCMP_lon_lwr_left="-114.5" WRTCMP_lat_lwr_left="-5.0" @@ -280,18 +280,18 @@ predefined domain: WRTCMP_dlat="0.121833" fi - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-106.0 - JPgrid_LAT_CTR=54.0 + ESGgrid_LON_CTR=-106.0 + ESGgrid_LAT_CTR=54.0 - JPgrid_DELX="13000.0" - JPgrid_DELY="13000.0" + ESGgrid_DELX="13000.0" + ESGgrid_DELY="13000.0" - JPgrid_NX=960 - JPgrid_NY=960 + ESGgrid_NX=960 + ESGgrid_NY=960 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="50" @@ -303,8 +303,8 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="16" WRTCMP_output_grid="rotated_latlon" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" WRTCMP_lon_lwr_left="-57.9926" WRTCMP_lat_lwr_left="-50.74344" WRTCMP_lon_upr_rght="57.99249" @@ -332,18 +332,18 @@ predefined domain: PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\" GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\"" - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-97.5 - JPgrid_LAT_CTR=38.5 + ESGgrid_LON_CTR=-97.5 + ESGgrid_LAT_CTR=38.5 - JPgrid_DELX="25000.0" - JPgrid_DELY="25000.0" + ESGgrid_DELX="25000.0" + ESGgrid_DELY="25000.0" - JPgrid_NX=200 - JPgrid_NY=110 + ESGgrid_NX=200 + ESGgrid_NY=110 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="300" @@ -355,16 +355,16 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="2" WRTCMP_output_grid="lambert_conformal" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" WRTCMP_nx="191" WRTCMP_ny="97" WRTCMP_lon_lwr_left="-120.72962370" WRTCMP_lat_lwr_left="25.11648583" - WRTCMP_dx="${JPgrid_DELX}" - WRTCMP_dy="${JPgrid_DELY}" + WRTCMP_dx="${ESGgrid_DELX}" + WRTCMP_dy="${ESGgrid_DELY}" fi fi @@ -386,18 +386,18 @@ predefined domain: PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\" GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\"" - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-97.5 - JPgrid_LAT_CTR=38.5 + ESGgrid_LON_CTR=-97.5 + ESGgrid_LAT_CTR=38.5 - JPgrid_DELX="13000.0" - JPgrid_DELY="13000.0" + ESGgrid_DELX="13000.0" + ESGgrid_DELY="13000.0" - JPgrid_NX=390 - JPgrid_NY=210 + ESGgrid_NX=390 + ESGgrid_NY=210 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="180" @@ -409,16 +409,16 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="10" WRTCMP_output_grid="lambert_conformal" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" WRTCMP_nx="383" WRTCMP_ny="195" WRTCMP_lon_lwr_left="-121.58647982" WRTCMP_lat_lwr_left="24.36006861" - WRTCMP_dx="${JPgrid_DELX}" - WRTCMP_dy="${JPgrid_DELY}" + WRTCMP_dx="${ESGgrid_DELX}" + WRTCMP_dy="${ESGgrid_DELY}" fi fi @@ -482,18 +482,18 @@ predefined domain: WRTCMP_dy="3000.0" fi - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-97.5 - JPgrid_LAT_CTR=38.5 + ESGgrid_LON_CTR=-97.5 + ESGgrid_LAT_CTR=38.5 - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" - JPgrid_NX=1734 - JPgrid_NY=1008 + ESGgrid_NX=1734 + ESGgrid_NY=1008 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="40" @@ -505,16 +505,16 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="24" WRTCMP_output_grid="lambert_conformal" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" WRTCMP_nx="1738" WRTCMP_ny="974" WRTCMP_lon_lwr_left="-122.21414225" WRTCMP_lat_lwr_left="22.41403305" - WRTCMP_dx="${JPgrid_DELX}" - WRTCMP_dy="${JPgrid_DELY}" + WRTCMP_dx="${ESGgrid_DELX}" + WRTCMP_dy="${ESGgrid_DELY}" fi fi @@ -571,18 +571,18 @@ predefined domain: WRTCMP_dlat="0.02" fi - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-97.5 - JPgrid_LAT_CTR=38.5 + ESGgrid_LON_CTR=-97.5 + ESGgrid_LAT_CTR=38.5 - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" - JPgrid_NX=960 - JPgrid_NY=960 + ESGgrid_NX=960 + ESGgrid_NY=960 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 fi ;; @@ -641,7 +641,7 @@ predefined domain: WRTCMP_dlat="0.24" fi - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then print_err_msg_exit "\ The parameters for a \"${GRID_GEN_METHOD}\" type grid have not yet been specified for this @@ -731,28 +731,28 @@ predefined domain: WRTCMP_write_tasks_per_group="24" BLOCKSIZE=32 - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then # Values taken from pre-generated files in /scratch4/NCEPDEV/fv3-cam/save/Benjamin.Blake/regional_workflow/fix/fix_sar # With move to Hera, those files were lost; a backup can be found here: /scratch2/BMC/det/kavulich/fix/fix_sar # Longitude and latitude for center of domain - JPgrid_LON_CTR=-153.0 - JPgrid_LAT_CTR=61.0 + ESGgrid_LON_CTR=-153.0 + ESGgrid_LAT_CTR=61.0 # Projected grid spacing in meters...in the static files (e.g. "C768_grid.tile7.nc"), the "dx" is actually the resolution # of the supergrid, which is HALF of this dx - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" # Number of x and y points for your domain (halo not included); # Divide "supergrid" values from /scratch2/BMC/det/kavulich/fix/fix_sar/ak/C768_grid.tile7.halo4.nc by 2 and subtract 8 to eliminate halo - JPgrid_NX=1344 # Supergrid value 2704 - JPgrid_NY=1152 # Supergrid value 2320 + ESGgrid_NX=1344 # Supergrid value 2704 + ESGgrid_NY=1152 # Supergrid value 2320 # Number of halo points for a wide grid (before trimming)...this should almost always be 6 for now # Within the model we actually have a 4-point halo and a 3-point halo - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 # Side note: FV3 is lagrangian and vertical coordinates are dynamically remapped during model integration # 'ksplit' is the factor that determines the timestep for this process (divided @@ -765,7 +765,7 @@ predefined domain: DT_ATMOS="18" -#Factors for MPI decomposition. JPgrid_NX must be divisible by LAYOUT_X, JPgrid_NY must be divisible by LAYOUT_Y +#Factors for MPI decomposition. ESGgrid_NX must be divisible by LAYOUT_X, ESGgrid_NY must be divisible by LAYOUT_Y LAYOUT_X="28" LAYOUT_Y="16" @@ -784,18 +784,18 @@ predefined domain: #lambert_conformal or rotated_latlon. lambert_conformal not well tested and probably doesn't work for our purposes WRTCMP_output_grid="lambert_conformal" #These should always be set the same as compute grid - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" #Write component grid must always be <= compute grid (without haloes) WRTCMP_nx="1344" WRTCMP_ny="1152" #Lower left latlon (southwest corner) WRTCMP_lon_lwr_left="-177.0" WRTCMP_lat_lwr_left="42.5" - WRTCMP_dx="$JPgrid_DELX" - WRTCMP_dy="$JPgrid_DELY" + WRTCMP_dx="$ESGgrid_DELX" + WRTCMP_dy="$ESGgrid_DELY" fi @@ -854,18 +854,18 @@ predefined domain: WRTCMP_dy="3000.0" fi - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-161.5 - JPgrid_LAT_CTR=63.0 + ESGgrid_LON_CTR=-161.5 + ESGgrid_LAT_CTR=63.0 - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" - JPgrid_NX=1380 - JPgrid_NY=1020 + ESGgrid_NX=1380 + ESGgrid_NY=1020 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="50" @@ -877,16 +877,16 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="2" WRTCMP_output_grid="lambert_conformal" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" WRTCMP_nx="1320" WRTCMP_ny="950" WRTCMP_lon_lwr_left="173.734" WRTCMP_lat_lwr_left="46.740347" - WRTCMP_dx="${JPgrid_DELX}" - WRTCMP_dy="${JPgrid_DELY}" + WRTCMP_dx="${ESGgrid_DELX}" + WRTCMP_dy="${ESGgrid_DELY}" fi fi @@ -908,18 +908,18 @@ predefined domain: PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\" GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\" " - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - JPgrid_LON_CTR=-163.5 - JPgrid_LAT_CTR=62.8 + ESGgrid_LON_CTR=-163.5 + ESGgrid_LAT_CTR=62.8 - JPgrid_DELX="50000.0" - JPgrid_DELY="50000.0" + ESGgrid_DELX="50000.0" + ESGgrid_DELY="50000.0" - JPgrid_NX=74 - JPgrid_NY=51 + ESGgrid_NX=74 + ESGgrid_NY=51 - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 DT_ATMOS="600" @@ -931,16 +931,16 @@ predefined domain: WRTCMP_write_groups="1" WRTCMP_write_tasks_per_group="1" WRTCMP_output_grid="lambert_conformal" - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" WRTCMP_nx="70" WRTCMP_ny="45" WRTCMP_lon_lwr_left="172.0" WRTCMP_lat_lwr_left="49.0" - WRTCMP_dx="${JPgrid_DELX}" - WRTCMP_dy="${JPgrid_DELY}" + WRTCMP_dx="${ESGgrid_DELX}" + WRTCMP_dy="${ESGgrid_DELY}" fi fi @@ -963,27 +963,27 @@ predefined domain: PREDEF_GRID_NAME = \"${PREDEF_GRID_NAME}\" GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\"" - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then # Values taken from pre-generated files in /scratch4/NCEPDEV/fv3-cam/save/Benjamin.Blake/regional_workflow/fix/fix_sar/hi/C768_grid.tile7.nc # With move to Hera, those files were lost; a backup can be found here: /scratch2/BMC/det/kavulich/fix/fix_sar # Longitude and latitude for center of domain - JPgrid_LON_CTR=-157.0 - JPgrid_LAT_CTR=20.0 + ESGgrid_LON_CTR=-157.0 + ESGgrid_LAT_CTR=20.0 # Projected grid spacing in meters...in the static files (e.g. "C768_grid.tile7.nc"), the "dx" is actually the resolution # of the supergrid, which is HALF of this dx (plus or minus some grid stretch factor) - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" # Number of x and y points for your domain (halo not included); # Divide "supergrid" values from /scratch2/BMC/det/kavulich/fix/fix_sar/hi/C768_grid.tile7.halo4.nc by 2 and subtract 8 to eliminate halo - JPgrid_NX=432 # Supergrid value 880 - JPgrid_NY=360 # Supergrid value 736 + ESGgrid_NX=432 # Supergrid value 880 + ESGgrid_NY=360 # Supergrid value 736 # Number of halo points for a wide grid (before trimming)...this should almost always be 6 for now # Within the model we actually have a 4-point halo and a 3-point halo - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 # Side note: FV3 is lagrangian and vertical coordinates are dynamically remapped during model integration # 'ksplit' is the factor that determines the timestep for this process (divided @@ -996,7 +996,7 @@ predefined domain: DT_ATMOS="18" -#Factors for MPI decomposition. JPgrid_NX must be divisible by LAYOUT_X, JPgrid_NY must be divisible by LAYOUT_Y +#Factors for MPI decomposition. ESGgrid_NX must be divisible by LAYOUT_X, ESGgrid_NY must be divisible by LAYOUT_Y LAYOUT_X="8" LAYOUT_Y="8" #Take number of points on a tile (nx/lx*ny/ly), must divide by block size to get an integer. @@ -1014,19 +1014,19 @@ predefined domain: #lambert_conformal or rotated_latlon. lambert_conformal not well tested and probably doesn't work for our purposes WRTCMP_output_grid="lambert_conformal" #These should usually be set the same as compute grid - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" -#Write component grid should be close to the JPgrid values unless you are doing something weird + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" +#Write component grid should be close to the ESGgrid values unless you are doing something weird WRTCMP_nx="420" WRTCMP_ny="348" #Lower left latlon (southwest corner) WRTCMP_lon_lwr_left="-162.8" WRTCMP_lat_lwr_left="15.2" - WRTCMP_dx="$JPgrid_DELX" - WRTCMP_dy="$JPgrid_DELY" + WRTCMP_dx="$ESGgrid_DELX" + WRTCMP_dy="$ESGgrid_DELY" fi fi @@ -1050,27 +1050,27 @@ predefined domain: GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\" " - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then # Values taken from pre-generated files in /scratch4/NCEPDEV/fv3-cam/save/Benjamin.Blake/regional_workflow/fix/fix_sar/pr/C768_grid.tile7.nc # With move to Hera, those files were lost; a backup can be found here: /scratch2/BMC/det/kavulich/fix/fix_sar # Longitude and latitude for center of domain - JPgrid_LON_CTR=-69.0 - JPgrid_LAT_CTR=18.0 + ESGgrid_LON_CTR=-69.0 + ESGgrid_LAT_CTR=18.0 # Projected grid spacing in meters...in the static files (e.g. "C768_grid.tile7.nc"), the "dx" is actually the resolution # of the supergrid, which is HALF of this dx (plus or minus some grid stretch factor) - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" # Number of x and y points for your domain (halo not included); # Divide "supergrid" values from /scratch2/BMC/det/kavulich/fix/fix_sar/pr/C768_grid.tile7.halo4.nc by 2 and subtract 8 to eliminate halo - JPgrid_NX=576 # Supergrid value 1168 - JPgrid_NY=432 # Supergrid value 880 + ESGgrid_NX=576 # Supergrid value 1168 + ESGgrid_NY=432 # Supergrid value 880 # Number of halo points for a wide grid (before trimming)...this should almost always be 6 for now # Within the model we actually have a 4-point halo and a 3-point halo - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 # Side note: FV3 is lagrangian and vertical coordinates are dynamically remapped during model integration # 'ksplit' is the factor that determines the timestep for this process (divided @@ -1083,7 +1083,7 @@ predefined domain: DT_ATMOS="18" -#Factors for MPI decomposition. JPgrid_NX must be divisible by LAYOUT_X, JPgrid_NY must be divisible by LAYOUT_Y +#Factors for MPI decomposition. ESGgrid_NX must be divisible by LAYOUT_X, ESGgrid_NY must be divisible by LAYOUT_Y LAYOUT_X="16" LAYOUT_Y="8" @@ -1102,18 +1102,18 @@ predefined domain: #lambert_conformal or rotated_latlon. lambert_conformal not well tested and probably doesn't work for our purposes WRTCMP_output_grid="lambert_conformal" #These should always be set the same as compute grid - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" #Write component grid must always be <= compute grid (without haloes) WRTCMP_nx="576" WRTCMP_ny="432" #Lower left latlon (southwest corner) WRTCMP_lon_lwr_left="-77" WRTCMP_lat_lwr_left="12" - WRTCMP_dx="$JPgrid_DELX" - WRTCMP_dy="$JPgrid_DELY" + WRTCMP_dx="$ESGgrid_DELX" + WRTCMP_dy="$ESGgrid_DELY" fi fi @@ -1136,27 +1136,27 @@ predefined domain: GRID_GEN_METHOD = \"${GRID_GEN_METHOD}\" " - elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then + elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then # Values taken from pre-generated files in /scratch4/NCEPDEV/fv3-cam/save/Benjamin.Blake/regional_workflow/fix/fix_sar/guam/C768_grid.tile7.nc # With move to Hera, those files were lost; a backup can be found here: /scratch2/BMC/det/kavulich/fix/fix_sar # Longitude and latitude for center of domain - JPgrid_LON_CTR=146.0 - JPgrid_LAT_CTR=15.0 + ESGgrid_LON_CTR=146.0 + ESGgrid_LAT_CTR=15.0 # Projected grid spacing in meters...in the static files (e.g. "C768_grid.tile7.nc"), the "dx" is actually the resolution # of the supergrid, which is HALF of this dx (plus or minus some grid stretch factor) - JPgrid_DELX="3000.0" - JPgrid_DELY="3000.0" + ESGgrid_DELX="3000.0" + ESGgrid_DELY="3000.0" # Number of x and y points for your domain (halo not included); # Divide "supergrid" values from /scratch2/BMC/det/kavulich/fix/fix_sar/guam/C768_grid.tile7.halo4.nc by 2 and subtract 8 to eliminate halo - JPgrid_NX=432 # Supergrid value 880 - JPgrid_NY=360 # Supergrid value 736 + ESGgrid_NX=432 # Supergrid value 880 + ESGgrid_NY=360 # Supergrid value 736 # Number of halo points for a wide grid (before trimming)...this should almost always be 6 for now # Within the model we actually have a 4-point halo and a 3-point halo - JPgrid_WIDE_HALO_WIDTH=6 + ESGgrid_WIDE_HALO_WIDTH=6 # Side note: FV3 is lagrangian and vertical coordinates are dynamically remapped during model integration # 'ksplit' is the factor that determines the timestep for this process (divided @@ -1169,7 +1169,7 @@ predefined domain: DT_ATMOS="18" -#Factors for MPI decomposition. JPgrid_NX must be divisible by LAYOUT_X, JPgrid_NY must be divisible by LAYOUT_Y +#Factors for MPI decomposition. ESGgrid_NX must be divisible by LAYOUT_X, ESGgrid_NY must be divisible by LAYOUT_Y LAYOUT_X="16" LAYOUT_Y="12" #Take number of points on a tile (nx/lx*ny/ly), must divide by block size to get an integer. @@ -1187,18 +1187,18 @@ predefined domain: #lambert_conformal or rotated_latlon. lambert_conformal not well tested and probably doesn't work for our purposes WRTCMP_output_grid="lambert_conformal" #These should always be set the same as compute grid - WRTCMP_cen_lon="${JPgrid_LON_CTR}" - WRTCMP_cen_lat="${JPgrid_LAT_CTR}" - WRTCMP_stdlat1="${JPgrid_LAT_CTR}" - WRTCMP_stdlat2="${JPgrid_LAT_CTR}" + WRTCMP_cen_lon="${ESGgrid_LON_CTR}" + WRTCMP_cen_lat="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat1="${ESGgrid_LAT_CTR}" + WRTCMP_stdlat2="${ESGgrid_LAT_CTR}" #Write component grid must always be <= compute grid (without haloes) WRTCMP_nx="420" WRTCMP_ny="348" #Lower left latlon (southwest corner) Used /scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/dbrowse/fv3grid utility to find best value WRTCMP_lon_lwr_left="140" WRTCMP_lat_lwr_left="10" - WRTCMP_dx="$JPgrid_DELX" - WRTCMP_dy="$JPgrid_DELY" + WRTCMP_dx="$ESGgrid_DELX" + WRTCMP_dy="$ESGgrid_DELY" fi fi diff --git a/ush/setup.sh b/ush/setup.sh index 03a6cbd257..3ebc43be7b 100755 --- a/ush/setup.sh +++ b/ush/setup.sh @@ -3,7 +3,7 @@ # # This file defines and then calls a function that sets a secondary set # of parameters needed by the various scripts that are called by the -# FV3SAR rocoto community workflow. This secondary set of parameters is +# FV3-LAM rocoto community workflow. This secondary set of parameters is # calculated using the primary set of user-defined parameters in the de- # fault and custom experiment/workflow configuration scripts (whose file # names are defined below). This script then saves both sets of parame- @@ -59,7 +59,7 @@ cd_vrfy ${scrfunc_dir} # . ./set_cycle_dates.sh . ./set_gridparams_GFDLgrid.sh -. ./set_gridparams_JPgrid.sh +. ./set_gridparams_ESGgrid.sh . ./link_fix.sh . ./set_ozone_param.sh # @@ -642,7 +642,7 @@ NUM_CYCLES="${#ALL_CDATES[@]}" # Set various directories. # # HOMErrfs: -# Top directory of the clone of the FV3SAR workflow git repository. +# Top directory of the clone of the FV3-LAM workflow git repository. # # USHDIR: # Directory containing the shell scripts called by the workflow. @@ -663,21 +663,14 @@ NUM_CYCLES="${#ALL_CDATES[@]}" # Directory containing various executable files. # # TEMPLATE_DIR: -# Directory in which templates of various FV3SAR input files are locat- +# Directory in which templates of various FV3-LAM input files are locat- # ed. # # UFS_WTHR_MDL_DIR: -# Directory in which the (NEMS-enabled) FV3SAR application is located. +# Directory in which the (NEMS-enabled) FV3-LAM application is located. # This directory includes subdirectories for FV3, NEMS, and FMS. If # USE_CCPP is set to "TRUE", it also includes a subdirectory for CCPP. # -# FIXupp: -# System directory from which to copy necessary fixed files for UPP. -# -# FIXgsd: -# System directory from which to copy GSD physics-associated fixed files -# needed when running CCPP. -# #----------------------------------------------------------------------- # @@ -700,8 +693,6 @@ PARMDIR="$HOMErrfs/parm" MODULES_DIR="$HOMErrfs/modulefiles" EXECDIR="${SR_WX_APP_TOP_DIR}/exec" FIXrrfs="$HOMErrfs/fix" -FIXupp="$FIXrrfs/fix_upp" -FIXgsd="$FIXrrfs/fix_gsd" TEMPLATE_DIR="$USHDIR/templates" case $MACHINE in @@ -737,8 +728,8 @@ case $MACHINE in ;; "JET") - FIXgsm=${FIXgsm:-"/lfs4/HFIP/gsd-fv3-hfip/FV3/fix/fix_am"} - TOPO_DIR=${TOPO_DIR:-"/lfs4/HFIP/gsd-fv3-hfip/FV3/fix/fix_orog"} + FIXgsm=${FIXgsm:-"/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/fix_am"} + TOPO_DIR=${TOPO_DIR:-"/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/fix_orog"} SFC_CLIMO_INPUT_DIR=${SFC_CLIMO_INPUT_DIR:-"/lfs1/HFIP/hwrf-data/git/fv3gfs/fix/fix_sfc_climo"} ;; @@ -985,12 +976,12 @@ check_for_preexist_dir_file "$EXPTDIR" "${PREEXISTING_DIR_METHOD}" # FIXam: # This is the directory that will contain the fixed files or symlinks to # the fixed files containing various fields on global grids (which are -# usually much coarser than the native FV3SAR grid). +# usually much coarser than the native FV3-LAM grid). # -# FIXsar: +# FIXLAM: # This is the directory that will contain the fixed files or symlinks to # the fixed files containing the grid, orography, and surface climatology -# on the native FV3SAR grid. +# on the native FV3-LAM grid. # # CYCLE_BASEDIR: # The base directory in which the directories for the various cycles will @@ -1046,24 +1037,24 @@ Please ensure that path_resolved is an existing directory and then rerun the experiment generation script." fi - FIXsar="${FIXrrfs}/fix_sar/${EMC_GRID_NAME}" + FIXLAM="${FIXrrfs}/fix_lam/${EMC_GRID_NAME}" # # In NCO mode (i.e. if RUN_ENVIR set to "nco"), it is assumed that before -# running the experiment generation script, the path specified in FIXsar +# running the experiment generation script, the path specified in FIXLAM # already exists and is either itself the directory in which the fixed # grid, orography, and surface climatology files are located, or it is a # symlink to such a directory. Resolve any symlinks in the path specified -# by FIXsar and check that this is the case. +# by FIXLAM and check that this is the case. # - path_resolved=$( readlink -m "$FIXsar" ) + path_resolved=$( readlink -m "$FIXLAM" ) if [ ! -d "${path_resolved}" ]; then print_err_msg_exit "\ In order to be able to generate a forecast experiment in NCO mode (i.e. -when RUN_ENVIR set to \"nco\"), the path specified by FIXsar after resolving +when RUN_ENVIR set to \"nco\"), the path specified by FIXLAM after resolving all symlinks (path_resolved) must be an existing directory (but in this case isn't): RUN_ENVIR = \"${RUN_ENVIR}\" - FIXsar = \"$FIXsar\" + FIXLAM = \"$FIXLAM\" path_resolved = \"${path_resolved}\" Please ensure that path_resolved is an existing directory and then rerun the experiment generation script." @@ -1080,7 +1071,7 @@ the experiment generation script." else FIXam="${EXPTDIR}/fix_am" - FIXsar="${EXPTDIR}/fix_sar" + FIXLAM="${EXPTDIR}/fix_lam" CYCLE_BASEDIR="$EXPTDIR" COMROOT="" COMOUT_BASEDIR="" @@ -1307,22 +1298,22 @@ if [ "${RUN_ENVIR}" = "nco" ]; then if [ "${RUN_TASK_MAKE_GRID}" = "TRUE" ] || \ [ "${RUN_TASK_MAKE_GRID}" = "FALSE" -a \ - "${GRID_DIR}" != "$FIXsar" ]; then + "${GRID_DIR}" != "$FIXLAM" ]; then msg=" When RUN_ENVIR is set to \"nco\", it is assumed that grid files already -exist in the directory specified by FIXsar. Thus, the grid file genera- +exist in the directory specified by FIXLAM. Thus, the grid file genera- tion task must not be run (i.e. RUN_TASK_MAKE_GRID must be set to FALSE), and the directory in which to look for the grid files (i.e. -GRID_DIR) must be set to FIXsar. Current values for these quantities +GRID_DIR) must be set to FIXLAM. Current values for these quantities are: RUN_TASK_MAKE_GRID = \"${RUN_TASK_MAKE_GRID}\" GRID_DIR = \"${GRID_DIR}\" Resetting RUN_TASK_MAKE_GRID to \"FALSE\" and GRID_DIR to the contents -of FIXsar. Reset values are:" +of FIXLAM. Reset values are:" RUN_TASK_MAKE_GRID="FALSE" - GRID_DIR="$FIXsar" + GRID_DIR="$FIXLAM" msg="$msg"" RUN_TASK_MAKE_GRID = \"${RUN_TASK_MAKE_GRID}\" @@ -1335,22 +1326,22 @@ of FIXsar. Reset values are:" if [ "${RUN_TASK_MAKE_OROG}" = "TRUE" ] || \ [ "${RUN_TASK_MAKE_OROG}" = "FALSE" -a \ - "${OROG_DIR}" != "$FIXsar" ]; then + "${OROG_DIR}" != "$FIXLAM" ]; then msg=" When RUN_ENVIR is set to \"nco\", it is assumed that orography files al- -ready exist in the directory specified by FIXsar. Thus, the orography +ready exist in the directory specified by FIXLAM. Thus, the orography file generation task must not be run (i.e. RUN_TASK_MAKE_OROG must be set to FALSE), and the directory in which to look for the orography -files (i.e. OROG_DIR) must be set to FIXsar. Current values for these +files (i.e. OROG_DIR) must be set to FIXLAM. Current values for these quantities are: RUN_TASK_MAKE_OROG = \"${RUN_TASK_MAKE_OROG}\" OROG_DIR = \"${OROG_DIR}\" Resetting RUN_TASK_MAKE_OROG to \"FALSE\" and OROG_DIR to the contents -of FIXsar. Reset values are:" +of FIXLAM. Reset values are:" RUN_TASK_MAKE_OROG="FALSE" - OROG_DIR="$FIXsar" + OROG_DIR="$FIXLAM" msg="$msg"" RUN_TASK_MAKE_OROG = \"${RUN_TASK_MAKE_OROG}\" @@ -1363,22 +1354,22 @@ of FIXsar. Reset values are:" if [ "${RUN_TASK_MAKE_SFC_CLIMO}" = "TRUE" ] || \ [ "${RUN_TASK_MAKE_SFC_CLIMO}" = "FALSE" -a \ - "${SFC_CLIMO_DIR}" != "$FIXsar" ]; then + "${SFC_CLIMO_DIR}" != "$FIXLAM" ]; then msg=" When RUN_ENVIR is set to \"nco\", it is assumed that surface climatology -files already exist in the directory specified by FIXsar. Thus, the +files already exist in the directory specified by FIXLAM. Thus, the surface climatology file generation task must not be run (i.e. RUN_- TASK_MAKE_SFC_CLIMO must be set to FALSE), and the directory in which to look for the surface climatology files (i.e. SFC_CLIMO_DIR) must be set -to FIXsar. Current values for these quantities are: +to FIXLAM. Current values for these quantities are: RUN_TASK_MAKE_SFC_CLIMO = \"${RUN_TASK_MAKE_SFC_CLIMO}\" SFC_CLIMO_DIR = \"${SFC_CLIMO_DIR}\" Resetting RUN_TASK_MAKE_SFC_CLIMO to \"FALSE\" and SFC_CLIMO_DIR to the -contents of FIXsar. Reset values are:" +contents of FIXLAM. Reset values are:" RUN_TASK_MAKE_SFC_CLIMO="FALSE" - SFC_CLIMO_DIR="$FIXsar" + SFC_CLIMO_DIR="$FIXLAM" msg="$msg"" RUN_TASK_MAKE_SFC_CLIMO = \"${RUN_TASK_MAKE_SFC_CLIMO}\" @@ -1463,7 +1454,7 @@ fi # err_msg="\ The external model specified in EXTRN_MDL_NAME_ICS that provides initial -conditions (ICs) and surface fields to the FV3SAR is not supported: +conditions (ICs) and surface fields to the FV3-LAM is not supported: EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"" check_var_valid_value \ "EXTRN_MDL_NAME_ICS" "valid_vals_EXTRN_MDL_NAME_ICS" "${err_msg}" @@ -1476,7 +1467,7 @@ check_var_valid_value \ # err_msg="\ The external model specified in EXTRN_MDL_NAME_ICS that provides lateral -boundary conditions (LBCs) to the FV3SAR is not supported: +boundary conditions (LBCs) to the FV3-LAM is not supported: EXTRN_MDL_NAME_LBCS = \"${EXTRN_MDL_NAME_LBCS}\"" check_var_valid_value \ "EXTRN_MDL_NAME_LBCS" "valid_vals_EXTRN_MDL_NAME_LBCS" "${err_msg}" @@ -1569,7 +1560,7 @@ fi # # Any regional model must be supplied lateral boundary conditions (in # addition to initial conditions) to be able to perform a forecast. In -# the FV3SAR model, these boundary conditions (BCs) are supplied using a +# the FV3-LAM model, these boundary conditions (BCs) are supplied using a # "halo" of grid cells around the regional domain that extend beyond the # boundary of the domain. The model is formulated such that along with # files containing these BCs, it needs as input the following files (in @@ -1654,18 +1645,18 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then # #----------------------------------------------------------------------- # -elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then +elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then - set_gridparams_JPgrid \ - lon_ctr="${JPgrid_LON_CTR}" \ - lat_ctr="${JPgrid_LAT_CTR}" \ - nx="${JPgrid_NX}" \ - ny="${JPgrid_NY}" \ - halo_width="${JPgrid_WIDE_HALO_WIDTH}" \ - delx="${JPgrid_DELX}" \ - dely="${JPgrid_DELY}" \ - alpha="${JPgrid_ALPHA_PARAM}" \ - kappa="${JPgrid_KAPPA_PARAM}" \ + set_gridparams_ESGgrid \ + lon_ctr="${ESGgrid_LON_CTR}" \ + lat_ctr="${ESGgrid_LAT_CTR}" \ + nx="${ESGgrid_NX}" \ + ny="${ESGgrid_NY}" \ + halo_width="${ESGgrid_WIDE_HALO_WIDTH}" \ + delx="${ESGgrid_DELX}" \ + dely="${ESGgrid_DELY}" \ + alpha="${ESGgrid_ALPHA_PARAM}" \ + kappa="${ESGgrid_KAPPA_PARAM}" \ output_varname_lon_ctr="LON_CTR" \ output_varname_lat_ctr="LAT_CTR" \ output_varname_nx="NX" \ @@ -1685,10 +1676,10 @@ fi # #----------------------------------------------------------------------- # -RES_IN_FIXSAR_FILENAMES="" +RES_IN_FIXLAM_FILENAMES="" if [ "${RUN_ENVIR}" != "nco" ]; then - mkdir_vrfy -p "$FIXsar" + mkdir_vrfy -p "$FIXLAM" fi # #----------------------------------------------------------------------- @@ -1701,28 +1692,28 @@ if [ "${RUN_ENVIR}" = "nco" ]; then suffix="${DOT_OR_USCORE}mosaic.halo${NH3}.nc" glob_pattern="C*$suffix" - cd_vrfy $FIXsar + cd_vrfy $FIXLAM num_files=$( ls -1 ${glob_pattern} 2>/dev/null | wc -l ) if [ "${num_files}" -ne "1" ]; then print_err_msg_exit "\ -Exactly one file must exist in directory FIXsar matching the globbing +Exactly one file must exist in directory FIXLAM matching the globbing pattern glob_pattern: - FIXsar = \"${FIXsar}\" + FIXLAM = \"${FIXLAM}\" glob_pattern = \"${glob_pattern}\" num_files = ${num_files}" fi fn=$( ls -1 ${glob_pattern} ) - RES_IN_FIXSAR_FILENAMES=$( \ + RES_IN_FIXLAM_FILENAMES=$( \ printf "%s" $fn | sed -n -r -e "s/^C([0-9]*)$suffix/\1/p" ) if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ] && \ - [ "${GFDLgrid_RES}" -ne "${RES_IN_FIXSAR_FILENAMES}" ]; then + [ "${GFDLgrid_RES}" -ne "${RES_IN_FIXLAM_FILENAMES}" ]; then print_err_msg_exit "\ -The resolution extracted from the fixed file names (RES_IN_FIXSAR_FILENAMES) +The resolution extracted from the fixed file names (RES_IN_FIXLAM_FILENAMES) does not match the resolution specified by GFDLgrid_RES: GFDLgrid_RES = ${GFDLgrid_RES} - RES_IN_FIXSAR_FILENAMES = ${RES_IN_FIXSAR_FILENAMES}" + RES_IN_FIXLAM_FILENAMES = ${RES_IN_FIXLAM_FILENAMES}" fi else @@ -1730,7 +1721,7 @@ else #----------------------------------------------------------------------- # # If the grid file generation task in the workflow is going to be skipped -# (because pregenerated files are available), create links in the FIXsar +# (because pregenerated files are available), create links in the FIXLAM # directory to the pregenerated grid files. # #----------------------------------------------------------------------- @@ -1745,7 +1736,7 @@ else print_err_msg_exit "\ Call to function to create links to grid files failed." - RES_IN_FIXSAR_FILENAMES="${res_in_grid_fns}" + RES_IN_FIXLAM_FILENAMES="${res_in_grid_fns}" fi # @@ -1753,7 +1744,7 @@ else # # If the orography file generation task in the workflow is going to be # skipped (because pregenerated files are available), create links in -# the FIXsar directory to the pregenerated orography files. +# the FIXLAM directory to the pregenerated orography files. # #----------------------------------------------------------------------- # @@ -1767,16 +1758,16 @@ else print_err_msg_exit "\ Call to function to create links to orography files failed." - if [ ! -z "${RES_IN_FIXSAR_FILENAMES}" ] && \ - [ "${res_in_orog_fns}" -ne "${RES_IN_FIXSAR_FILENAMES}" ]; then + if [ ! -z "${RES_IN_FIXLAM_FILENAMES}" ] && \ + [ "${res_in_orog_fns}" -ne "${RES_IN_FIXLAM_FILENAMES}" ]; then print_err_msg_exit "\ The resolution extracted from the orography file names (res_in_orog_fns) does not match the resolution in other groups of files already consi- - dered (RES_IN_FIXSAR_FILENAMES): + dered (RES_IN_FIXLAM_FILENAMES): res_in_orog_fns = ${res_in_orog_fns} - RES_IN_FIXSAR_FILENAMES = ${RES_IN_FIXSAR_FILENAMES}" + RES_IN_FIXLAM_FILENAMES = ${RES_IN_FIXLAM_FILENAMES}" else - RES_IN_FIXSAR_FILENAMES="${res_in_orog_fns}" + RES_IN_FIXLAM_FILENAMES="${res_in_orog_fns}" fi fi @@ -1785,7 +1776,7 @@ else # # If the surface climatology file generation task in the workflow is # going to be skipped (because pregenerated files are available), create -# links in the FIXsar directory to the pregenerated surface climatology +# links in the FIXLAM directory to the pregenerated surface climatology # files. # #----------------------------------------------------------------------- @@ -1800,16 +1791,16 @@ else print_err_msg_exit "\ Call to function to create links to surface climatology files failed." - if [ ! -z "${RES_IN_FIXSAR_FILENAMES}" ] && \ - [ "${res_in_sfc_climo_fns}" -ne "${RES_IN_FIXSAR_FILENAMES}" ]; then + if [ ! -z "${RES_IN_FIXLAM_FILENAMES}" ] && \ + [ "${res_in_sfc_climo_fns}" -ne "${RES_IN_FIXLAM_FILENAMES}" ]; then print_err_msg_exit "\ The resolution extracted from the surface climatology file names (res_- in_sfc_climo_fns) does not match the resolution in other groups of files - already considered (RES_IN_FIXSAR_FILENAMES): + already considered (RES_IN_FIXLAM_FILENAMES): res_in_sfc_climo_fns = ${res_in_sfc_climo_fns} - RES_IN_FIXSAR_FILENAMES = ${RES_IN_FIXSAR_FILENAMES}" + RES_IN_FIXLAM_FILENAMES = ${RES_IN_FIXLAM_FILENAMES}" else - RES_IN_FIXSAR_FILENAMES="${res_in_sfc_climo_fns}" + RES_IN_FIXLAM_FILENAMES="${res_in_sfc_climo_fns}" fi fi @@ -1826,7 +1817,7 @@ fi # CRES="" if [ "${RUN_TASK_MAKE_GRID}" = "FALSE" ]; then - CRES="C${RES_IN_FIXSAR_FILENAMES}" + CRES="C${RES_IN_FIXLAM_FILENAMES}" fi @@ -2482,15 +2473,14 @@ MODULES_DIR="${MODULES_DIR}" EXECDIR="$EXECDIR" FIXrrfs="$FIXrrfs" FIXam="$FIXam" -FIXsar="$FIXsar" +FIXLAM="$FIXLAM" FIXgsm="$FIXgsm" -FIXupp="$FIXupp" -FIXgsd="$FIXgsd" COMROOT="$COMROOT" COMOUT_BASEDIR="${COMOUT_BASEDIR}" TEMPLATE_DIR="${TEMPLATE_DIR}" UFS_WTHR_MDL_DIR="${UFS_WTHR_MDL_DIR}" UFS_UTILS_DIR="${UFS_UTILS_DIR}" +EMC_POST_DIR="${EMC_POST_DIR}" CHGRES_DIR="${CHGRES_DIR}" SFC_CLIMO_INPUT_DIR="${SFC_CLIMO_INPUT_DIR}" TOPO_DIR=${TOPO_DIR} @@ -2568,7 +2558,7 @@ NY="${NY}" NHW="${NHW}" STRETCH_FAC="${STRETCH_FAC}" -RES_IN_FIXSAR_FILENAMES="${RES_IN_FIXSAR_FILENAMES}" +RES_IN_FIXLAM_FILENAMES="${RES_IN_FIXLAM_FILENAMES}" # # If running the make_grid task, CRES will be set to a null string du- # the grid generation step. It will later be set to an actual value af- @@ -2612,7 +2602,7 @@ EOM Heredoc (cat) command to append grid parameters to variable definitions file returned with a nonzero status." -elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then +elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then { cat << EOM >> ${GLOBAL_VAR_DEFNS_FP} # @@ -2662,7 +2652,7 @@ OZONE_PARAM="${OZONE_PARAM}" # directory in which the workflow scripts will look for the files generated # by the external model specified in EXTRN_MDL_NAME_ICS. These files will # be used to generate the input initial condition and surface files for -# the FV3SAR. +# the FV3-LAM. # #----------------------------------------------------------------------- # @@ -2674,7 +2664,7 @@ EXTRN_MDL_SYSBASEDIR_ICS="${EXTRN_MDL_SYSBASEDIR_ICS}" # directory in which the workflow scripts will look for the files generated # by the external model specified in EXTRN_MDL_NAME_LBCS. These files # will be used to generate the input lateral boundary condition files for -# the FV3SAR. +# the FV3-LAM. # #----------------------------------------------------------------------- # diff --git a/ush/templates/FV3SAR_wflow.xml b/ush/templates/FV3LAM_wflow.xml similarity index 99% rename from ush/templates/FV3SAR_wflow.xml rename to ush/templates/FV3LAM_wflow.xml index 1fcb15aef8..a5424a9653 100644 --- a/ush/templates/FV3SAR_wflow.xml +++ b/ush/templates/FV3LAM_wflow.xml @@ -81,7 +81,7 @@ tasks; and the "FCST" type is used for the RUN_FCST_TN task. {%- endfor %} - &LOGDIR;/FV3SAR_wflow.log + &LOGDIR;/FV3LAM_wflow.log