Changeset 9432 for branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90

Timestamp:

2018-03-26T17:34:16+02:00 (6 years ago)

Author:

dford

Message:

Rename logchlbal to phyto2dbal.

File:

• branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc/NEMOGCM/NEMO/OPA_SRC/ASM/asmbgc.F90

@@ -57 +57 @@
 #endif
 #if defined key_medusa && defined key_foam_medusa
-   USE asmlogchlbal_medusa, ONLY: & ! logchl balancing for MEDUSA
-      & asm_logchl_bal_medusa
+   USE asmphyto2dbal_medusa, ONLY: & ! phyto2d balancing for MEDUSA
+      & asm_phyto2d_bal_medusa
    USE asmpco2bal, ONLY:    & ! pCO2 balancing for MEDUSA
       & asm_pco2_bal
@@ -73 +73 @@
       & mld_max
 #elif defined key_hadocc
-   USE asmlogchlbal_hadocc, ONLY: & ! logchl balancing for HadOCC
-      & asm_logchl_bal_hadocc
+   USE asmphyto2dbal_hadocc, ONLY: & ! phyto2d balancing for HadOCC
+      & asm_phyto2d_bal_hadocc
    USE asmpco2bal, ONLY:    & ! pCO2 balancing for HadOCC
       & asm_pco2_bal
@@ -996 +996 @@
             CASE ( 4 )                   ! Temperature criterion (0.2 K change from surface) [T points]
                !zmld(:,:) = hmld_tref(:,:)
-               CALL ctl_stop( ' hmld_tref mixed layer requested for LogChl assimilation,', &
+               CALL ctl_stop( ' hmld_tref mixed layer requested for phyto2d assimilation,', &
                   &           ' but is not available in this version' )
             CASE ( 5 )                   ! Density criterion (0.01 kg/m^3 change from 10m) [T points]
@@ -1006 +1006 @@
 
 #if defined key_medusa && defined key_foam_medusa
-         CALL asm_logchl_bal_medusa( (ln_slchltotinc .OR. ln_schltotinc), &
-            &                        zinc_chltot,                         &
-            &                        ln_slchldiainc,                      &
-            &                        zinc_chldia,                         &
-            &                        ln_slchlnoninc,                      &
-            &                        zinc_chlnon,                         &
-            &                        ln_slphytotinc,                      &
-            &                        zinc_phytot,                         &
-            &                        ln_slphydiainc,                      &
-            &                        zinc_phydia,                         &
-            &                        ln_slphynoninc,                      &
-            &                        zinc_phynon,                         &
-            &                        zincper,                             &
-            &                        rn_maxchlinc, ln_phytobal, zmld,     &
-            &                        pgrow_avg_bkg, ploss_avg_bkg,        &
-            &                        phyt_avg_bkg, mld_max_bkg,           &
-            &                        tracer_bkg, phyto2d_balinc )
+         CALL asm_phyto2d_bal_medusa( (ln_slchltotinc .OR. ln_schltotinc), &
+            &                         zinc_chltot,                         &
+            &                         ln_slchldiainc,                      &
+            &                         zinc_chldia,                         &
+            &                         ln_slchlnoninc,                      &
+            &                         zinc_chlnon,                         &
+            &                         ln_slphytotinc,                      &
+            &                         zinc_phytot,                         &
+            &                         ln_slphydiainc,                      &
+            &                         zinc_phydia,                         &
+            &                         ln_slphynoninc,                      &
+            &                         zinc_phynon,                         &
+            &                         zincper,                             &
+            &                         rn_maxchlinc, ln_phytobal, zmld,     &
+            &                         pgrow_avg_bkg, ploss_avg_bkg,        &
+            &                         phyt_avg_bkg, mld_max_bkg,           &
+            &                         tracer_bkg, phyto2d_balinc )
 #elif defined key_hadocc
-         CALL asm_logchl_bal_hadocc( (ln_slchltotinc .OR. ln_schltotinc), &
-            &                        zinc_chltot,                         &
-            &                        ln_slphytotinc,                      &
-            &                        zinc_phytot,                         &
-            &                        zincper,                             &
-            &                        rn_maxchlinc, ln_phytobal, zmld,     &
-            &                        pgrow_avg_bkg, ploss_avg_bkg,        &
-            &                        phyt_avg_bkg, mld_max_bkg,           &
-            &                        cchl_p_bkg(:,:,1),                   &
-            &                        tracer_bkg, phyto2d_balinc )
+         CALL asm_phyto2d_bal_hadocc( (ln_slchltotinc .OR. ln_schltotinc), &
+            &                         zinc_chltot,                         &
+            &                         ln_slphytotinc,                      &
+            &                         zinc_phytot,                         &
+            &                         zincper,                             &
+            &                         rn_maxchlinc, ln_phytobal, zmld,     &
+            &                         pgrow_avg_bkg, ploss_avg_bkg,        &
+            &                         phyt_avg_bkg, mld_max_bkg,           &
+            &                         cchl_p_bkg(:,:,1),                   &
+            &                         tracer_bkg, phyto2d_balinc )
 #else
          CALL ctl_stop( 'Attempting to assimilate phyto2d data, ', &