Changeset 14794 for branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM
- Timestamp:
- 2021-05-06T11:41:58+02:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r14190 r14794 167 167 LOGICAL :: lk_surft ! Logical: T => Increments file contains surft variable 168 168 ! so only apply surft increments. 169 CHARACTER(50) :: cn_surftname ! Name of the surft variable in the increments file 169 170 !! 170 171 NAMELIST/nam_asminc/ ln_bkgwri, ln_avgbkg, ln_balwri, & … … 182 183 & nitbkg, nitdin, nitiaustr, nitiaufin, niaufn, & 183 184 & ln_salfix, salfixmin, nn_divdmp, nitavgbkg, & 184 & mld_choice, mld_choice_bgc, rn_maxchlinc 185 & mld_choice, mld_choice_bgc, rn_maxchlinc, & 186 & cn_surftname 187 185 188 !!---------------------------------------------------------------------- 186 189 … … 211 214 niaufn = 0 212 215 nitavgbkg = 1 216 cn_surftname = "surft" 213 217 214 218 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 276 280 WRITE(numout,*) ' Logical switch for applying po2 increments ln_po2inc = ', ln_po2inc 281 WRITE(numout,*) ' Surface temperature variable name (if applicable) cn_surftname = ', cn_surftname 277 282 ENDIF 278 283 … … 520 525 521 526 !Test if the increments file contains the surft variable. 522 isurfstat = iom_varid( inum, 'bckin surft', ldstop = .FALSE. )527 isurfstat = iom_varid( inum, 'bckin'//TRIM(cn_surftname), ldstop = .FALSE. ) 523 528 IF ( isurfstat == -1 ) THEN 524 529 lk_surft = .FALSE. … … 526 531 lk_surft = .TRUE. 527 532 CALL ctl_warn( ' Applying 2D temperature increment to bottom of ML: ', & 528 & ' bckin surftfound in increments file.' )533 & ' bckin'//TRIM(cn_surftname)//' found in increments file.' ) 529 534 ENDIF 530 535 … … 553 558 554 559 ALLOCATE( t_bkginc_2d(jpi,jpj) ) 555 CALL iom_get( inum, jpdom_autoglo, 'bckin surft', t_bkginc_2d, 1)560 CALL iom_get( inum, jpdom_autoglo, 'bckin'//TRIM(cn_surftname), t_bkginc_2d, 1) 556 561 #if defined key_bdy 557 562 DO jk = 1,jpkm1
Note: See TracChangeset
for help on using the changeset viewer.