Skip to content

Commit

Permalink
Merge pull request #507 from dabail10/wavice2
Browse files Browse the repository at this point in the history
Update ice2wav maps
  • Loading branch information
jedwards4b authored Dec 9, 2024
2 parents d8b0155 + d4e7462 commit 18d5cb7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mediator/esmFldsExchange_cesm_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3033,7 +3033,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
if ( fldchk(is_local%wrap%FBexp(compwav) , 'Si_ifrac', rc=rc) .and. &
fldchk(is_local%wrap%FBImp(compice,compice ), 'Si_ifrac', rc=rc)) then
! By default will be using a custom map - but if one is not available, use a generated bilinear instead
call addmap_from(compice, 'Si_ifrac', compwav, mapbilnr, 'one', ice2wav_map)
call addmap_from(compice, 'Si_ifrac', compwav, mapbilnr_nstod, 'one', ice2wav_map)
call addmrg_to(compwav, 'Si_ifrac', mrg_from=compice, mrg_fld='Si_ifrac', mrg_type='copy')
end if
end if
Expand All @@ -3046,7 +3046,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
else
if ( fldchk(is_local%wrap%FBexp(compwav) , 'Si_thick', rc=rc) .and. &
fldchk(is_local%wrap%FBImp(compice,compice ), 'Si_thick', rc=rc)) then
call addmap_from(compice, 'Si_thick', compwav, mapbilnr, 'one', ice2wav_map)
call addmap_from(compice, 'Si_thick', compwav, mapbilnr_nstod, 'one', ice2wav_map)
call addmrg_to(compwav, 'Si_thick', mrg_from=compice, mrg_fld='Si_thick', mrg_type='copy')
end if
end if
Expand All @@ -3060,7 +3060,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
else
if (fldchk(is_local%wrap%FBexp(compwav) , 'Si_floediam', rc=rc) .and. &
fldchk(is_local%wrap%FBImp(compice,compice ), 'Si_floediam', rc=rc)) then
call addmap_from(compice, 'Si_floediam', compwav, mapbilnr, 'one', ice2wav_map)
call addmap_from(compice, 'Si_floediam', compwav, mapbilnr_nstod, 'one', ice2wav_map)
call addmrg_to(compwav, 'Si_floediam', mrg_from=compice, mrg_fld='Si_floediam', mrg_type='copy')
end if
end if
Expand Down

0 comments on commit 18d5cb7

Please sign in to comment.