Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
aefa0da
helfand derivatives
biljanaorescanin Jan 18, 2024
c38db94
cleanup
biljanaorescanin Jan 23, 2024
c891499
move calls to run1
biljanaorescanin Jan 29, 2024
a250940
remove prints
biljanaorescanin Jan 29, 2024
9084ad6
Merge branch 'develop' into feature/boresca_helfand
biljanaorescanin Mar 22, 2024
8f8c9ae
code clenup
biljanaorescanin Mar 28, 2024
8e45c15
more comments clenup
biljanaorescanin Mar 28, 2024
b5bd6fe
change small_TC and small_QC
weiyuan-jiang Apr 4, 2024
b066a23
change pert value
biljanaorescanin Apr 15, 2024
534f271
add timer to louis and helfand
weiyuan-jiang Apr 19, 2024
8999b44
Merge branch 'develop' into feature/boresca_helfand
biljanaorescanin Apr 25, 2024
f23520f
Merge branch 'develop' into feature/boresca_helfand
biljanaorescanin May 6, 2024
05883e2
minor cleanup of code for extra derivatives in helfsurface:
gmao-rreichle May 16, 2024
aa8254c
Merge branch 'develop' into feature/boresca_helfand
biljanaorescanin May 20, 2024
4782ab7
Merge branch 'develop' into feature/boresca_helfand
biljanaorescanin Jun 2, 2024
8a83687
add louis numerical
biljanaorescanin Jun 6, 2024
27ef5d2
Merge branch 'develop' into feature/boresca_louis
gmao-rreichle Jun 18, 2024
b6dab72
edited LONG_NAME for partial derivatives of surface turbulence exchan…
gmao-rreichle Jun 28, 2024
ec29868
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
gmao-rreichle Sep 5, 2024
137c169
fixed and cleaned up extra derivatives for Monin-Obukhov surface turb…
gmao-rreichle Sep 10, 2024
8ce54d2
fixed syntax errors in previous commit
gmao-rreichle Sep 10, 2024
14df049
fixed runtime error in previous commit (GEOS_CatchGridComp.F90)
gmao-rreichle Sep 10, 2024
5bafffe
fixed defaults for MOSFC_EXTRA_DERIVS_LAND (catch_wrap_state.F90, GEO…
gmao-rreichle Sep 10, 2024
3b6cced
fixed error in previous commit (catch_wrap_state.F90)
gmao-rreichle Sep 11, 2024
2c49fc8
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
biljanaorescanin Sep 11, 2024
10da0e6
added numerical derivs of Louis exchange coeffs based on just one add…
gmao-rreichle Sep 12, 2024
3a13696
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
gmao-rreichle Sep 16, 2024
2d5709e
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
biljanaorescanin Oct 4, 2024
0f5a8bf
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
gmao-rreichle Feb 26, 2025
6aebb70
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
biljanaorescanin Apr 1, 2025
f330d24
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
gmao-rreichle May 2, 2025
35d08c0
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
gmao-rreichle May 21, 2025
0cf2abb
cleaned up notes related to MOSFC_EXTRA_DERIVS_LAND (GEOS_CatchGridCo…
gmao-rreichle May 21, 2025
b3ef746
assert (limited) choice of MOSFC_EXTRA_DERIVS_LAND for CatchCN (catch…
gmao-rreichle May 21, 2025
1b57c53
added default values for MOSFC_EXTRA_DERIVS_LAND to GEOS_SurfaceGridC…
gmao-rreichle May 21, 2025
34d174f
renamed MOSFC_EXTRA_DERIVS_LAND to MOSFC_EXTRA_DERIVS_OFFL_LAND for c…
gmao-rreichle May 23, 2025
21639d9
minimal edits to improve clarity re. new rc variable MOSFC_EXTRA_DERI…
gmao-rreichle May 23, 2025
76c5738
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
gmao-rreichle Jun 10, 2025
a459eee
Merge branch 'develop' into feature/rreichle/surfturb_numerical_deriv…
sdrabenh Jun 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3916,7 +3916,7 @@ subroutine RUN1 ( GC, IMPORT, EXPORT, CLOCK, RC )
VERIFY_(STATUS)
Iam=trim(COMP_NAME)//"::RUN1"

! Get component's offline mode from its pvt internal state
! Get component's offline mode from its private internal state
call ESMF_UserCompGetInternalState(gc, 'CatchcnInternal', wrap, status)
VERIFY_(status)
catchcn_internal => wrap%ptr
Expand Down Expand Up @@ -4481,7 +4481,6 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
type(ESMF_Alarm) :: ALARM

integer :: IM,JM
integer :: incl_Louis_extra_derivs

real :: SCALE4Z0

Expand All @@ -4506,8 +4505,6 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_Get(MAPL, RUNALARM=ALARM, RC=STATUS)
VERIFY_(STATUS)

call MAPL_GetResource ( MAPL, incl_Louis_extra_derivs, Label="INCL_LOUIS_EXTRA_DERIVS:", DEFAULT=1, RC=STATUS)
VERIFY_(STATUS)
call MAPL_GetResource ( MAPL, SCALE4Z0, Label="SCALE4Z0:", DEFAULT=0.5, RC=STATUS)
VERIFY_(STATUS)

Expand Down Expand Up @@ -6155,7 +6152,7 @@ subroutine Driver ( RC )
ALWN(:,N) = -3.0*BLWN(:,N)*TC(:,N)
BLWN(:,N) = 4.0*BLWN(:,N)
end do
if(catchcn_internal%CHOOSEMOSFC==0 .and. incl_Louis_extra_derivs ==1) then
if(catchcn_internal%CHOOSEMOSFC==0 .and. catchcn_internal%MOSFC_EXTRA_DERIVS_OFFL_LAND==1) then
do N=1,NUM_SUBTILES
DEVSBT(:,N)=CQ(:,N)+max(0.0,-DCQ(:,N)*MAPL_VIREPS*TC(:,N)*(QC(:,N)-QA))
DEDTC(:,N) =max(0.0,-DCQ(:,N)*(1.+MAPL_VIREPS*QC(:,N))*(QC(:,N)-QA))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4445,7 +4445,6 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
type(MAPL_MetaComp),pointer :: MAPL
type(ESMF_Alarm) :: ALARM
integer :: IM,JM
integer :: incl_Louis_extra_derivs

real :: SCALE4Z0

Expand All @@ -4470,8 +4469,6 @@ subroutine RUN2 ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_Get(MAPL, RUNALARM=ALARM, RC=STATUS)
VERIFY_(STATUS)

call MAPL_GetResource ( MAPL, incl_Louis_extra_derivs, Label="INCL_LOUIS_EXTRA_DERIVS:", DEFAULT=1, RC=STATUS)
VERIFY_(STATUS)
call MAPL_GetResource ( MAPL, SCALE4Z0, Label="SCALE4Z0:", DEFAULT=0.5, RC=STATUS)
VERIFY_(STATUS)

Expand Down Expand Up @@ -6185,7 +6182,7 @@ subroutine Driver ( RC )
ALWN(:,N) = -3.0*BLWN(:,N)*TC(:,N)
BLWN(:,N) = 4.0*BLWN(:,N)
end do
if(catchcn_internal%CHOOSEMOSFC==0 .and. incl_Louis_extra_derivs ==1) then
if(catchcn_internal%CHOOSEMOSFC==0 .and. catchcn_internal%MOSFC_EXTRA_DERIVS_OFFL_LAND==1) then
do N=1,NUM_SUBTILES
DEVSBT(:,N)=CQ(:,N)+max(0.0,-DCQ(:,N)*MAPL_VIREPS*TC(:,N)*(QC(:,N)-QA))
DEDTC(:,N) =max(0.0,-DCQ(:,N)*(1.+MAPL_VIREPS*QC(:,N))*(QC(:,N)-QA))
Expand Down
Loading