Changeset 4641


Ignore:
Timestamp:
2014-05-14T11:48:22+02:00 (6 years ago)
Author:
cetlod
Message:

trunk : bugfix to avoid division by zero in 1D PISCES, see ticket #1322

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsed.F90

    r4529 r4641  
    273273      ! ------------------------------------------------------ 
    274274#if ! defined key_sed 
    275       zrivsil =  1._wp - ( sumdepsi + rivdsiinput * r1_ryyss ) / zsumsedsi 
     275      zrivsil =  1._wp - ( sumdepsi + rivdsiinput * r1_ryyss ) / ( zsumsedsi + rtrn ) 
    276276#endif 
    277277 
     
    295295            zfactcal = MIN( excess(ji,jj,ikt), 0.2 ) 
    296296            zfactcal = MIN( 1., 1.3 * ( 0.2 - zfactcal ) / ( 0.4 - zfactcal ) ) 
    297             zrivalk  =  1._wp - ( rivalkinput * r1_ryyss ) * zfactcal / zsumsedcal  
     297            zrivalk  =  1._wp - ( rivalkinput * r1_ryyss ) * zfactcal / ( zsumsedcal + rtrn ) 
    298298            trn(ji,jj,ikt,jptal) =  trn(ji,jj,ikt,jptal) + zcaloss * zrivalk * 2.0 
    299299            trn(ji,jj,ikt,jpdic) =  trn(ji,jj,ikt,jpdic) + zcaloss * zrivalk 
     
    413413      ENDIF 
    414414      ! 
    415       CALL wrk_dealloc( jpi, jpj, zdenit2d, zwork1, zwork2, zwork3, zwork4 ) 
     415      CALL wrk_dealloc( jpi, jpj, zdenit2d, zwork1, zwork2, zwork3, zwork4, zbureff ) 
    416416      CALL wrk_dealloc( jpi, jpj, zwsbio3, zwsbio4, zwscal ) 
    417       CALL wrk_dealloc( jpi, jpj, jpk, znitrpot ) 
     417      CALL wrk_dealloc( jpi, jpj, jpk, znitrpot, zsoufer ) 
    418418      ! 
    419419      IF( nn_timing == 1 )  CALL timing_stop('p4z_sed') 
Note: See TracChangeset for help on using the changeset viewer.