Changeset 14794

Timestamp:

2021-05-06T11:41:58+02:00 (3 years ago)

Author:

jwhile

Message:

Updates for Gulf18, see UTILS ticket 442

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (7 diffs)

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

@@ -167 +167 @@
       LOGICAL :: lk_surft      ! Logical: T => Increments file contains surft variable 
                                !               so only apply surft increments.
+      CHARACTER(50) :: cn_surftname   ! Name of the surft variable in the increments file
       !!
       NAMELIST/nam_asminc/ ln_bkgwri, ln_avgbkg, ln_balwri,                &
@@ -182 +183 @@
          &                 nitbkg, nitdin, nitiaustr, nitiaufin, niaufn,   &
          &                 ln_salfix, salfixmin, nn_divdmp, nitavgbkg,     &
-         &                 mld_choice, mld_choice_bgc, rn_maxchlinc
+         &                 mld_choice, mld_choice_bgc, rn_maxchlinc,       &
+         &                 cn_surftname
+         
       !!----------------------------------------------------------------------
 
@@ -211 +214 @@
       niaufn    = 0
       nitavgbkg = 1
+      cn_surftname = "surft"
 
       REWIND( numnam_ref )              ! Namelist nam_asminc in reference namelist : Assimilation increment
@@ -275 +279 @@
          WRITE(numout,*) '      Logical switch for applying pph increments               ln_pphinc = ', ln_pphinc
          WRITE(numout,*) '      Logical switch for applying po2 increments               ln_po2inc = ', ln_po2inc
+         WRITE(numout,*) '      Surface temperature variable name (if applicable)        cn_surftname = ', cn_surftname
       ENDIF
 
@@ -520 +525 @@
 
             !Test if the increments file contains the surft variable.
-            isurfstat = iom_varid( inum, 'bckinsurft', ldstop = .FALSE. )
+            isurfstat = iom_varid( inum, 'bckin'//TRIM(cn_surftname), ldstop = .FALSE. )
             IF ( isurfstat == -1 ) THEN
                lk_surft = .FALSE.
@@ -526 +531 @@
                lk_surft = .TRUE.
                CALL ctl_warn( ' Applying 2D temperature increment to bottom of ML: ', &
-            &                 ' bckinsurft found in increments file.' )
+            &                 ' bckin'//TRIM(cn_surftname)//' found in increments file.' )
             ENDIF             
 
@@ -553 +558 @@
                       
                ALLOCATE( t_bkginc_2d(jpi,jpj) ) 
-               CALL iom_get( inum, jpdom_autoglo, 'bckinsurft', t_bkginc_2d, 1) 
+               CALL iom_get( inum, jpdom_autoglo, 'bckin'//TRIM(cn_surftname), t_bkginc_2d, 1) 
 #if defined key_bdy                
                DO jk = 1,jpkm1