New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 9036 – NEMO

Changeset 9036


Ignore:
Timestamp:
2017-12-14T12:07:21+01:00 (7 years ago)
Author:
acc
Message:

Branch 2017/dev_merge_2017. Fix next compilation issue in dynspg_ts.F90

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    r9035 r9036  
    523523      ! Note that the "unclipped" bottom friction parameter is used even with explicit drag 
    524524      IF( ln_wd_il ) THEN 
    525         zu_frc(:,:) = zu_frc(:,:) + MAX(r1_hu_n(:,:) * bfrua(:,:),-1._wp / rdtbt) * zwx(:,:) *  wdrampu(:,:) 
    526         zv_frc(:,:) = zv_frc(:,:) + MAX(r1_hv_n(:,:) * bfrva(:,:),-1._wp / rdtbt) * zwy(:,:) *  wdrampv(:,:) 
     525        zu_frc(:,:) = zu_frc(:,:) + MAX(r1_hu_n(:,:) * zCdU_u(:,:),-1._wp / rdtbt) * zwx(:,:) *  wdrampu(:,:) 
     526        zv_frc(:,:) = zv_frc(:,:) + MAX(r1_hv_n(:,:) * zCdU_v(:,:),-1._wp / rdtbt) * zwy(:,:) *  wdrampv(:,:) 
    527527      ELSE 
    528         zu_frc(:,:) = zu_frc(:,:) + r1_hu_n(:,:) * bfrua(:,:) * zwx(:,:) 
    529         zv_frc(:,:) = zv_frc(:,:) + r1_hv_n(:,:) * bfrva(:,:) * zwy(:,:) 
     528        zu_frc(:,:) = zu_frc(:,:) + r1_hu_n(:,:) * zCdU_u(:,:) * zwx(:,:) 
     529        zv_frc(:,:) = zv_frc(:,:) + r1_hv_n(:,:) * zCdU_v(:,:) * zwy(:,:) 
    530530      END IF 
    531531      ! 
     
    10361036!jth do implicitly instead 
    10371037         IF ( .NOT. ll_wd ) THEN ! Revert to explicit for bit comparison tests in non wad runs 
    1038             zu_trd(:,:) = zu_trd(:,:) + bfrua(:,:) * un_e(:,:) * hur_e(:,:) 
    1039             zv_trd(:,:) = zv_trd(:,:) + bfrva(:,:) * vn_e(:,:) * hvr_e(:,:) 
     1038            zu_trd(:,:) = zu_trd(:,:) + zCdU_u(:,:) * un_e(:,:) * hur_e(:,:) 
     1039            zv_trd(:,:) = zv_trd(:,:) + zCdU_v(:,:) * vn_e(:,:) * hvr_e(:,:) 
    10401040         ENDIF  
    10411041         ! 
     
    10821082!jth implicit bottom friction: 
    10831083                  IF ( ll_wd ) THEN ! revert to explicit for bit comparison tests in non wad runs 
    1084                      ua_e(ji,jj) =  ua_e(ji,jj) /(1.0 -   rdtbt * bfrua(ji,jj) * hur_e(ji,jj)) 
    1085                      va_e(ji,jj) =  va_e(ji,jj) /(1.0 -   rdtbt * bfrva(ji,jj) * hvr_e(ji,jj)) 
     1084                     ua_e(ji,jj) =  ua_e(ji,jj) /(1.0 -   rdtbt * zCdU_u(ji,jj) * hur_e(ji,jj)) 
     1085                     va_e(ji,jj) =  va_e(ji,jj) /(1.0 -   rdtbt * zCdU_v(ji,jj) * hvr_e(ji,jj)) 
    10861086                  ENDIF 
    10871087 
Note: See TracChangeset for help on using the changeset viewer.