Changeset 12360


Ignore:
Timestamp:
2020-02-07T18:13:51+01:00 (2 months ago)
Author:
aumont
Message:

various bugfixes on the sediment module and on p4zmeso

Location:
NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP/PISCES/P4Z/p4zmeso.F90

    r12349 r12360  
    172172               zepsherf  = epsher2min + zbeta / ( 1.0 + 0.04E6 * 12. * zfood * zbeta )  
    173173               zepsherq  = 0.5 + (1.0 - 0.5) * zepshert * ( 1.0 + 1.0 ) / ( zepshert + 1.0 ) 
     174               zepsherv  = zepsherf * zepshert * zepsherq 
    174175               zgrarem2  = zgraztotc * ( 1. - zepsherv - unass2 ) & 
    175176               &         + ( 1. - epsher2 - unass2 ) / ( 1. - epsher2 ) * ztortz 
  • NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP/PISCES/SED/sedchem.F90

    r10356 r12360  
    577577         saltprac(:) = salt(:) * 35.0 / 35.16504 
    578578      ELSE 
    579          saltprac(:) = temp(:) 
     579         saltprac(:) = salt(:) 
    580580      ENDIF 
    581581 
  • NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP/PISCES/SED/sedinorg.F90

    r10225 r12360  
    8989            zsolcpcl = zsolcpcl + solcp(ji,jk,jsclay) * dz(jk) 
    9090         END DO 
     91         zsolcpsi = MAX( zsolcpsi, rtrn ) 
    9192         zsieq(ji) = sieqs(ji) * MAX(0.25, 1.0 - (0.045 * zsolcpcl / zsolcpsi )**0.58 ) 
    9293         zsieq(ji) = MAX( rtrn, sieqs(ji) ) 
  • NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP/trcstp.F90

    r10570 r12360  
    100100                                   CALL trc_wri      ( kt )       ! output of passive tracers with iom I/O manager 
    101101                                   CALL trc_sms      ( kt )       ! tracers: sinks and sources 
     102#if ! defined key_sed_off 
    102103                                   CALL trc_trp      ( kt )       ! transport of passive tracers 
     104#endif 
    103105         IF( kt == nittrc000 ) THEN 
    104106            CALL iom_close( numrtr )       ! close input tracer restart file 
Note: See TracChangeset for help on using the changeset viewer.