Skip to content

Commit

Permalink
bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@biljanaorescanin
biljanaorescanin committed Dec 21, 2021
1 parent e32e95f commit af94537
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6495,10 +6495,10 @@ subroutine Driver ( RC )

! gkw: obtain catchment area fractions and soil moisture
! ------------------------------------------------------
call catch_calc_soil_moist( ntiles, veg1, dzsf, vgwmax, cdcr1, cdcr2, psis, bee, poros, wpwet, &
ars1, ars2, ars3, ara1, ara2, ara3, ara4, arw1, arw2, arw3, arw4, bf1, bf2, &
srfexc, rzexc, catdef, car1, car2, car4, sfmc, rzmc, prmc, &
SWSRF1OUT=SWSRF1, SWSRF2OUT=SWSRF2, SWSRF4OUT=SWSRF4 )
call catch_calc_soil_moist( ntiles, veg1, dzsf, vgwmax, cdcr1, cdcr2, psis, bee, poros, wpwet, &
ars1, ars2, ars3, ara1, ara2, ara3, ara4, arw1, arw2, arw3, arw4, bf1, bf2, &
srfexc, rzexc, catdef, car1, car2, car4, sfmc, rzmc, prmc )


! obtain saturated canopy resistance following Farquhar, CLM4 implementation

Expand Down

2 comments on commit af94537

@gmao-rreichle
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@biljanaorescanin, @gmao-jkolassa, and @rdkoster:
I'm reviewing the latest "peat" branch and I'm wondering why the optional "swsrf[x]out" variables were removed here.
This seems to be a non-zero-diff change of the CatchCNCLM45 model. Alas, the commit message ("bug fix") is not informative.
If it is a bug in the CatchCNCLM45 implementation, the "peat" branch is not the place to fix it.
Note that this non-zero-diff change would not be revealed in @biljanaorescanin's 0-diff testing against Sarith's output because this test is not using CatchCN.
Can you please let me know more about why this was removed?
-- Rolf

@gmao-jkolassa
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot comment on why this was removed, but the SWSRF variables are needed in preparing the inputs for the calls to compute_rc (the CN routine that computes the photosynthesis and stomatal conductance) and the CN_Driver in CatchCNCLM45, so I think these arguments should be kept here. I am going to speculate that the preparation of the peat branch started when we only had CatchCNCLM40 - which does not need these variables - and that that is the reason they are missing here.

Please sign in to comment.