Ignore:
Timestamp:
2017-12-13T19:01:03+01:00 (3 years ago)
Author:
timgraham
Message:

Resolved conflicts in namelists

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90

    r7616 r9024  
    169169            ! 
    170170      END SELECT 
     171 
     172 
    171173      ! 
    172174      ! Apply minimum wetdepth criterion 
     
    174176      do jj = 1,jpj 
    175177         do ji = 1,jpi 
    176             IF( ht_wd(ji,jj) + pssh(ji,jj) < rn_wdmin1 ) THEN 
    177                pssh(ji,jj) = ptmask(ji,jj,1)*( rn_wdmin1 - ht_wd(ji,jj) ) 
     178            IF( ht_0(ji,jj) + pssh(ji,jj) < rn_wdmin1 ) THEN 
     179               pssh(ji,jj) = ptmask(ji,jj,1)*( rn_wdmin1 - ht_0(ji,jj) ) 
    178180            ENDIF 
    179181         end do 
Note: See TracChangeset for help on using the changeset viewer.