Changeset 15457 for NEMO/trunk/src

Timestamp:

2021-10-28T15:12:49+02:00 (3 years ago)

Author:

lovato

Message:

update trcopt array names with coding practices and make elements more flexible

File:

• NEMO/trunk/src/TOP/trcopt.F90 (modified) (7 diffs)

NEMO/trunk/src/TOP/trcopt.F90

@@ -23 +23 @@
 
    LOGICAL  ::   ln_varpar   ! boolean for variable PAR fraction
-   REAL(wp) ::   parlux      ! Fraction of shortwave as PAR
+   REAL(wp), PUBLIC ::   parlux      ! Fraction of shortwave as PAR
    CHARACTER (len=25) :: light_loc ! Light location in the water cell ('center', 'integral')
 
@@ -30 +30 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   par_varsw      ! PAR fraction of shortwave
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ekb, ekg, ekr  ! wavelength (Red-Green-Blue)
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   xeps  ! weighted diffusion coefficient
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:), PUBLIC ::   zeps  ! weighted diffusion coefficient
 
    INTEGER  ::   nksrp   ! levels below which the light cannot penetrate ( depth larger than 391 m)
@@ -59 +59 @@
       INTEGER, INTENT(in) ::   Kbb, Kmm  ! time level indices
       REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(in) ::   zchl  ! chlorophyll field
-      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(out),OPTIONAL :: ze1, ze2, ze3 ! PAR for individual wavelength
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(out) :: ze1, ze2, ze3 ! PAR for individual wavelength
       !
       INTEGER  ::   ji, jj, jk, irgb
@@ -149 +149 @@
       DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
          ztmp = ze1(ji,jj,jk)* ekb(ji,jj,jk) + ze2(ji,jj,jk) * ekg(ji,jj,jk) + ze3(ji,jj,jk) * ekr(ji,jj,jk)
-         xeps(ji,jj,jk) = ztmp / e3t(ji,jj,jk,Kmm) / (etot(ji,jj,jk) + rtrn)
+         zeps(ji,jj,jk) = ztmp / e3t(ji,jj,jk,Kmm) / (etot(ji,jj,jk) + rtrn)
       END_3D
-      !xeps = (ze1(:,:,:) * ekb(:,:,:) + ze2(:,:,:) * ekg(:,:,:) + ze3(:,:,:) * ekr(:,:,:)) / e3t(:,:,:,Kmm) / (etot(:,:,:) + rtrn)
+      !zeps = (ze1(:,:,:) * ekb(:,:,:) + ze2(:,:,:) * ekg(:,:,:) + ze3(:,:,:) * ekr(:,:,:)) / e3t(:,:,:,Kmm) / (etot(:,:,:) + rtrn)
 
       !     Light at the euphotic depth
@@ -182 +182 @@
       !
       IF( lk_iomput ) THEN
-         CALL iom_put( "xeps" , xeps(:,:,:) * tmask(:,:,:) )
+         CALL iom_put( "xbla" , zeps(:,:,:) * tmask(:,:,:) )
          CALL iom_put( "Heup" , heup(:,:  ) * tmask(:,:,1) )
       ENDIF
@@ -263 +263 @@
       IF( ln_timing )  CALL timing_start('trc_opt_sbc')
       !
-      ! Compute par_varsw at nit000 or only if there is more than 1 time record in par coefficient file
+      ! Compute par_varsw at nittrc000 or only if there is more than 1 time record in par coefficient file
       IF( ln_varpar ) THEN
-         IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_par > 1 ) ) THEN
+         IF( kt == nittrc000 .OR. ( kt /= nittrc000 .AND. ntimes_par > 1 ) ) THEN
             CALL fld_read( kt, 1, sf_par )
             par_varsw(:,:) = ( sf_par(1)%fnow(:,:,1) ) / 3.0
@@ -350 +350 @@
       !
       ALLOCATE( ekb(jpi,jpj,jpk), ekr(jpi,jpj,jpk),  &
-                ekg(jpi,jpj,jpk), xeps(jpi,jpj,jpk), STAT= trc_opt_alloc  ) 
+                ekg(jpi,jpj,jpk),zeps(jpi,jpj,jpk),  STAT= trc_opt_alloc  ) 
       !
       IF( trc_opt_alloc /= 0 ) CALL ctl_stop( 'STOP', 'trc_opt_alloc : failed to allocate arrays.' )