Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert most regridding and search calls in surface interp to single calls #572

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
631816e
First test for the regrid_many capability.
LarissaReames-NOAA Apr 29, 2021
bab678c
Added search_many routine. Extended use to regridding over water. Cod…
LarissaReames-NOAA May 3, 2021
479c36a
Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …
LarissaReames-NOAA May 4, 2021
063a56b
Updated documentation for regrid_many and search_many
LarissaReames-NOAA May 5, 2021
3da2c1c
Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …
LarissaReames-NOAA May 5, 2021
ae70612
Merge branch 'feature/sfc_regrid_many' of https://github.com/LarissaR…
LarissaReames-NOAA May 5, 2021
8ccb3f0
Extended use of regrid_many and search_many to all masked regridding …
LarissaReames-NOAA May 7, 2021
caf5075
Update to fix all compile and run-time bugs. Compiles and completes e…
LarissaReames-NOAA May 10, 2021
8470fbd
All changes utilizing FieldBundle now compile and run without errors …
LarissaReames-NOAA May 10, 2021
4bc331c
Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …
LarissaReames-NOAA Aug 9, 2021
81a0cd5
Merge pull request #16 from NOAA-EMC/develop
LarissaReames-NOAA Aug 10, 2021
83a4569
Big fix for logical indexing.
LarissaReames-NOAA Aug 12, 2021
470de59
Merge branch 'feature/sfc_regrid_many' of https://github.com/LarissaR…
LarissaReames-NOAA Aug 12, 2021
b5cbc64
Update doxygen comments for array of pointers.
LarissaReames-NOAA Aug 12, 2021
bf098e4
Merge branch 'NOAA-EMC:develop' into feature/sfc_regrid_many
LarissaReames-NOAA Aug 12, 2021
5d46d72
First commit of regrid_many unit tests
LarissaReames-NOAA Aug 13, 2021
8694f77
Bug fixes for regrid_many unit test. Test compiles and passes on Hera…
LarissaReames-NOAA Aug 13, 2021
6bf73f0
Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …
LarissaReames-NOAA Aug 13, 2021
181ee25
Fix for CMake file
LarissaReames-NOAA Aug 13, 2021
46b4fbf
Attempt to fix soil_type regrid bundle failure
LarissaReames-NOAA Aug 13, 2021
053d381
Added unit test for search_many
LarissaReames-NOAA Aug 20, 2021
e78f5b9
Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …
LarissaReames-NOAA Aug 20, 2021
e34165d
Re-remove surface_interp unit test
LarissaReames-NOAA Aug 20, 2021
9f3de54
Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …
LarissaReames-NOAA Aug 20, 2021
5f1e270
Fixed but for processing of landice field bundle. Updated language fo…
LarissaReames-NOAA Aug 20, 2021
a3e4417
Merge branch 'NOAA-EMC:develop' into feature/sfc_regrid_many
LarissaReames-NOAA Sep 2, 2021
75fddb2
Merge branch 'NOAA-EMC:develop' into feature/sfc_regrid_many
LarissaReames-NOAA Sep 13, 2021
7e51431
Merge branch 'NOAA-EMC:develop' into feature/sfc_regrid_many
LarissaReames-NOAA Oct 4, 2021
b923878
Split if statement with optional variable in to two if statements to …
LarissaReames-NOAA Oct 4, 2021
7bbf5bf
Removed unnecessary regrid_many option doreplace
LarissaReames-NOAA Oct 7, 2021
4afbf5e
Merge branch 'develop' of https://github.com/NOAA-EMC/UFS_UTILS into …
LarissaReames-NOAA Oct 7, 2021
74f33fb
Added additional commentary in search_many to make if branches easier…
LarissaReames-NOAA Oct 8, 2021
eed1d3c
Merge branch 'NOAA-EMC:develop' into feature/sfc_regrid_many
LarissaReames-NOAA Oct 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions sorc/chgres_cube.fd/input_data.F90
Original file line number Diff line number Diff line change
Expand Up @@ -72,33 +72,33 @@ module input_data
!< Default is igbp.
integer, parameter :: ICET_DEFAULT = 265.0 !< Default value of soil and skin
!< temperature (K) over ice.
type(esmf_field), public :: canopy_mc_input_grid !< canopy moist content
type(esmf_field), public :: f10m_input_grid !< log((z0+10)*1/z0)
type(esmf_field), public :: ffmm_input_grid !< log((z0+z1)*1/z0)
type(esmf_field), public :: canopy_mc_input_grid !< canopy moist content
type(esmf_field), public :: f10m_input_grid !< log((z0+10)*1/z0)
type(esmf_field), public :: ffmm_input_grid !< log((z0+z1)*1/z0)
!! See sfc_diff.f for details.
type(esmf_field), public :: landsea_mask_input_grid !< land sea mask;
type(esmf_field), public :: landsea_mask_input_grid !< land sea mask;
!! 0-water, 1-land, 2-ice
type(esmf_field), public :: q2m_input_grid !< 2-m spec hum
type(esmf_field), public :: seaice_depth_input_grid !< sea ice depth
type(esmf_field), public :: seaice_fract_input_grid !< sea ice fraction
type(esmf_field), public :: seaice_skin_temp_input_grid !< sea ice skin temp
type(esmf_field), public :: skin_temp_input_grid !< skin temp/sst
type(esmf_field), public :: snow_depth_input_grid !< snow dpeth
type(esmf_field), public :: snow_liq_equiv_input_grid !< snow liq equiv depth
type(esmf_field), public :: soil_temp_input_grid !< 3-d soil temp
type(esmf_field), public :: soil_type_input_grid !< soil type
type(esmf_field), public :: soilm_liq_input_grid !< 3-d liquid soil moisture
type(esmf_field), public :: soilm_tot_input_grid !< 3-d total soil moisture
type(esmf_field), public :: srflag_input_grid !< snow/rain flag
type(esmf_field), public :: t2m_input_grid !< 2-m temperature
type(esmf_field), public :: tprcp_input_grid !< precip
type(esmf_field), public :: ustar_input_grid !< fric velocity
type(esmf_field), public :: veg_type_input_grid !< vegetation type
type(esmf_field), public :: z0_input_grid !< roughness length
type(esmf_field), public :: veg_greenness_input_grid !< vegetation fraction
type(esmf_field), public :: lai_input_grid !< leaf area index
type(esmf_field), public :: max_veg_greenness_input_grid !< shdmax
type(esmf_field), public :: min_veg_greenness_input_grid !< shdmin
type(esmf_field), public :: q2m_input_grid !< 2-m spec hum
type(esmf_field), public :: seaice_depth_input_grid !< sea ice depth
type(esmf_field), public :: seaice_fract_input_grid !< sea ice fraction
type(esmf_field), public :: seaice_skin_temp_input_grid !< sea ice skin temp
type(esmf_field), public :: skin_temp_input_grid !< skin temp/sst
type(esmf_field), public :: snow_depth_input_grid !< snow dpeth
type(esmf_field), public :: snow_liq_equiv_input_grid !< snow liq equiv depth
type(esmf_field), public :: soil_temp_input_grid !< 3-d soil temp
type(esmf_field), public :: soil_type_input_grid !< soil type
type(esmf_field), public :: soilm_liq_input_grid !< 3-d liquid soil moisture
type(esmf_field), public :: soilm_tot_input_grid !< 3-d total soil moisture
type(esmf_field), public :: srflag_input_grid !< snow/rain flag
type(esmf_field), public :: t2m_input_grid !< 2-m temperature
type(esmf_field), public :: tprcp_input_grid !< precip
type(esmf_field), public :: ustar_input_grid !< fric velocity
type(esmf_field), public :: veg_type_input_grid !< vegetation type
type(esmf_field), public :: z0_input_grid !< roughness length
type(esmf_field), public :: veg_greenness_input_grid !< vegetation fraction
type(esmf_field), public :: lai_input_grid !< leaf area index
type(esmf_field), public :: max_veg_greenness_input_grid !< shdmax
type(esmf_field), public :: min_veg_greenness_input_grid !< shdmin

