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 12727 for NEMO – NEMO

Changeset 12727 for NEMO


Ignore:
Timestamp:
2020-04-09T16:57:47+02:00 (4 years ago)
Author:
davestorkey
Message:

branches/2020/r4.0-HEAD_ticket2425 : Second version.
Remove unnecessary second eos call from dia_ar5 and move iom_put for rhop to dia_wri.

Location:
NEMO/branches/2020/r4.0-HEAD_ticket2425/src/OCE/DIA
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r4.0-HEAD_ticket2425/src/OCE/DIA/diaar5.F90

    r12712 r12727  
    156156       
    157157         !                                         ! steric sea surface height 
    158          CALL eos( tsn, zrhd, zrhop, gdept_n(:,:,:) )                 ! now in situ and potential density 
    159          zrhop(:,:,jpk) = 0._wp 
    160          CALL iom_put( 'rhop', zrhop ) 
    161          ! 
    162158         zbotpres(:,:) = 0._wp                        ! no atmospheric surface pressure, levitating sea-ice 
    163159         DO jk = 1, jpkm1 
    164             zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * zrhd(:,:,jk) 
     160            zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * rhd(:,:,jk) 
    165161         END DO 
    166162         IF( ln_linssh ) THEN 
     
    169165                  DO jj = 1,jpj 
    170166                     iks = mikt(ji,jj) 
    171                      zbotpres(ji,jj) = zbotpres(ji,jj) + sshn(ji,jj) * zrhd(ji,jj,iks) + riceload(ji,jj) 
     167                     zbotpres(ji,jj) = zbotpres(ji,jj) + sshn(ji,jj) * rhd(ji,jj,iks) + riceload(ji,jj) 
    172168                  END DO 
    173169               END DO 
    174170            ELSE 
    175                zbotpres(:,:) = zbotpres(:,:) + sshn(:,:) * zrhd(:,:,1) 
     171               zbotpres(:,:) = zbotpres(:,:) + sshn(:,:) * rhd(:,:,1) 
    176172            END IF 
    177173         END IF 
     
    185181         CALL iom_put( 'botpres', zbotpres ) 
    186182         ! 
    187       ELSE IF( iom_use('rhop') ) THEN ! we want just the density field, not steric SSH or botpres 
    188          CALL eos( tsn, zrhd, zrhop, gdept_n(:,:,:) )                 ! now in situ and potential density 
    189          zrhop(:,:,jpk) = 0._wp 
    190          CALL iom_put( 'rhop', zrhop ) 
    191183      ENDIF 
    192184 
  • NEMO/branches/2020/r4.0-HEAD_ticket2425/src/OCE/DIA/diawri.F90

    r12494 r12727  
    167167         CALL iom_put( "sbs", z2d )                ! bottom salinity 
    168168      ENDIF 
     169 
     170      CALL iom_put( "rhop", rhop(:,:,:) )          ! 3D potential density (sigma0) 
    169171 
    170172      IF ( iom_use("taubot") ) THEN                ! bottom stress 
Note: See TracChangeset for help on using the changeset viewer.