Changes between Initial Version and Version 1 of Ticket #2434


Ignore:
Timestamp:
2020-06-09T09:14:26+02:00 (5 months ago)
Author:
smasson
Comment:

I agree. I addition, the following line should be deleted.

   qns_tot(:,:) = qns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1)

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #2434 – Description

    initial v1  
    1010{{{#!f 
    1111CASE( 'oce and ice' ) ! the total flux is computed from ocean and ice fluxes 
    12 zqns_tot(:,:) = ziceld(:,:) * frcv(jpr_qnsoce)%z3(:,:,1) 
    13 IF ( TRIM(sn_rcv_qns%clcat) == 'yes' ) THEN 
    14 DO jl=1,jpl 
    15 zqns_tot(:,: ) = zqns_tot(:,:) + a_i(:,:,jl) * frcv(jpr_qnsice)%z3(:,:,jl) 
    16 zqns_ice(:,:,jl) = frcv(jpr_qnsice)%z3(:,:,jl) 
    17 ENDDO 
    18 ELSE 
    19 qns_tot(:,:) = qns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
    20 DO jl = 1, jpl 
    21 zqns_tot(:,: ) = zqns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
    22 zqns_ice(:,:,jl) = frcv(jpr_qnsice)%z3(:,:,1) 
    23 END DO 
    24 ENDIF 
     12   zqns_tot(:,:) = ziceld(:,:) * frcv(jpr_qnsoce)%z3(:,:,1) 
     13   IF ( TRIM(sn_rcv_qns%clcat) == 'yes' ) THEN 
     14      DO jl=1,jpl 
     15         zqns_tot(:,: ) = zqns_tot(:,:) + a_i(:,:,jl) * frcv(jpr_qnsice)%z3(:,:,jl) 
     16         zqns_ice(:,:,jl) = frcv(jpr_qnsice)%z3(:,:,jl) 
     17      END DO 
     18   ELSE 
     19      qns_tot(:,:) = qns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
     20      DO jl = 1, jpl 
     21         zqns_tot(:,: ) = zqns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
     22         zqns_ice(:,:,jl) = frcv(jpr_qnsice)%z3(:,:,1) 
     23      END DO 
     24   ENDIF 
    2525}}} 
    2626 
     
    3939{{{#!f 
    4040ELSE 
    41 qns_tot(:,:) = qns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
    42 zqns_tot(:,: ) = zqns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
    43 DO jl = 1, jpl 
    44 zqns_ice(:,:,jl) = frcv(jpr_qnsice)%z3(:,:,1) 
    45 END DO 
     41   qns_tot(:,:) = qns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
     42   zqns_tot(:,: ) = zqns_tot(:,:) + picefr(:,:) * frcv(jpr_qnsice)%z3(:,:,1) 
     43   DO jl = 1, jpl 
     44      zqns_ice(:,:,jl) = frcv(jpr_qnsice)%z3(:,:,1) 
     45   END DO 
    4646ENDIF 
    4747}}}