Skip to content

Commit

Permalink
Merge src/carbon_zhang2.f90 of master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
crazyzlj committed Nov 29, 2023
1 parent 8d9570d commit ef0b871
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/carbon_zhang2.f90
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ subroutine carbon_zhang2
OX = 0.
!OX = 1 - (0.9* sol_z(k,j)/1000.) / (sol_z(k,j)/1000.+ exp(1.50-3.99*sol_z(k,j)/1000.))
!OX = 1 - (0.8* sol_z(k,j)) / (sol_z(k,j)+ exp(1.50-3.99*sol_z(k,j)))
OX=1.-0.8*((sol_z(kk,j)+sol_z(kk-1,j))/2)/(((sol_z(kk,j)+sol_z(kk-1,j))/2)+EXP(18.40961-0.023683632*((sol_z(kk,j)+sol_z(kk-1,j))/2)))
OX=1.-0.8*((sol_z(kk,j)+sol_z(kk-1,j))/2)/ &
& (((sol_z(kk,j)+sol_z(kk-1,j))/2)+EXP(18.40961-0.023683632*((sol_z(kk,j)+sol_z(kk-1,j))/2)))
!! compute combined factor
CS = 0.
CS=MIN(10.,SQRT(cdg*sut)*0.9*OX*X1)
Expand Down

0 comments on commit ef0b871

Please sign in to comment.