Changeset 11070

Timestamp:

2019-06-03T15:04:56+02:00 (5 years ago)

Author:

rrenshaw

Message:

code fixes

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis3/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/asmbgc.F90 (modified) (4 diffs)
• ASM/asminc.F90 (modified) (4 diffs)
• DIA/diaregmean.F90 (modified) (1 diff)

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

@@ -36 +36 @@
    USE zdfmxl, ONLY :       & ! mixed layer depth 
 #if defined key_karaml
-      & hmld_kara,          &
+      & hmld_zint,          &
       & ln_kara,            &
 #endif   
@@ -147 +147 @@
                                          !                 (0.01 kg/m^3 change from 10m)
                                          !                 [W points]
-                                         !  3) hmld_kara - Kara MLD
+                                         !  3) hmld_zint - Kara MLD
                                          !                 [Interpolated]
                                          !  4) hmld_tref - Temperature criterion
@@ -1426 +1426 @@
 #if defined key_karaml
                IF ( ln_kara ) THEN
-                  zmld(:,:) = hmld_kara(:,:)
+                  zmld(:,:) = hmld_zint(:,:)
                ELSE
                   CALL ctl_stop( ' Kara mixed layer requested for phyto2d assimilation,', &
@@ -2020 +2020 @@
 #if defined key_karaml
                IF ( ln_kara ) THEN
-                  zmld(:,:) = hmld_kara(:,:)
+                  zmld(:,:) = hmld_zint(:,:)
                ELSE
                   CALL ctl_stop( ' Kara mixed layer requested for pCO2 assimilation,', &

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis3/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -43 +43 @@
    &  hmld_tref,       &   
 #if defined key_karaml
-   &  hmld_kara,       &
+   &  hmld_zint,       &
    &  ln_kara,         &
 #endif   
@@ -108 +108 @@
                                       !: 1) hmld      - Turbocline/mixing depth                           [W points]
                                       !: 2) hmlp      - Density criterion (0.01 kg/m^3 change from 10m)   [W points]
-                                      !: 3) hmld_kara - Kara MLD                                          [Interpolated]
+                                      !: 3) hmld_zint - Kara MLD                                          [Interpolated]
                                       !: 4) hmld_tref - Temperature criterion (0.2 K change from surface) [T points]
 
@@ -518 +518 @@
 #if defined key_karaml
                   IF ( ln_kara ) THEN
-                     z_mld = hmld_kara
+                     z_mld = hmld_zint
                   ELSE
                      CALL ctl_stop("Kara mixed layer not calculated as ln_kara=.false.")
@@ -1279 +1279 @@
 !
 !           ! change salinity down to mixed layer depth
-!                 mld=hmld_kara(ji,jj)
+!                 mld=hmld_zint(ji,jj)
 !
 !           ! prevent small mld

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis3/NEMOGCM/NEMO/OPA_SRC/DIA/diaregmean.F90

@@ -531 +531 @@
         
         IF( ln_diaregmean_karamld  ) THEN
-            tmp_field_mat(:,:,16) = tmp_field_mat(:,:,16) + (hmld_kara(:,:)*tmask(:,:,1)) !mldkara
+            tmp_field_mat(:,:,16) = tmp_field_mat(:,:,16) + (hmld_zint(:,:)*tmask(:,:,1)) !mldkara
         ENDIF