Changeset 7798 for branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_maxchlinc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_ersem.F90

Timestamp:

2017-03-16T11:00:52+01:00 (7 years ago)

Author:

dford

Message:

Update variable naming.

File:

• branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_maxchlinc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_ersem.F90 (modified) (7 diffs)

branches/UKMO/dev_r5518_v3.6_asm_nemovar_community_maxchlinc/NEMOGCM/NEMO/OPA_SRC/ASM/asmlogchlbal_ersem.F90

@@ -29 +29 @@
 CONTAINS
 
-   SUBROUTINE asm_logchl_bal_ersem( ln_logchlpftinc, npfts, mld_choice_bgc, &
-      &                             rn_maxchlinc, logchl_bkginc, logchl_balinc )
+   SUBROUTINE asm_logchl_bal_ersem( ld_logchlpftinc, npfts, mld_choice_bgc, &
+      &                             k_maxchlinc, logchl_bkginc, logchl_balinc )
       !!---------------------------------------------------------------------------
       !!                    ***  ROUTINE asm_logchl_bal_ersem  ***
@@ -46 +46 @@
       !!---------------------------------------------------------------------------
       !!
-      LOGICAL,  INTENT(in   )                               :: ln_logchlpftinc
+      LOGICAL,  INTENT(in   )                               :: ld_logchlpftinc
       INTEGER,  INTENT(in   )                               :: npfts
       INTEGER,  INTENT(in   )                               :: mld_choice_bgc
-      REAL(wp), INTENT(in   )                               :: rn_maxchlinc
+      REAL(wp), INTENT(in   )                               :: k_maxchlinc
       REAL(wp), INTENT(in   ), DIMENSION(jpi,jpj,npfts)     :: logchl_bkginc
       REAL(wp), INTENT(  out), DIMENSION(jpi,jpj,jpk,jptra) :: logchl_balinc
@@ -66 +66 @@
       ! 2) Take 10^log10(analysis) to get analysis
       ! 3) Subtract background from analysis to get chl incs
-      ! If rn_maxchlinc > 0 then cap total absolute chlorophyll increment at that value
+      ! If k_maxchlinc > 0 then cap total absolute chlorophyll increment at that value
       !
       ! Only apply increments if all of Chl1-4 background values are > 0
@@ -72 +72 @@
       ! that something's going wrong which the assimilation might make worse
       !
-      IF ( ln_logchlpftinc ) THEN
+      IF ( ld_logchlpftinc ) THEN
          !
          ! Assimilating separate PFTs, so separately transform each from LogChl to Chl
@@ -105 +105 @@
                         &                                             trn(ji,jj,1,jp_fabm_m1+jp_fabm_chl4)
                   ENDIF
-                  IF (rn_maxchlinc > 0.0) THEN
+                  IF (k_maxchlinc > 0.0) THEN
                      chl_inc = logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl1) + &
                                logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl2) + &
                                logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl3) + &
                                logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl4)
-                     IF ( ABS(chl_inc) > rn_maxchlinc ) THEN
-                        chl_tot = ABS(chl_inc) / rn_maxchlinc
+                     IF ( ABS(chl_inc) > k_maxchlinc ) THEN
+                        chl_tot = ABS(chl_inc) / k_maxchlinc
                         logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl1) = logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl1) / chl_tot
                         logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl2) = logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl2) / chl_tot
@@ -139 +139 @@
                      &      trn(ji,jj,1,jp_fabm_m1+jp_fabm_chl3) + trn(ji,jj,1,jp_fabm_m1+jp_fabm_chl4)
                   chl_inc = 10**( LOG10( chl_tot ) + logchl_bkginc(ji,jj,1) ) - chl_tot
-                  IF (rn_maxchlinc > 0.0) THEN
-                     chl_inc = MAX( -1.0 * rn_maxchlinc, MIN( chl_inc, rn_maxchlinc ) )
+                  IF (k_maxchlinc > 0.0) THEN
+                     chl_inc = MAX( -1.0 * k_maxchlinc, MIN( chl_inc, k_maxchlinc ) )
                   ENDIF
                   logchl_balinc(ji,jj,1,jp_fabm_m1+jp_fabm_chl1) = chl_inc * trn(ji,jj,1,jp_fabm_m1+jp_fabm_chl1) / chl_tot
@@ -210 +210 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE asm_logchl_bal_ersem( ln_logchlpftinc, npfts, mld_choice_bgc, &
-      &                             logchl_bkginc, logchl_balinc )
-      LOGICAL :: ln_logchlpftinc
+   SUBROUTINE asm_logchl_bal_ersem( ld_logchlpftinc, npfts, mld_choice_bgc, &
+      &                             k_maxchlinc, logchl_bkginc, logchl_balinc )
+      LOGICAL :: ld_logchlpftinc
       INTEGER :: npfts
       INTEGER :: mld_choice_bgc
+      REAL    :: k_maxchlinc
       REAL    :: logchl_bkginc(:,:,:)
       REAL    :: logchl_balinc(:,:,:,:)