Skip to content

Commit

Permalink
fix: update xgrid data arguments for FMS update (#95)
Browse files Browse the repository at this point in the history
  • Loading branch information
@abrooks1085
abrooks1085 authored Nov 21, 2023
1 parent 740edc2 commit 93ce364
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions full/atm_land_ice_flux_exchange.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2577,7 +2577,7 @@ subroutine flux_down_from_atmos (Time, Atm, Land, Ice, Atmos_boundary, Land_boun
call fms_xgrid_stock_move_ug( &
& FROM = fms_stock_constants_atm_stock(ISTOCK_WATER), &
& TO = fms_stock_constants_lnd_stock(ISTOCK_WATER), &
& DATA = (Land_boundary%lprec + Land_boundary%fprec), &
& stock_ug_data3d = (Land_boundary%lprec + Land_boundary%fprec), &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -2588,7 +2588,7 @@ subroutine flux_down_from_atmos (Time, Atm, Land, Ice, Atmos_boundary, Land_boun
call fms_xgrid_stock_move_ug( &
& FROM = fms_stock_constants_atm_stock(ISTOCK_HEAT), &
& TO = fms_stock_constants_lnd_stock(ISTOCK_HEAT), &
& DATA = (-Land_boundary%t_flux + Land_boundary%lw_flux + Land_boundary%sw_flux - Land_boundary%fprec*HLF), &
& stock_ug_data3d = (-Land_boundary%t_flux + Land_boundary%lw_flux + Land_boundary%sw_flux - Land_boundary%fprec*HLF), &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -2598,7 +2598,7 @@ subroutine flux_down_from_atmos (Time, Atm, Land, Ice, Atmos_boundary, Land_boun
call fms_xgrid_stock_move( &
& FROM = fms_stock_constants_atm_stock(ISTOCK_WATER), &
& TO = fms_stock_constants_lnd_stock(ISTOCK_WATER), &
& DATA = (Land_boundary%lprec + Land_boundary%fprec), &
& stock_data3d = (Land_boundary%lprec + Land_boundary%fprec), &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -2609,7 +2609,7 @@ subroutine flux_down_from_atmos (Time, Atm, Land, Ice, Atmos_boundary, Land_boun
call fms_xgrid_stock_move( &
& FROM = fms_stock_constants_atm_stock(ISTOCK_HEAT), &
& TO = fms_stock_constants_lnd_stock(ISTOCK_HEAT), &
& DATA = (-Land_boundary%t_flux + Land_boundary%lw_flux + Land_boundary%sw_flux - Land_boundary%fprec*HLF), &
& stock_data3d = (-Land_boundary%t_flux + Land_boundary%lw_flux + Land_boundary%sw_flux - Land_boundary%fprec*HLF), &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -2621,7 +2621,7 @@ subroutine flux_down_from_atmos (Time, Atm, Land, Ice, Atmos_boundary, Land_boun
call fms_xgrid_stock_move( &
& FROM = fms_stock_constants_atm_stock(ISTOCK_WATER), &
& TO = fms_stock_constants_ice_stock(ISTOCK_WATER), &
& DATA = (Ice_boundary%lprec + Ice_boundary%fprec), &
& stock_data3d = (Ice_boundary%lprec + Ice_boundary%fprec), &
& grid_index=X1_GRID_ICE, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -2632,7 +2632,7 @@ subroutine flux_down_from_atmos (Time, Atm, Land, Ice, Atmos_boundary, Land_boun
call fms_xgrid_stock_move( &
& FROM = fms_stock_constants_atm_stock(ISTOCK_HEAT), &
& TO = fms_stock_constants_ice_stock(ISTOCK_HEAT), &
& DATA = (-Ice_boundary%t_flux + Ice_boundary%lw_flux - Ice_boundary%fprec*HLF + Ice_boundary%sw_flux_vis_dir + &
& stock_data3d = (-Ice_boundary%t_flux + Ice_boundary%lw_flux - Ice_boundary%fprec*HLF + Ice_boundary%sw_flux_vis_dir + &
Ice_boundary%sw_flux_vis_dif + Ice_boundary%sw_flux_nir_dir + Ice_boundary%sw_flux_nir_dif), &
& grid_index=X1_GRID_ICE, &
& xmap=xmap_sfc, &
Expand Down Expand Up @@ -3097,7 +3097,7 @@ subroutine flux_up_to_atmos ( Time, Land, Ice, Land_Ice_Atmos_Boundary, Land_bou
call fms_xgrid_stock_move_ug( &
& TO = fms_stock_constants_atm_stock(ISTOCK_WATER), &
& FROM = fms_stock_constants_lnd_stock(ISTOCK_WATER), &
& DATA = data_lnd, &
& stock_ug_data3d = data_lnd, &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -3108,7 +3108,7 @@ subroutine flux_up_to_atmos ( Time, Land, Ice, Land_Ice_Atmos_Boundary, Land_bou
call fms_xgrid_stock_move_ug( &
& TO = fms_stock_constants_atm_stock(ISTOCK_HEAT), &
& FROM = fms_stock_constants_lnd_stock(ISTOCK_HEAT), &
& DATA = data_lnd * HLV, &
& stock_ug_data3d = data_lnd * HLV, &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -3123,7 +3123,7 @@ subroutine flux_up_to_atmos ( Time, Land, Ice, Land_Ice_Atmos_Boundary, Land_bou
call fms_xgrid_stock_move( &
& TO = fms_stock_constants_atm_stock(ISTOCK_WATER), &
& FROM = fms_stock_constants_lnd_stock(ISTOCK_WATER), &
& DATA = data_lnd, &
& stock_data3d = data_lnd, &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -3134,7 +3134,7 @@ subroutine flux_up_to_atmos ( Time, Land, Ice, Land_Ice_Atmos_Boundary, Land_bou
call fms_xgrid_stock_move( &
& TO = fms_stock_constants_atm_stock(ISTOCK_HEAT), &
& FROM = fms_stock_constants_lnd_stock(ISTOCK_HEAT), &
& DATA = data_lnd * HLV, &
& stock_data3d = data_lnd * HLV, &
& grid_index=X1_GRID_LND, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -3148,7 +3148,7 @@ subroutine flux_up_to_atmos ( Time, Land, Ice, Land_Ice_Atmos_Boundary, Land_bou
call fms_xgrid_stock_move( &
& TO = fms_stock_constants_atm_stock(ISTOCK_WATER), &
& FROM = fms_stock_constants_ice_stock(ISTOCK_WATER), &
& DATA = data_ice, &
& stock_data3d = data_ice, &
& grid_index=X1_GRID_ICE, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand All @@ -3159,7 +3159,7 @@ subroutine flux_up_to_atmos ( Time, Land, Ice, Land_Ice_Atmos_Boundary, Land_bou
call fms_xgrid_stock_move( &
& TO = fms_stock_constants_atm_stock(ISTOCK_HEAT), &
& FROM = fms_stock_constants_ice_stock(ISTOCK_HEAT), &
& DATA = data_ice * HLV, &
& stock_data3d = data_ice * HLV, &
& grid_index=X1_GRID_ICE, &
& xmap=xmap_sfc, &
& delta_t=Dt_atm, &
Expand Down
2 changes: 1 addition & 1 deletion full/land_ice_flux_exchange.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ subroutine flux_land_to_ice( Time, Land, Ice, Land_Ice_Boundary )
ice_buf(:,:,1) = Land_Ice_Boundary%runoff + Land_Ice_Boundary%calving
call fms_xgrid_stock_move(from=fms_stock_constants_lnd_stock(ISTOCK_WATER), to=fms_stock_constants_ice_stock(ISTOCK_WATER), &
& grid_index=X2_GRID_ICE, &
& data=ice_buf, &
& stock_data3d=ice_buf, &
& xmap=xmap_runoff, &
& delta_t=Dt_cpl, &
& from_side=ISTOCK_SIDE, to_side=ISTOCK_SIDE, &
Expand Down

0 comments on commit 93ce364

Please sign in to comment.