Add cryo terms to coupler budget #74
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,7 +53,9 @@ subroutine ocn_time_average_coupled_init(forcingPool)!{{{ | |
| real (kind=RKIND), dimension(:,:), pointer :: avgTracersSurfaceValue, avgSurfaceVelocity, avgSSHGradient, & | ||
| avgLandIceBoundaryLayerTracers, avgLandIceTracerTransferVelocities | ||
|
|
||
| real (kind=RKIND), dimension(:), pointer :: avgEffectiveDensityInLandIce, avgTotalFreshWaterTemperatureFlux, & | ||
| avgLandIceFreshwaterFlux, & | ||
| avgRemovedRiverRunoffFlux, avgRemovedIceRunoffFlux | ||
|
|
||
| integer :: iCell | ||
| integer, pointer :: nAccumulatedCoupled, nCells | ||
|
|
@@ -116,6 +118,33 @@ subroutine ocn_time_average_coupled_init(forcingPool)!{{{ | |
| !$omp end parallel | ||
| end if | ||
|
|
||
| ! Set up polar fields if necessary | ||
| if(trim(config_land_ice_flux_mode)=='standalone' .or. 'data') then | ||
|
There was a problem hiding this comment. @darincomeau, same issue here as below. This may explain why you still were having trouble with There was a problem hiding this comment. Yeah this is fixed locally, I just hadn't pushed it yet since I was still getting 0s. |
||
| call mpas_pool_get_array(forcingPool, 'avgLandIceFreshwaterFlux', avgLandIceFreshwaterFlux) | ||
|
|
||
| !$omp parallel | ||
| !$omp do schedule(runtime) | ||
| do iCell = 1, nCells | ||
| avgLandIceFreshwaterFlux(iCell) = 0.0_RKIND | ||
| end do | ||
| !$omp end do | ||
| !$omp end parallel | ||
| end if | ||
|
|
||
| if(config_remove_AIS_coupler_runoff) then | ||
| call mpas_pool_get_array(forcingPool, 'avgRemovedRiverRunoffFlux', avgRemovedRiverRunoffFlux) | ||
| call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffFlux', avgRemovedIceRunoffFlux) | ||
|
|
||
| !$omp parallel | ||
| !$omp do schedule(runtime) | ||
| do iCell = 1, nCells | ||
| avgRemovedRiverRunoffFlux(iCell) = 0.0_RKIND | ||
| avgRemovedIceRunoffFlux(iCell) = 0.0_RKIND | ||
| end do | ||
| !$omp end do | ||
| !$omp end parallel | ||
| end if | ||
|
|
||
| ! set up BGC coupling fields if necessary | ||
| if (config_use_ecosysTracers) then | ||
|
|
||
|
|
@@ -215,7 +244,10 @@ subroutine ocn_time_average_coupled_accumulate(statePool, forcingPool, timeLevel | |
| real (kind=RKIND), dimension(:,:), pointer :: & | ||
| avgLandIceBoundaryLayerTracers, avgLandIceTracerTransferVelocities | ||
| real (kind=RKIND), dimension(:), pointer :: effectiveDensityInLandIce, avgEffectiveDensityInLandIce, & | ||
| totalFreshWaterTemperatureFlux, avgTotalFreshWaterTemperatureFlux, & | ||
| landIceFreshwaterFlux, avgLandIceFreshwaterFlux, & | ||
| removedRiverRunoffFlux, avgRemovedRiverRunoffFlux, & | ||
| removedIceRunoffFlux, avgRemovedIceRunoffFlux | ||
|
|
||
| type (mpas_pool_type), pointer :: tracersPool | ||
|
|
||
|
|
@@ -311,6 +343,48 @@ subroutine ocn_time_average_coupled_accumulate(statePool, forcingPool, timeLevel | |
| !$omp end parallel | ||
| end if | ||
|
|
||
| ! Accumulate polar fields if necessary | ||
| if(trim(config_land_ice_flux_mode) == 'standalone' .or. 'data') then | ||
xylar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| call mpas_pool_get_array(forcingPool, 'avgLandIceFreshwaterFlux', avgLandIceFreshwaterFlux) | ||
|
|
||
| if(trim(config_land_ice_flux_mode) == 'standalone') then | ||
| call mpas_pool_get_array(forcingPool, 'landIceFreshwaterFlux', landIceFreshwaterFlux) | ||
| endif | ||
|
|
||
| ! load data melt rates if used | ||
|
There was a problem hiding this comment. this didn't work, stays 0 when data ISMF is used. There was a problem hiding this comment. You should be able to use |
||
| if(trim(config_land_ice_flux_mode) == 'data') then | ||
| call mpas_pool_get_array(forcingPool, 'dataLandIceFreshwaterFlux', landIceFreshwaterFlux) | ||
| endif | ||
|
|
||
| !$omp parallel | ||
| !$omp do schedule(runtime) | ||
| do iCell = 1, nCells | ||
| avgLandIceFreshwaterFlux(iCell) = ( avgLandIceFreshwaterFlux(iCell) * nAccumulatedCoupled & | ||
| + landIceFreshwaterFlux(iCell) ) / ( nAccumulatedCoupled + 1) | ||
| end do | ||
| !$omp end do | ||
| !$omp end parallel | ||
| end if | ||
|
|
||
| if (config_remove_AIS_coupler_runoff) then | ||
| call mpas_pool_get_array(forcingPool, 'avgRemovedRiverRunoffFlux', avgRemovedRiverRunoffFlux) | ||
| call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffFlux', avgRemovedIceRunoffFlux) | ||
| call mpas_pool_get_array(forcingPool, 'removedRiverRunoffFlux', removedRiverRunoffFlux) | ||
| call mpas_pool_get_array(forcingPool, 'removedIceRunoffFlux', removedIceRunoffFlux) | ||
|
|
||
| !$omp parallel | ||
| !$omp do schedule(runtime) | ||
| do iCell = 1, nCells | ||
| avgRemovedRiverRunoffFlux(iCell) = ( avgRemovedRiverRunoffFlux(iCell) * nAccumulatedCoupled & | ||
| + removedRiverRunoffFlux(iCell) ) / ( nAccumulatedCoupled + 1) | ||
| avgRemovedIceRunoffFlux(iCell) = ( avgRemovedIceRunoffFlux(iCell) * nAccumulatedCoupled & | ||
| + removedIceRunoffFlux(iCell) ) / ( nAccumulatedCoupled + 1) | ||
| end do | ||
| !$omp end do | ||
| !$omp end parallel | ||
|
|
||
| end if | ||
|
|
||
| ! accumulate BGC coupling fields if necessary | ||
| if (config_use_ecosysTracers) then | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noting I added 'P' for the ice-shelf melt term; I'm not sure if this matters with the way I did the scaling below. The removed runoff terms do not have P.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just tested without the 'P' and get the same answers, so I'm removing this.