Skip to content

Commit 9a1d6ed

Browse files
committed
for CYGNSS sm obs, added call to scale_obs_sfmc_zscore() (clsm_ensupd_read_obs.F90)
1 parent e274718 commit 9a1d6ed

File tree

1 file changed

+59
-57
lines changed

1 file changed

+59
-57
lines changed

GEOSlandassim_GridComp/clsm_ensupd_read_obs.F90

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -9098,65 +9098,67 @@ subroutine read_obs( &
90989098

90999099

91009100
case ('ASCAT_SM_A', 'ASCAT_SM_D' )
9101-
9102-
call read_obs_sm_ASCAT( &
9103-
work_path, exp_id, &
9104-
date_time, dtstep_assim, N_catd, tile_coord, &
9105-
tile_grid_d, N_tile_in_cell_ij, tile_num_in_cell_ij, &
9106-
this_obs_param, &
9107-
found_obs, tmp_obs, tmp_std_obs )
9108-
9109-
! scale observations to model climatology
9110-
9111-
if (this_obs_param%scale .and. found_obs) then
9112-
9113-
scaled_obs = .true.
9114-
9115-
call scale_obs_sfmc_cdf( N_catd, tile_coord, this_obs_param, &
9116-
tmp_obs, tmp_std_obs )
9117-
9118-
end if
9119-
9101+
9102+
call read_obs_sm_ASCAT( &
9103+
work_path, exp_id, &
9104+
date_time, dtstep_assim, N_catd, tile_coord, &
9105+
tile_grid_d, N_tile_in_cell_ij, tile_num_in_cell_ij, &
9106+
this_obs_param, &
9107+
found_obs, tmp_obs, tmp_std_obs )
9108+
9109+
! scale observations to model climatology
9110+
9111+
if (this_obs_param%scale .and. found_obs) then
9112+
9113+
scaled_obs = .true.
9114+
9115+
call scale_obs_sfmc_cdf( N_catd, tile_coord, this_obs_param, &
9116+
tmp_obs, tmp_std_obs )
9117+
9118+
end if
9119+
91209120
case ('ASCAT_META_SM','ASCAT_METB_SM','ASCAT_METC_SM' )
9121-
9122-
call read_obs_sm_ASCAT_EUMET( &
9123-
date_time, dtstep_assim, N_catd, tile_coord, &
9124-
tile_grid_d, N_tile_in_cell_ij, tile_num_in_cell_ij, &
9125-
this_obs_param, &
9126-
found_obs, tmp_obs, tmp_std_obs, tmp_lon, tmp_lat, &
9127-
tmp_time)
9128-
9129-
! scale observations to model climatology
9130-
9131-
if (this_obs_param%scale .and. found_obs) then
9132-
9133-
scaled_obs = .true.
9134-
9135-
call scale_obs_sfmc_zscore( N_catd, tile_coord, &
9136-
date_time, this_obs_param, tmp_lon, tmp_lat, tmp_time, &
9137-
tmp_obs, tmp_std_obs )
9138-
9139-
end if
9140-
9121+
9122+
call read_obs_sm_ASCAT_EUMET( &
9123+
date_time, dtstep_assim, N_catd, tile_coord, &
9124+
tile_grid_d, N_tile_in_cell_ij, tile_num_in_cell_ij, &
9125+
this_obs_param, &
9126+
found_obs, tmp_obs, tmp_std_obs, tmp_lon, tmp_lat, &
9127+
tmp_time)
9128+
9129+
! scale observations to model climatology
9130+
9131+
if (this_obs_param%scale .and. found_obs) then
9132+
9133+
scaled_obs = .true.
9134+
9135+
call scale_obs_sfmc_zscore( N_catd, tile_coord, &
9136+
date_time, this_obs_param, tmp_lon, tmp_lat, tmp_time, &
9137+
tmp_obs, tmp_std_obs )
9138+
9139+
end if
9140+
91419141
case ('CYGNSS_SM_6hr','CYGNSS_SM_daily')
9142-
9143-
call read_obs_sm_CYGNSS( &
9144-
date_time, dtstep_assim, N_catd, tile_coord, &
9145-
tile_grid_d, N_tile_in_cell_ij, tile_num_in_cell_ij, &
9146-
this_obs_param, &
9147-
found_obs, tmp_obs, tmp_std_obs, tmp_lon, tmp_lat, &
9148-
tmp_time)
9149-
9150-
! scale observations to model climatology
9151-
9152-
if (this_obs_param%scale .and. found_obs) then
9153-
9154-
scaled_obs = .true.
9155-
9156-
! TODO: implement scaling for CYGNSS obs
9157-
9158-
end if
9159-
9142+
9143+
call read_obs_sm_CYGNSS( &
9144+
date_time, dtstep_assim, N_catd, tile_coord, &
9145+
tile_grid_d, N_tile_in_cell_ij, tile_num_in_cell_ij, &
9146+
this_obs_param, &
9147+
found_obs, tmp_obs, tmp_std_obs, tmp_lon, tmp_lat, &
9148+
tmp_time)
9149+
9150+
! scale observations to model climatology
9151+
9152+
if (this_obs_param%scale .and. found_obs) then
9153+
9154+
scaled_obs = .true.
9155+
9156+
call scale_obs_sfmc_zscore( N_catd, tile_coord, &
9157+
date_time, this_obs_param, tmp_lon, tmp_lat, tmp_time, &
9158+
tmp_obs, tmp_std_obs )
9159+
9160+
end if
9161+
91609162
case ('isccp_tskin_gswp2_v1')
91619163

91629164
call read_obs_isccp_tskin_gswp2_v1( &

0 commit comments

Comments
 (0)