integer, public :: lsoil_input=4 !< number of soil layers, no longer hardwired to allow
!! for 7 layers of soil for the RUC LSM
Expand All @@ -107,25 +107,25 @@ module input_data

! Fields associated with the nst model.

type(esmf_field), public :: c_d_input_grid !< Coefficient 2 to calculate d(tz)/d(ts)
type(esmf_field), public :: c_0_input_grid !< Coefficient 1 to calculate d(tz)/d(ts)
type(esmf_field), public :: d_conv_input_grid !< Thickness of free convection layer
type(esmf_field), public :: dt_cool_input_grid !< Sub-layer cooling amount
type(esmf_field), public :: ifd_input_grid !< Model mode index. 0-diurnal model not
type(esmf_field), public :: c_d_input_grid !< Coefficient 2 to calculate d(tz)/d(ts)
type(esmf_field), public :: c_0_input_grid !< Coefficient 1 to calculate d(tz)/d(ts)
type(esmf_field), public :: d_conv_input_grid !< Thickness of free convection layer
type(esmf_field), public :: dt_cool_input_grid !< Sub-layer cooling amount
type(esmf_field), public :: ifd_input_grid !< Model mode index. 0-diurnal model not
!< started; 1-diurnal model started.
type(esmf_field), public :: qrain_input_grid !< Sensible heat flux due to rainfall
type(esmf_field), public :: tref_input_grid !< Reference temperature
type(esmf_field), public :: w_d_input_grid !< Coefficient 4 to calculate d(tz)/d(ts)
type(esmf_field), public :: w_0_input_grid !< Coefficient 3 to calculate d(tz)/d(ts)
type(esmf_field), public :: xs_input_grid !< Salinity content in diurnal thermocline layer
type(esmf_field), public :: xt_input_grid !< Heat content in diurnal thermocline layer
type(esmf_field), public :: xu_input_grid !< u-current content in diurnal thermocline layer
type(esmf_field), public :: xv_input_grid !< v-current content in diurnal thermocline layer
type(esmf_field), public :: xz_input_grid !< Diurnal thermocline layer thickness
type(esmf_field), public :: xtts_input_grid !< d(xt)/d(ts)
type(esmf_field), public :: xzts_input_grid !< d(xz)/d(ts)
type(esmf_field), public :: z_c_input_grid !< Sub-layer cooling thickness
type(esmf_field), public :: zm_input_grid !< Oceanic mixed layer depth
type(esmf_field), public :: qrain_input_grid !< Sensible heat flux due to rainfall
type(esmf_field), public :: tref_input_grid !< Reference temperature
type(esmf_field), public :: w_d_input_grid !< Coefficient 4 to calculate d(tz)/d(ts)
type(esmf_field), public :: w_0_input_grid !< Coefficient 3 to calculate d(tz)/d(ts)
type(esmf_field), public :: xs_input_grid !< Salinity content in diurnal thermocline layer
type(esmf_field), public :: xt_input_grid !< Heat content in diurnal thermocline layer
type(esmf_field), public :: xu_input_grid !< u-current content in diurnal thermocline layer
type(esmf_field), public :: xv_input_grid !< v-current content in diurnal thermocline layer
type(esmf_field), public :: xz_input_grid !< Diurnal thermocline layer thickness
type(esmf_field), public :: xtts_input_grid !< d(xt)/d(ts)
type(esmf_field), public :: xzts_input_grid !< d(xz)/d(ts)
type(esmf_field), public :: z_c_input_grid !< Sub-layer cooling thickness
type(esmf_field), public :: zm_input_grid !< Oceanic mixed layer depth

public :: read_input_atm_data
public :: cleanup_input_atm_data
Expand Down Expand Up @@ -6512,7 +6512,7 @@ subroutine handle_grib_error(vname,lev,method,value,varnum, iret,var,var8,var3d)
else
call error_handler("ERROR USING MISSING_VAR_METHOD. PLEASE SET VALUES IN" // &
" VARMAP TABLE TO ONE OF: set_to_fill, set_to_NaN,"// &
" , skip, or stop.", 1)
" , intrp, skip, or stop.", 1)
endif

end subroutine handle_grib_error
Expand Down
Loading