Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Cleaned up ldas_setup. Split it to ldas.py and setup_utils.py,
- Cleaned up ldas_setup. Split out ldas.py and setup_utils.py.
- Added reader for surface meteorological forcing from S2S-3.
- Update `GEOSlandassim_GridComp/io_hdf5.F90` to allow for use with HDF5 1.14

### Fixed

- Fixed Restart = 1 when the domain is not global
- Fixed Restart=1 when the domain is not global.

### Removed

Expand Down
10 changes: 6 additions & 4 deletions GEOSmetforce_GridComp/GEOS_MetforceGridComp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ subroutine Initialize(gc, import, export, clock, rc)
integer :: local_nt, k, NUM_ENSEMBLE, i1, i2, j1, j2
integer :: ForceDtStep
type(met_force_type) :: mf_nodata
logical :: MERRA_file_specs, ensemble_forcing
logical :: MERRA_file_specs, S2S3_file_specs, ensemble_forcing
logical :: backward_looking_fluxes
real, pointer :: TileLats(:)
real, pointer :: TileLons(:)
Expand Down Expand Up @@ -768,6 +768,7 @@ subroutine Initialize(gc, import, export, clock, rc)
internal%mf%hinterp, &
AEROSOL_DEPOSITION, &
MERRA_file_specs, &
S2S3_file_specs, &
backward_looking_fluxes, &
internal%mf%DataNxt, &
.true. & ! init
Expand All @@ -776,7 +777,7 @@ subroutine Initialize(gc, import, export, clock, rc)

if (backward_looking_fluxes) &
call LDAS_move_new_force_to_old( &
MERRA_file_specs, AEROSOL_DEPOSITION, &
MERRA_file_specs, S2S3_file_specs, AEROSOL_DEPOSITION, &
internal%mf%DataNxt, internal%mf%DataPrv )

! Turn timer off
Expand Down Expand Up @@ -851,7 +852,7 @@ subroutine Run(gc, import, export, clock, rc)
type(met_force_type), pointer, contiguous :: DataTmp(:)=>null()
type(met_force_type) :: mf_nodata

logical :: MERRA_file_specs
logical :: MERRA_file_specs, S2S3_file_specs
logical :: backward_looking_fluxes
integer :: AEROSOL_DEPOSITION
! Export pointers
Expand Down Expand Up @@ -995,6 +996,7 @@ subroutine Run(gc, import, export, clock, rc)
internal%mf%hinterp, &
AEROSOL_DEPOSITION, &
MERRA_file_specs, &
S2S3_file_specs, &
backward_looking_fluxes, &
internal%mf%DataNxt, &
.false. & ! init
Expand All @@ -1003,7 +1005,7 @@ subroutine Run(gc, import, export, clock, rc)

if (backward_looking_fluxes) &
call LDAS_move_new_force_to_old( &
MERRA_file_specs, AEROSOL_DEPOSITION, &
MERRA_file_specs, S2S3_file_specs, AEROSOL_DEPOSITION, &
internal%mf%DataNxt, internal%mf%DataPrv )

! -compute-average-zenith-angle-over-daylight-part-of-forcing-interval-
Expand Down
Loading