Ignore:
Timestamp:
2019-02-01T19:21:02+01:00 (19 months ago)
Author:
dford
Message:

Couple of bug fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_BGC_DA/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90

    r10622 r10624  
    294294         & ( ( ln_slchlnoninc .AND.( .NOT. ln_slchldiainc ) ).OR. & 
    295295#if defined key_fabm 
    296          &   (  ( ln_slchldiainc .OR. ln_slchlnaninc .OR. ln_slchlpicinc .OR. ln_slchldininc ) .AND. & 
    297          &      ( ( .NOT. ln_slchldiainc ) .OR. ( .NOT. ln_slchlnaninc ) .OR. & 
    298          &        ( .NOT. ln_slchlpicinc ) .OR. ( .NOT. ln_slchldininc ) ) ) .OR. & 
    299 #endif 
     296         &   ( (  ( ln_slchldiainc .OR. ln_slchlnaninc .OR. ln_slchlpicinc .OR. ln_slchldininc ) .AND. & 
     297         &        ( ( .NOT. ln_slchldiainc ) .OR. ( .NOT. ln_slchlnaninc ) .OR. & 
     298         &          ( .NOT. ln_slchlpicinc ) .OR. ( .NOT. ln_slchldininc ) ) ) .AND. & 
     299         &     ( ln_slchldiainc .AND.( .NOT. ln_slchlnoninc ) ) ) ) ) THEN 
     300#elif defined key_medusa 
    300301         &   ( ln_slchldiainc .AND.( .NOT. ln_slchlnoninc ) ) ) ) THEN 
     302#endif 
    301303         CALL ctl_stop( ' Cannot calculate phytoplankton balancing increments', & 
    302304            &           ' unless assimilating all model PFTs,') 
     
    602604         chl_bkg(:,:,:)    = 0.0 
    603605         cchl_p_bkg(:,:,:) = 0.0 
     606#elif defined key_fabm 
     607         ALLOCATE( totalk_bkg(jpi,jpj,jpk) ) 
     608         totalk_bkg(:,:,:) = 0.0 
    604609#endif 
    605610          
Note: See TracChangeset for help on using the changeset viewer.