Changeset 12352


Ignore:
Timestamp:
2020-01-29T13:24:59+01:00 (9 months ago)
Author:
dford
Message:

Update biogeochemical BDY code, and fix a couple of bugs in FABM coupling code. See Met Office utils ticket 305.

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/TOP_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90

    r11545 r12352  
    125125      jp_fabm_pgrow = fabm_diag_index( 'p_grow_sum_result' ) 
    126126      jp_fabm_ploss = fabm_diag_index( 'p_loss_sum_result' ) 
    127        
    128       MLD_MAX(:,:)   = 0.0 
    129       PGROW_AVG(:,:) = 0.0 
    130       PLOSS_AVG(:,:) = 0.0 
    131       PHYT_AVG(:,:)  = 0.0 
    132127 
    133128      IF (lwp) THEN 
     
    437432         ENDDO 
    438433      ENDIF 
     434       
     435      ! Initialise variables required for Hemmings et al. (2008) 
     436      ! nitrogen balancing for chlorophyll data assimilation 
     437      MLD_MAX(:,:)   = 0.0 
     438      PGROW_AVG(:,:) = 0.0 
     439      PLOSS_AVG(:,:) = 0.0 
     440      PHYT_AVG(:,:)  = 0.0 
    439441 
    440442   END SUBROUTINE trc_ini_fabm 
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/TOP_SRC/FABM/vertical_movement_fabm.F90

    r10156 r12352  
    104104                  c_no(2:k_floor)=abs(w_if(2:k_floor,jn))*z2dt/ & 
    105105                                ( 0.5_wp*(fse3t(ji,jj,2:k_floor) + & 
    106                                 fse3t(ji,ji,1:k_floor-1)) ) 
     106                                fse3t(ji,jj,1:k_floor-1)) ) 
    107107                  cmax_no=MAXVAL(c_no(2:k_floor)) 
    108108 
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/TOP_SRC/trcbdy.F90

    r10270 r12352  
    109109            ii = idx%nbi(ib,igrd) 
    110110            ij = idx%nbj(ib,igrd) 
    111             zwgt = idx%nbw(ib,igrd) 
     111            zwgt = idx%nbw(ib,igrd) * rdttrc(ik) / 86400.d0  ! damping with a timescale of day 
    112112            tra(ii,ij,ik,jn) = ( tra(ii,ij,ik,jn) + zwgt * ( ( dta%trc(ib,ik) * dta%rn_fac)  &  
    113113                        &  - tra(ii,ij,ik,jn) ) ) * tmask(ii,ij,ik) 
    114114         END DO 
    115115      END DO  
     116! tra is overwritten at the boundary so damping doesn't work here - need neumann in addition 
     117! to duplicate the internal value at the boundary 
     118       CALL bdy_trc_nmn( jn,  idx, dta, kt ) 
     119 
     120 
    116121      ! 
    117122      IF( kt .eq. nit000 ) CLOSE( unit = 102 ) 
Note: See TracChangeset for help on using the changeset viewer.