Ignore:
Timestamp:
2020-02-12T13:37:21+01:00 (13 months ago)
Author:
acc
Message:

Branch 2019/dev_r11943_MERGE_2019. A few changes to align the option 1 branch with the trunk@12371. These include a fix for #2317 (changes for LFRA freshwater correction) which was done at changeset 12279 on the trunk. These affect dynatf.F90, traatf.F90 and isfdynatf.F90 and pass SETTE but change results in all tests that use freshwater input (expected). All other changes on the trunk are present (where applicable) up to and including changeset 12367 (Solve #2380)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfdynatf.F90

    r12340 r12372  
    1414 
    1515   USE phycst , ONLY: r1_rau0         ! physical constant 
    16    USE dom_oce, ONLY: e3t, r1_e1e2t   ! time and space domain 
     16   USE dom_oce, ONLY: tmask, ssmask, ht, e3t, r1_e1e2t   ! time and space domain 
    1717 
    1818   USE in_out_manager 
     
    7777      ! 
    7878      ! compute fwf conservation correction 
    79       zfwfinc(:,:) = pcoef * ( pfwf_b(:,:) - pfwf(:,:) ) / phtbl(:,:) * r1_rau0 
     79      zfwfinc(:,:) = pcoef * ( pfwf_b(:,:) - pfwf(:,:) ) / ( ht(:,:) + 1._wp - ssmask(:,:) ) * r1_rau0 
    8080      ! 
    81       ! add the increment in the tbl 
    82       DO_3D_11_11( 1, jpkm1 ) 
    83          IF( ktop(ji,jj) <= jk .AND. jk < kbot(ji,jj)  ) THEN 
    84             pe3t_f(ji,jj,jk) = pe3t_f(ji,jj,jk) - zfwfinc(ji,jj) * e3t(ji,jj,jk,Kmm) 
    85          ELSEIF ( jk == kbot(ji,jj) ) THEN 
    86             pe3t_f(ji,jj,jk) = pe3t_f(ji,jj,jk) - zfwfinc(ji,jj) * e3t(ji,jj,jk,Kmm) * pfrac(ji,jj) 
    87          ENDIF 
    88       END_3D 
     81      ! add the increment 
     82      DO jk = 1, jpkm1 
     83         pe3t_f(:,:,jk) = pe3t_f(:,:,jk) - tmask(:,:,jk) * zfwfinc(:,:) * e3t(:,:,jk,Kmm) 
     84      END DO 
    8985      ! 
    9086   END SUBROUTINE isf_dynatf_mlt 
Note: See TracChangeset for help on using the changeset viewer.