Skip to content

Commit 3222d8c

Browse files
Add reader for surface meteorological forcing from S2S-3 (#138)
2 parents 094e489 + 2894843 commit 3222d8c

File tree

3 files changed

+285
-79
lines changed

3 files changed

+285
-79
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

1616
### Changed
1717

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

2122
### Fixed
2223

23-
- Fixed Restart = 1 when the domain is not global
24+
- Fixed Restart=1 when the domain is not global.
2425

2526
### Removed
2627

GEOSmetforce_GridComp/GEOS_MetforceGridComp.F90

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ subroutine Initialize(gc, import, export, clock, rc)
608608
integer :: local_nt, k, NUM_ENSEMBLE, i1, i2, j1, j2
609609
integer :: ForceDtStep
610610
type(met_force_type) :: mf_nodata
611-
logical :: MERRA_file_specs, ensemble_forcing
611+
logical :: MERRA_file_specs, S2S3_file_specs, ensemble_forcing
612612
logical :: backward_looking_fluxes
613613
real, pointer :: TileLats(:)
614614
real, pointer :: TileLons(:)
@@ -768,6 +768,7 @@ subroutine Initialize(gc, import, export, clock, rc)
768768
internal%mf%hinterp, &
769769
AEROSOL_DEPOSITION, &
770770
MERRA_file_specs, &
771+
S2S3_file_specs, &
771772
backward_looking_fluxes, &
772773
internal%mf%DataNxt, &
773774
.true. & ! init
@@ -776,7 +777,7 @@ subroutine Initialize(gc, import, export, clock, rc)
776777

777778
if (backward_looking_fluxes) &
778779
call LDAS_move_new_force_to_old( &
779-
MERRA_file_specs, AEROSOL_DEPOSITION, &
780+
MERRA_file_specs, S2S3_file_specs, AEROSOL_DEPOSITION, &
780781
internal%mf%DataNxt, internal%mf%DataPrv )
781782

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

854-
logical :: MERRA_file_specs
855+
logical :: MERRA_file_specs, S2S3_file_specs
855856
logical :: backward_looking_fluxes
856857
integer :: AEROSOL_DEPOSITION
857858
! Export pointers
@@ -995,6 +996,7 @@ subroutine Run(gc, import, export, clock, rc)
995996
internal%mf%hinterp, &
996997
AEROSOL_DEPOSITION, &
997998
MERRA_file_specs, &
999+
S2S3_file_specs, &
9981000
backward_looking_fluxes, &
9991001
internal%mf%DataNxt, &
10001002
.false. & ! init
@@ -1003,7 +1005,7 @@ subroutine Run(gc, import, export, clock, rc)
10031005

10041006
if (backward_looking_fluxes) &
10051007
call LDAS_move_new_force_to_old( &
1006-
MERRA_file_specs, AEROSOL_DEPOSITION, &
1008+
MERRA_file_specs, S2S3_file_specs, AEROSOL_DEPOSITION, &
10071009
internal%mf%DataNxt, internal%mf%DataPrv )
10081010

10091011
! -compute-average-zenith-angle-over-daylight-part-of-forcing-interval-

0 commit comments

Comments
 (0)