Changeset 10661 for branches/UKMO
- Timestamp:
- 2019-02-12T18:08:39+01:00 (5 years ago)
- Location:
- branches/UKMO/AMM15_v3_6_STABLE_package_collate_BGC_DA/NEMOGCM
- Files:
-
- 3 edited
-
CONFIG/SHARED/namelist_ref (modified) (1 diff)
-
NEMO/OPA_SRC/ASM/asmbgc.F90 (modified) (10 diffs)
-
NEMO/OPA_SRC/ASM/asminc.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/AMM15_v3_6_STABLE_package_collate_BGC_DA/NEMOGCM/CONFIG/SHARED/namelist_ref
r10622 r10661 1281 1281 ln_pno3inc = .false. ! Logical switch for applying pno3 increments 1282 1282 ln_psi4inc = .false. ! Logical switch for applying psi4 increments 1283 ln_ppo4inc = .false. ! Logical switch for applying ppo4 increments 1283 1284 ln_pdicinc = .false. ! Logical switch for applying pdic increments 1284 1285 ln_palkinc = .false. ! Logical switch for applying palk increments -
branches/UKMO/AMM15_v3_6_STABLE_package_collate_BGC_DA/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90
r10624 r10661 135 135 LOGICAL, PUBLIC :: ln_pno3inc = .FALSE. !: No profile nitrate increment 136 136 LOGICAL, PUBLIC :: ln_psi4inc = .FALSE. !: No profile silicate increment 137 LOGICAL, PUBLIC :: ln_ppo4inc = .FALSE. !: No profile phosphate increment 137 138 LOGICAL, PUBLIC :: ln_pdicinc = .FALSE. !: No profile dissolved inorganic carbon increment 138 139 LOGICAL, PUBLIC :: ln_palkinc = .FALSE. !: No profile alkalinity increment … … 175 176 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: pno3_bkginc ! pno3 inc 176 177 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: psi4_bkginc ! psi4 inc 178 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: ppo4_bkginc ! ppo4 inc 177 179 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: pdic_bkginc ! pdic inc 178 180 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: palk_bkginc ! palk inc … … 229 231 230 232 #if defined key_hadocc 231 IF ( ln_slchldiainc .OR. ln_slchlnoninc .OR. ln_slphydiainc .OR. & 232 & ln_slphynoninc .OR. ln_psi4inc .OR. ln_pphinc .OR. ln_po2inc ) THEN 233 CALL ctl_stop( ' Cannot assimilate PFTs, Si4, pH or O2 into HadOCC' ) 233 IF ( ln_slchldiainc .OR. ln_slchlnoninc .OR. ln_slchlnaninc .OR. & 234 & ln_slchldininc .OR. ln_slchlpicinc .OR. ln_slphydiainc .OR. & 235 & ln_slphynoninc .OR. ln_psi4inc .OR. ln_pphinc .OR. & 236 & ln_po2inc .OR. ln_ppo4inc ) THEN 237 CALL ctl_stop( ' Cannot assimilate PFTs, Si4, PO4, pH or O2 into HadOCC' ) 234 238 ENDIF 235 239 #endif … … 238 242 IF ( .NOT. ln_foam_medusa ) THEN 239 243 CALL ctl_stop( ' MEDUSA data assimilation options not turned on: set ln_foam_medusa' ) 244 ENDIF 245 246 IF ( ln_ppo4inc ) THEN 247 CALL ctl_stop( ' Cannot assimilate PO4 into MEDUSA' ) 240 248 ENDIF 241 249 #endif … … 419 427 ALLOCATE( psi4_bkginc(jpi,jpj,jpk) ) 420 428 CALL asm_bgc_read_incs_3d( knum, 'bckinpsi4', psi4_bkginc ) 429 ENDIF 430 431 IF ( ln_ppo4inc ) THEN 432 ALLOCATE( ppo4_bkginc(jpi,jpj,jpk) ) 433 CALL asm_bgc_read_incs_3d( knum, 'bckinppo4', ppo4_bkginc ) 421 434 ENDIF 422 435 … … 2441 2454 ENDIF 2442 2455 2456 IF ( ln_ppo4inc ) THEN 2457 #if defined key_fabm 2458 it = jp_fabm_n1p 2459 2460 IF ( ln_phytobal ) THEN 2461 ppo4_bkginc(:,:,:) = ppo4_bkginc(:,:,:) - phyto2d_balinc(:,:,:,it) 2462 ENDIF 2463 IF ( ln_plchltotinc .OR. ln_pchltotinc ) THEN 2464 ppo4_bkginc(:,:,:) = ppo4_bkginc(:,:,:) - phyto3d_balinc(:,:,:,it) 2465 ENDIF 2466 IF ( ln_sfco2inc .OR. ln_spco2inc ) THEN 2467 ppo4_bkginc(:,:,:) = ppo4_bkginc(:,:,:) - pco2_balinc(:,:,:,it) 2468 ENDIF 2469 IF ( ln_pphinc ) THEN 2470 ppo4_bkginc(:,:,:) = ppo4_bkginc(:,:,:) - ph_balinc(:,:,:,it) 2471 ENDIF 2472 #else 2473 CALL ctl_stop ( ' bgc3d_asm_inc: no compatible BGC model defined' ) 2474 #endif 2475 ENDIF 2476 2443 2477 IF ( ln_pdicinc ) THEN 2444 2478 #if defined key_hadocc || defined key_medusa || defined key_fabm … … 2585 2619 ENDIF 2586 2620 2621 IF ( ln_ppo4inc ) THEN 2622 #if defined key_fabm 2623 WHERE( ppo4_bkginc(:,:,:) > 0.0_wp .OR. & 2624 & trn(:,:,:,jp_fabm_n1p) + ppo4_bkginc(:,:,:) * zincwgt > 0.0_wp ) 2625 trn(:,:,:,jp_fabm_n1p) = trn(:,:,:,jp_fabm_n1p) + ppo4_bkginc(:,:,:) * zincwgt 2626 trb(:,:,:,jp_fabm_n1p) = trb(:,:,:,jp_fabm_n1p) + ppo4_bkginc(:,:,:) * zincwgt 2627 END WHERE 2628 #else 2629 CALL ctl_stop ( ' bgc3d_asm_inc: no compatible BGC model defined' ) 2630 #endif 2631 ENDIF 2632 2587 2633 IF ( ln_pdicinc ) THEN 2588 2634 #if defined key_hadocc … … 2654 2700 IF ( ln_pno3inc ) DEALLOCATE( pno3_bkginc ) 2655 2701 IF ( ln_psi4inc ) DEALLOCATE( psi4_bkginc ) 2702 IF ( ln_ppo4inc ) DEALLOCATE( ppo4_bkginc ) 2656 2703 IF ( ln_pdicinc ) DEALLOCATE( pdic_bkginc ) 2657 2704 IF ( ln_palkinc ) DEALLOCATE( palk_bkginc ) … … 2718 2765 ENDIF 2719 2766 2767 IF ( ln_ppo4inc ) THEN 2768 #if defined key_fabm 2769 WHERE( ppo4_bkginc(:,:,:) > 0.0_wp .OR. & 2770 & trn(:,:,:,jp_fabm_n1p) + ppo4_bkginc(:,:,:) > 0.0_wp ) 2771 trn(:,:,:,jp_fabm_n1p) = trn(:,:,:,jp_fabm_n1p) + ppo4_bkginc(:,:,:) 2772 trb(:,:,:,jp_fabm_n1p) = trn(:,:,:,jp_fabm_n1p) 2773 END WHERE 2774 #else 2775 CALL ctl_stop ( ' bgc3d_asm_inc: no compatible BGC model defined' ) 2776 #endif 2777 ENDIF 2778 2720 2779 IF ( ln_pdicinc ) THEN 2721 2780 #if defined key_hadocc … … 2786 2845 IF ( ln_pno3inc ) DEALLOCATE( pno3_bkginc ) 2787 2846 IF ( ln_psi4inc ) DEALLOCATE( psi4_bkginc ) 2847 IF ( ln_ppo4inc ) DEALLOCATE( ppo4_bkginc ) 2788 2848 IF ( ln_pdicinc ) DEALLOCATE( pdic_bkginc ) 2789 2849 IF ( ln_palkinc ) DEALLOCATE( palk_bkginc ) -
branches/UKMO/AMM15_v3_6_STABLE_package_collate_BGC_DA/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r10622 r10661 172 172 & ln_sfco2inc, ln_plchltotinc, ln_pchltotinc, & 173 173 & ln_pno3inc, ln_psi4inc, ln_pdicinc, ln_palkinc, & 174 & ln_pphinc, ln_po2inc, 174 & ln_pphinc, ln_po2inc, ln_ppo4inc, & 175 175 & ln_asmdin, ln_asmiau, & 176 176 & nitbkg, nitdin, nitiaustr, nitiaufin, niaufn, & … … 242 242 WRITE(numout,*) ' Logical switch for applying pno3 increments ln_pno3inc = ', ln_pno3inc 243 243 WRITE(numout,*) ' Logical switch for applying psi4 increments ln_psi4inc = ', ln_psi4inc 244 WRITE(numout,*) ' Logical switch for applying ppo4 increments ln_ppo4inc = ', ln_ppo4inc 244 245 WRITE(numout,*) ' Logical switch for applying pdic increments ln_pdicinc = ', ln_pdicinc 245 246 WRITE(numout,*) ' Logical switch for applying palk increments ln_palkinc = ', ln_palkinc … … 304 305 & ln_plchltotinc .OR. ln_pchltotinc .OR. ln_pno3inc .OR. & 305 306 & ln_psi4inc .OR. ln_pdicinc .OR. ln_palkinc .OR. & 306 & ln_pphinc .OR. ln_po2inc ) THEN307 & ln_pphinc .OR. ln_po2inc .OR. ln_ppo4inc ) THEN 307 308 lk_bgcinc = .TRUE. 308 309 ENDIF … … 1383 1384 ! Remaining bgc profile variables 1384 1385 IF ( ln_pno3inc .OR. ln_psi4inc .OR. ln_pdicinc .OR. & 1385 & ln_palkinc .OR. ln_po2inc ) THEN1386 & ln_palkinc .OR. ln_po2inc .OR. ln_ppo4inc ) THEN 1386 1387 CALL bgc3d_asm_inc( kt, ln_asmdin, ln_asmiau, icycper, wgtiau ) 1387 1388 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
