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 5220 for branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 – NEMO

Ignore:
Timestamp:
2015-04-17T11:50:03+02:00 (9 years ago)
Author:
smasson
Message:

dev_r5218_CNRS17_coupling: first update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

    r5120 r5220  
    6464      DO jj = 1, jpj 
    6565         DO ji = 1, jpi 
    66             zts(ji,jj,jp_tem) = tsn(ji,jj,mikt(ji,jj),jp_tem) 
    67             zts(ji,jj,jp_sal) = tsn(ji,jj,mikt(ji,jj),jp_sal) 
     66            zts(ji,jj,jp_tem) = tsb(ji,jj,mikt(ji,jj),jp_tem) 
     67            zts(ji,jj,jp_sal) = tsb(ji,jj,mikt(ji,jj),jp_sal) 
    6868         END DO 
    6969      END DO 
     
    8484         sss_m(:,:) = zts(:,:,jp_sal) 
    8585         !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 
    86          IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
    87          ELSE                    ;   ssh_m(:,:) = sshn(:,:) 
     86         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
     87         ELSE                    ;   ssh_m(:,:) = sshb(:,:) 
    8888         ENDIF 
    8989         ! 
     
    104104            sss_m(:,:) = zcoef * zts(:,:,jp_sal) 
    105105            !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 
    106             IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = zcoef * ( sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) ) 
    107             ELSE                    ;   ssh_m(:,:) = zcoef * sshn(:,:) 
     106            IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = zcoef * ( sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) ) 
     107            ELSE                    ;   ssh_m(:,:) = zcoef * sshb(:,:) 
    108108            ENDIF 
    109109            ! 
     
    129129         sss_m(:,:) = sss_m(:,:) + zts(:,:,jp_sal) 
    130130         !                          ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 
    131          IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
    132          ELSE                    ;   ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) 
     131         IF( ln_apr_dyn ) THEN   ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
     132         ELSE                    ;   ssh_m(:,:) = ssh_m(:,:) + sshb(:,:) 
    133133         ENDIF 
    134134         ! 
Note: See TracChangeset for help on using the changeset viewer.