Changeset 15384 for NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA

Timestamp:

2021-10-15T14:53:30+02:00 (3 years ago)

Author:

hadjt

Message:

Kara MLD code removed, as redundant

File:

• NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA/diaregmean.F90 (modified) (7 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA/diaregmean.F90

@@ -10 +10 @@
    USE in_out_manager  ! I/O units
    USE iom             ! I/0 library
-   !JT USE wrk_nemo        ! working arrays
    USE diapea          ! PEA
    USE zdfmxl          ! MLD
@@ -38 +37 @@
    LOGICAL :: ln_diaregmean_diaar5      ! region mean calculation including AR5 SLR terms
    LOGICAL :: ln_diaregmean_diasbc      ! region mean calculation including Surface BC
-   LOGICAL :: ln_diaregmean_karamld     ! region mean calculation including kara mld terms
+   LOGICAL :: ln_diaregmean_mld         ! region mean calculation including kara mld terms
    LOGICAL :: ln_diaregmean_pea         ! region mean calculation including pea terms
    INTEGER :: nn_diaregmean_nhourlymean ! region mean number of hours in mean (normally 1., <0 = instantanous (slower))
@@ -103 +102 @@
 #if defined key_fabm
       NAMELIST/nam_diaregmean/ ln_diaregmean,nn_regions_output,ln_diaregmean_verbose, ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
-        & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc,ln_diaregmean_bgc,&
+        & ln_diaregmean_mld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc,ln_diaregmean_bgc,&
         & nn_diaregmean_nhourlymean,ln_diaregmean_areawgt
 #else
       NAMELIST/nam_diaregmean/ ln_diaregmean,nn_regions_output,ln_diaregmean_verbose, ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
-        & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc,&
+        & ln_diaregmean_mld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc,&
         & nn_diaregmean_nhourlymean,ln_diaregmean_areawgt
 #endif
@@ -135 +134 @@
           WRITE(numout,*) 'Switch for regmean binary output (T) or not (F)  ln_diaregmean_bin  = ', ln_diaregmean_bin
           WRITE(numout,*) 'Switch for regmean netcdf output (T) or not (F)  ln_diaregmean_nc  = ', ln_diaregmean_nc
-          WRITE(numout,*) 'Switch for regmean kara mld terms (T) or not (F)  ln_diaregmean_karamld  = ', ln_diaregmean_karamld
+          WRITE(numout,*) 'Switch for regmean kara mld terms (T) or not (F)  ln_diaregmean_mld  = ', ln_diaregmean_mld
           WRITE(numout,*) 'Switch for regmean PEA terms (T) or not (F)  ln_diaregmean_pea  = ', ln_diaregmean_pea
           WRITE(numout,*) 'Switch for regmean AR5 SLR terms (T) or not (F)  ln_diaregmean_diaar5  = ', ln_diaregmean_diaar5
@@ -648 +647 @@
 
         
-        IF( ln_diaregmean_karamld  ) THEN
-            tmp_field_mat(:,:,16) = tmp_field_mat(:,:,16) + (hmld_kara(:,:)*tmask(:,:,1)) !mldkara
+        IF( ln_diaregmean_mld  ) THEN
+            IF( ALLOCATED( hmld_zint ) )  THEN
+                tmp_field_mat(:,:,16) = tmp_field_mat(:,:,16) + (hmld_zint(:,:)*tmask(:,:,1)) !mldkara
+            ENDIF
         ENDIF
 
-        name_dat_mat(16) = 'mldkara'
+        name_dat_mat(16) = 'mld'
         
         IF( ln_diaregmean_pea  ) THEN
@@ -711 +712 @@
 
                IF (vi == 16) THEN
-                 IF( .not. ln_diaregmean_karamld ) do_reg_mean = .FALSE.   
+                 IF( .not. ln_diaregmean_mld ) do_reg_mean = .FALSE.   
                ENDIF 
 
@@ -733 +734 @@
                     ENDIF
                 !ELSE
-                    !WRITE(numout,*)  'JT dia_regmean SBC variable - no do_reg_mean: ',TRIM( name_dat_mat(vi) ),';',ln_diaregmean_karamld,ln_diaregmean_pea
+                    !WRITE(numout,*)  'JT dia_regmean SBC variable - no do_reg_mean: ',TRIM( name_dat_mat(vi) ),';',ln_diaregmean_mld,ln_diaregmean_pea
                 ENDIF
                 tmp_name=""