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 5828 for branches/2015/dev_r5151_UKMO_ISF – NEMO

Ignore:
Timestamp:
2015-10-23T19:03:26+02:00 (8 years ago)
Author:
mathiot
Message:

Fixes for initialisation issues + bug highlited on the MetO machine

Location:
branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

    r5624 r5828  
    129129         ! 
    130130         ! initialisation 
    131          qisf(:,:)        = 0._wp  ; fwfisf(:,:) = 0._wp 
    132          risf_tsc(:,:,:)  = 0._wp 
     131         qisf(:,:)        = 0._wp  ; fwfisf  (:,:) = 0._wp 
     132         risf_tsc(:,:,:)  = 0._wp  ; fwfisf_b(:,:) = 0._wp 
    133133         ! 
    134134         ! define isf tbl tickness, top and bottom indice 
     
    483483                  ! Presumably zdis can never be negative because gammas is very small compared to gammat 
    484484                  ! compute s freeze 
    485                   IF (zsfrz .GE. 0.0_wp) THEN ; zsfrz=(-zbqe-SQRT(zdis))*zaqer 
    486                   ELSE                        ; zsfrz=(-zbqe+SQRT(zdis))*zaqer 
    487                   ENDIF 
     485                  zsfrz=(-zbqe-SQRT(zdis))*zaqer 
     486                  IF ( zsfrz .LT. 0.0_wp ) zsfrz=(-zbqe+SQRT(zdis))*zaqer 
    488487 
    489488                  ! compute t freeze 
  • branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r5624 r5828  
    179179 
    180180      !                          ! Checks: 
    181       IF( ln_isf ) THEN                      ! variable initialisation if no ice shelf  
     181      IF( .NOT. ln_isf ) THEN                      ! variable initialisation if no ice shelf  
    182182         IF( sbc_isf_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_init : unable to allocate sbc_isf arrays' ) 
    183          fwfisf  (:,:) = 0.0_wp 
    184          fwfisf_b(:,:) = 0.0_wp 
     183         fwfisf  (:,:)   = 0.0_wp ; fwfisf_b  (:,:)   = 0.0_wp 
     184         risf_tsc(:,:,:) = 0.0_wp ; risf_tsc_b(:,:,:) = 0.0_wp 
    185185      END IF 
    186186      IF( nn_ice == 0 .AND. nn_components /= jp_iam_opa )   fr_i(:,:) = 0.e0 ! no ice in the domain, ice fraction is always zero 
Note: See TracChangeset for help on using the changeset viewer.