Changeset 9236


Ignore:
Timestamp:
2018-01-15T16:49:06+01:00 (3 years ago)
Author:
anaguiar
Message:

Changes as tested in local copy of the branch

Location:
branches/UKMO/dev_r5518_GO6_package_05sprecip/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_05sprecip/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r8400 r9236  
    474474! Ensure fsnow is positive (as in CICE routine prepare_forcing) 
    475475      IF( iom_use('snowpre') )   CALL iom_put('snowpre',MAX( (1.0-fr_i(:,:))*sprecip(:,:) ,0.0)) !!Joakim edit   
    476       ztmp(:,:)=MAX(fr_i(:,:)*sprecip(:,:),0.0)   
     476      ztmp(:,:)=MAX(fr_i(:,:)*0.5*sprecip(:,:),0.0)   
    477477      CALL nemo2cice(ztmp,fsnow,'T', 1. )  
    478478 
  • branches/UKMO/dev_r5518_GO6_package_05sprecip/NEMOGCM/NEMO/OPA_SRC/step.F90

    r8400 r9236  
    167167      ! 
    168168      IF( lk_ldfslp ) THEN                            ! slope of lateral mixing 
    169                          CALL eos( tsb, rhd, gdept_0(:,:,:) )               ! before in situ density 
     169         CALL eos( tsb, rhd, gdept_0(:,:,:) )               ! before in situ density 
    170170         IF( ln_zps .AND. .NOT. ln_isfcav)                               & 
    171171            &            CALL zps_hde    ( kstp, jpts, tsb, gtsu, gtsv,  &  ! Partial steps: before horizontal gradient 
     
    202202          ! Note that the computation of vertical velocity above, hence "after" sea level 
    203203          ! is necessary to compute momentum advection for the rhs of barotropic loop: 
    204                             CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 
     204            CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 
    205205            IF( ln_zps .AND. .NOT. ln_isfcav)                               & 
    206206               &            CALL zps_hde    ( kstp, jpts, tsn, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient 
Note: See TracChangeset for help on using the changeset viewer.