Changeset 9432
- Timestamp:
- 2018-03-26T17:34:16+02:00 (6 years ago)
- Location:
- branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM
- Files:
-
- 1 edited
- 2 moved
-
asmbgc.F90 (modified) (4 diffs)
-
asmphyto2dbal_hadocc.F90 (moved) (moved from branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_hadocc.F90) (7 diffs)
-
asmphyto2dbal_medusa.F90 (moved) (moved from branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_medusa.F90) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90
r9431 r9432 57 57 #endif 58 58 #if defined key_medusa && defined key_foam_medusa 59 USE asm logchlbal_medusa, ONLY: & ! logchlbalancing for MEDUSA60 & asm_ logchl_bal_medusa59 USE asmphyto2dbal_medusa, ONLY: & ! phyto2d balancing for MEDUSA 60 & asm_phyto2d_bal_medusa 61 61 USE asmpco2bal, ONLY: & ! pCO2 balancing for MEDUSA 62 62 & asm_pco2_bal … … 73 73 & mld_max 74 74 #elif defined key_hadocc 75 USE asm logchlbal_hadocc, ONLY: & ! logchlbalancing for HadOCC76 & asm_ logchl_bal_hadocc75 USE asmphyto2dbal_hadocc, ONLY: & ! phyto2d balancing for HadOCC 76 & asm_phyto2d_bal_hadocc 77 77 USE asmpco2bal, ONLY: & ! pCO2 balancing for HadOCC 78 78 & asm_pco2_bal … … 996 996 CASE ( 4 ) ! Temperature criterion (0.2 K change from surface) [T points] 997 997 !zmld(:,:) = hmld_tref(:,:) 998 CALL ctl_stop( ' hmld_tref mixed layer requested for LogChlassimilation,', &998 CALL ctl_stop( ' hmld_tref mixed layer requested for phyto2d assimilation,', & 999 999 & ' but is not available in this version' ) 1000 1000 CASE ( 5 ) ! Density criterion (0.01 kg/m^3 change from 10m) [T points] … … 1006 1006 1007 1007 #if defined key_medusa && defined key_foam_medusa 1008 CALL asm_ logchl_bal_medusa( (ln_slchltotinc .OR. ln_schltotinc), &1009 & zinc_chltot, &1010 & ln_slchldiainc, &1011 & zinc_chldia, &1012 & ln_slchlnoninc, &1013 & zinc_chlnon, &1014 & ln_slphytotinc, &1015 & zinc_phytot, &1016 & ln_slphydiainc, &1017 & zinc_phydia, &1018 & ln_slphynoninc, &1019 & zinc_phynon, &1020 & zincper, &1021 & rn_maxchlinc, ln_phytobal, zmld, &1022 & pgrow_avg_bkg, ploss_avg_bkg, &1023 & phyt_avg_bkg, mld_max_bkg, &1024 & tracer_bkg, phyto2d_balinc )1008 CALL asm_phyto2d_bal_medusa( (ln_slchltotinc .OR. ln_schltotinc), & 1009 & zinc_chltot, & 1010 & ln_slchldiainc, & 1011 & zinc_chldia, & 1012 & ln_slchlnoninc, & 1013 & zinc_chlnon, & 1014 & ln_slphytotinc, & 1015 & zinc_phytot, & 1016 & ln_slphydiainc, & 1017 & zinc_phydia, & 1018 & ln_slphynoninc, & 1019 & zinc_phynon, & 1020 & zincper, & 1021 & rn_maxchlinc, ln_phytobal, zmld, & 1022 & pgrow_avg_bkg, ploss_avg_bkg, & 1023 & phyt_avg_bkg, mld_max_bkg, & 1024 & tracer_bkg, phyto2d_balinc ) 1025 1025 #elif defined key_hadocc 1026 CALL asm_ logchl_bal_hadocc( (ln_slchltotinc .OR. ln_schltotinc), &1027 & zinc_chltot, &1028 & ln_slphytotinc, &1029 & zinc_phytot, &1030 & zincper, &1031 & rn_maxchlinc, ln_phytobal, zmld, &1032 & pgrow_avg_bkg, ploss_avg_bkg, &1033 & phyt_avg_bkg, mld_max_bkg, &1034 & cchl_p_bkg(:,:,1), &1035 & tracer_bkg, phyto2d_balinc )1026 CALL asm_phyto2d_bal_hadocc( (ln_slchltotinc .OR. ln_schltotinc), & 1027 & zinc_chltot, & 1028 & ln_slphytotinc, & 1029 & zinc_phytot, & 1030 & zincper, & 1031 & rn_maxchlinc, ln_phytobal, zmld, & 1032 & pgrow_avg_bkg, ploss_avg_bkg, & 1033 & phyt_avg_bkg, mld_max_bkg, & 1034 & cchl_p_bkg(:,:,1), & 1035 & tracer_bkg, phyto2d_balinc ) 1036 1036 #else 1037 1037 CALL ctl_stop( 'Attempting to assimilate phyto2d data, ', & -
branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmphyto2dbal_hadocc.F90
r9431 r9432 1 MODULE asm logchlbal_hadocc1 MODULE asmphyto2dbal_hadocc 2 2 !!====================================================================== 3 !! *** MODULE asm logchlbal_hadocc ***4 !! Calculate increments to HadOCC based on surface logchlincrements3 !! *** MODULE asmphyto2dbal_hadocc *** 4 !! Calculate increments to HadOCC based on surface phyto2d increments 5 5 !! 6 6 !! IMPORTANT NOTE: This calls the bioanalysis routine of Hemmings et al. … … 17 17 !! 'key_hadocc' : HadOCC model 18 18 !!---------------------------------------------------------------------- 19 !! asm_ logchl_bal_hadocc : routine to calculate increments to HadOCC19 !! asm_phyto2d_bal_hadocc : routine to calculate increments to HadOCC 20 20 !!---------------------------------------------------------------------- 21 21 USE par_kind, ONLY: wp ! kind parameters … … 32 32 PRIVATE 33 33 34 PUBLIC asm_ logchl_bal_hadocc34 PUBLIC asm_phyto2d_bal_hadocc 35 35 36 36 ! Default values for biological assimilation parameters … … 67 67 CONTAINS 68 68 69 SUBROUTINE asm_ logchl_bal_hadocc( ld_chltot, &70 & pinc_chltot, &71 & ld_phytot, &72 & pinc_phytot, &73 & pincper, &74 & p_maxchlinc, ld_phytobal, pmld, &75 & pgrow_avg_bkg, ploss_avg_bkg, &76 & phyt_avg_bkg, mld_max_bkg, &77 & cchl_p_bkg, &78 & tracer_bkg, phyto2d_balinc )69 SUBROUTINE asm_phyto2d_bal_hadocc( ld_chltot, & 70 & pinc_chltot, & 71 & ld_phytot, & 72 & pinc_phytot, & 73 & pincper, & 74 & p_maxchlinc, ld_phytobal, pmld, & 75 & pgrow_avg_bkg, ploss_avg_bkg, & 76 & phyt_avg_bkg, mld_max_bkg, & 77 & cchl_p_bkg, & 78 & tracer_bkg, phyto2d_balinc ) 79 79 !!--------------------------------------------------------------------------- 80 !! *** ROUTINE asm_ logchl_bal_hadocc ***80 !! *** ROUTINE asm_phyto2d_bal_hadocc *** 81 81 !! 82 82 !! ** Purpose : calculate increments to HadOCC from 2d phytoplankton increments … … 246 246 ENDIF 247 247 248 END SUBROUTINE asm_ logchl_bal_hadocc248 END SUBROUTINE asm_phyto2d_bal_hadocc 249 249 250 250 #else … … 253 253 !!---------------------------------------------------------------------- 254 254 CONTAINS 255 SUBROUTINE asm_ logchl_bal_hadocc( ld_chltot, &256 & pinc_chltot, &257 & ld_phytot, &258 & pinc_phytot, &259 & pincper, &260 & p_maxchlinc, ld_phytobal, pmld, &261 & pgrow_avg_bkg, ploss_avg_bkg, &262 & phyt_avg_bkg, mld_max_bkg, &263 & cchl_p_bkg, &264 & tracer_bkg, phyto2d_balinc )255 SUBROUTINE asm_phyto2d_bal_hadocc( ld_chltot, & 256 & pinc_chltot, & 257 & ld_phytot, & 258 & pinc_phytot, & 259 & pincper, & 260 & p_maxchlinc, ld_phytobal, pmld, & 261 & pgrow_avg_bkg, ploss_avg_bkg, & 262 & phyt_avg_bkg, mld_max_bkg, & 263 & cchl_p_bkg, & 264 & tracer_bkg, phyto2d_balinc ) 265 265 LOGICAL :: ld_chltot 266 266 REAL :: pinc_chltot(:,:) … … 278 278 REAL :: tracer_bkg(:,:,:,:) 279 279 REAL :: phyto2d_balinc(:,:,:,:) 280 WRITE(*,*) 'asm_ logchl_bal_hadocc: You should not have seen this print! error?'281 END SUBROUTINE asm_ logchl_bal_hadocc280 WRITE(*,*) 'asm_phyto2d_bal_hadocc: You should not have seen this print! error?' 281 END SUBROUTINE asm_phyto2d_bal_hadocc 282 282 #endif 283 283 284 284 !!====================================================================== 285 END MODULE asm logchlbal_hadocc285 END MODULE asmphyto2dbal_hadocc -
branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmphyto2dbal_medusa.F90
r9431 r9432 1 MODULE asm logchlbal_medusa1 MODULE asmphyto2dbal_medusa 2 2 !!====================================================================== 3 !! *** MODULE asm logchlbal_medusa ***4 !! Calculate increments to MEDUSA based on surface logchlincrements3 !! *** MODULE asmphyto2dbal_medusa *** 4 !! Calculate increments to MEDUSA based on surface phyto2d increments 5 5 !! 6 6 !! IMPORTANT NOTE: This calls the bioanalysis routine of Hemmings et al. … … 10 10 !! 11 11 !!====================================================================== 12 !! History : 3.6 ! 2017-08 (D. Ford) Adapted from asm logchlbal_hadocc12 !! History : 3.6 ! 2017-08 (D. Ford) Adapted from asmphyto2dbal_hadocc 13 13 !!---------------------------------------------------------------------- 14 14 #if defined key_asminc && defined key_medusa && defined key_foam_medusa … … 18 18 !! 'key_foam_medusa' : MEDUSA extras for FOAM OBS and ASM 19 19 !!---------------------------------------------------------------------- 20 !! asm_ logchl_bal_medusa : routine to calculate increments to MEDUSA20 !! asm_phyto2d_bal_medusa : routine to calculate increments to MEDUSA 21 21 !!---------------------------------------------------------------------- 22 22 USE par_kind, ONLY: wp ! kind parameters … … 34 34 PRIVATE 35 35 36 PUBLIC asm_ logchl_bal_medusa36 PUBLIC asm_phyto2d_bal_medusa 37 37 38 38 ! Default values for biological assimilation parameters … … 69 69 CONTAINS 70 70 71 SUBROUTINE asm_ logchl_bal_medusa( ld_chltot, &72 & pinc_chltot, &73 & ld_chldia, &74 & pinc_chldia, &75 & ld_chlnon, &76 & pinc_chlnon, &77 & ld_phytot, &78 & pinc_phytot, &79 & ld_phydia, &80 & pinc_phydia, &81 & ld_phynon, &82 & pinc_phynon, &83 & pincper, &84 & p_maxchlinc, ld_phytobal, pmld, &85 & pgrow_avg_bkg, ploss_avg_bkg, &86 & phyt_avg_bkg, mld_max_bkg, &87 & tracer_bkg, phyto2d_balinc )71 SUBROUTINE asm_phyto2d_bal_medusa( ld_chltot, & 72 & pinc_chltot, & 73 & ld_chldia, & 74 & pinc_chldia, & 75 & ld_chlnon, & 76 & pinc_chlnon, & 77 & ld_phytot, & 78 & pinc_phytot, & 79 & ld_phydia, & 80 & pinc_phydia, & 81 & ld_phynon, & 82 & pinc_phynon, & 83 & pincper, & 84 & p_maxchlinc, ld_phytobal, pmld, & 85 & pgrow_avg_bkg, ploss_avg_bkg, & 86 & phyt_avg_bkg, mld_max_bkg, & 87 & tracer_bkg, phyto2d_balinc ) 88 88 !!--------------------------------------------------------------------------- 89 !! *** ROUTINE asm_ logchl_bal_medusa ***89 !! *** ROUTINE asm_phyto2d_bal_medusa *** 90 90 !! 91 91 !! ** Purpose : calculate increments to MEDUSA from 2d phytoplankton increments … … 387 387 ENDIF 388 388 389 END SUBROUTINE asm_ logchl_bal_medusa389 END SUBROUTINE asm_phyto2d_bal_medusa 390 390 391 391 #else … … 394 394 !!---------------------------------------------------------------------- 395 395 CONTAINS 396 SUBROUTINE asm_ logchl_bal_medusa( ld_chltot, &396 SUBROUTINE asm_phyto2d_bal_medusa( ld_chltot, & 397 397 & pinc_chltot, & 398 398 & ld_chldia, & … … 433 433 REAL :: tracer_bkg(:,:,:,:) 434 434 REAL :: phyto2d_balinc(:,:,:,:) 435 WRITE(*,*) 'asm_ logchl_bal_medusa: You should not have seen this print! error?'436 END SUBROUTINE asm_ logchl_bal_medusa435 WRITE(*,*) 'asm_phyto2d_bal_medusa: You should not have seen this print! error?' 436 END SUBROUTINE asm_phyto2d_bal_medusa 437 437 #endif 438 438 439 439 !!====================================================================== 440 END MODULE asm logchlbal_medusa440 END MODULE asmphyto2dbal_medusa
Note: See TracChangeset
for help on using the changeset viewer.
