Changeset 8765

Timestamp:

2017-11-21T14:15:42+01:00 (6 years ago)

Author:

jcastill

Message:

Keep reading the wind stress in forced mode in order to calculate the 10m winds, which is needed for ice calculations

File:

• branches/UKMO/r8727_WAVE-2_Clementi_add_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) (6 diffs)

branches/UKMO/r8727_WAVE-2_Clementi_add_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

@@ -29 +29 @@
    PUBLIC sbc_flx       ! routine called by step.F90
 
-   INTEGER             ::   jpfld         ! maximum number of files to read 
-   INTEGER             ::   jp_utau       ! index of wind stress (i-component) file
-   INTEGER             ::   jp_vtau       ! index of wind stress (j-component) file
-   INTEGER             ::   jp_qtot       ! index of total (non solar+solar) heat file
-   INTEGER             ::   jp_qsr        ! index of solar heat file
-   INTEGER             ::   jp_emp        ! index of evaporation-precipation file
+   INTEGER , PARAMETER ::   jpfld   = 5   ! maximum number of files to read 
+   INTEGER , PARAMETER ::   jp_utau = 1   ! index of wind stress (i-component) file
+   INTEGER , PARAMETER ::   jp_vtau = 2   ! index of wind stress (j-component) file
+   INTEGER , PARAMETER ::   jp_qtot = 3   ! index of total (non solar+solar) heat file
+   INTEGER , PARAMETER ::   jp_qsr  = 4   ! index of solar heat file
+   INTEGER , PARAMETER ::   jp_emp  = 5   ! index of evaporation-precipation file
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf    ! structure of input fields (file informations, fields read)
 
@@ -82 +82 @@
       REAL(wp) ::   zcdrag = 1.5e-3       ! drag coefficient
       REAL(wp) ::   ztx, zty, zmod, zcoef ! temporary variables
-      LOGICAL  ::   ln_readtau            ! Is it necessary to read utau, vtau from file?
       !!
       CHARACTER(len=100) ::  cn_dir                               ! Root directory for location of flx files
@@ -91 +90 @@
       !
       IF( kt == nit000 ) THEN                ! First call kt=nit000  
-         ln_readtau = .NOT. (ln_wave .AND. ln_tauw )
-
-         ! prepare the index of the fields that have to be read
-         jpfld = 0
-         IF( ln_readtau ) THEN
-            jp_utau = jpfld+1
-            jp_vtau = jpfld+2
-            jpfld = jpfld+2
-         ELSE
-            jp_utau = 0   ;  jp_vtau = 0
-         ENDIF
-         jp_qtot = jpfld+1
-         jp_qsr = jpfld+2
-         jp_emp = jpfld+3
-         jpfld = jpfld+3
-
          ! set file information
          REWIND( numnam_ref )              ! Namelist namsbc_flx in reference namelist : Files for fluxes
@@ -122 +105 @@
          !
          !                                         ! store namelist information in an array
-         IF( ln_readtau ) THEN
-            slf_i(jp_utau) = sn_utau   ;   slf_i(jp_vtau) = sn_vtau
-         ENDIF
+         slf_i(jp_utau) = sn_utau   ;   slf_i(jp_vtau) = sn_vtau
          slf_i(jp_qtot) = sn_qtot   ;   slf_i(jp_qsr ) = sn_qsr 
          slf_i(jp_emp ) = sn_emp
@@ -152 +133 @@
          DO jj = 1, jpj                                           ! set the ocean fluxes from read fields
             DO ji = 1, jpi
-               IF( ln_readtau ) THEN
-                  utau(ji,jj) = sf(jp_utau)%fnow(ji,jj,1)
-                  vtau(ji,jj) = sf(jp_vtau)%fnow(ji,jj,1)
-               ENDIF
+               utau(ji,jj) = sf(jp_utau)%fnow(ji,jj,1)
+               vtau(ji,jj) = sf(jp_vtau)%fnow(ji,jj,1)
                qns (ji,jj) = sf(jp_qtot)%fnow(ji,jj,1) - sf(jp_qsr)%fnow(ji,jj,1)
                emp (ji,jj) = sf(jp_emp )%fnow(ji,jj,1)
@@ -164 +143 @@
          !
          !                                                        ! module of wind stress and wind speed at T-point
-         IF( ln_readtau ) THEN
-            zcoef = 1. / ( zrhoa * zcdrag )
-            DO jj = 2, jpjm1
-               DO ji = fs_2, fs_jpim1   ! vect. opt.
-                  ztx = utau(ji-1,jj  ) + utau(ji,jj) 
-                  zty = vtau(ji  ,jj-1) + vtau(ji,jj) 
-                  zmod = 0.5 * SQRT( ztx * ztx + zty * zty )
-                  taum(ji,jj) = zmod
-                  wndm(ji,jj) = SQRT( zmod * zcoef )
-               END DO
+         zcoef = 1. / ( zrhoa * zcdrag )
+         DO jj = 2, jpjm1
+            DO ji = fs_2, fs_jpim1   ! vect. opt.
+               ztx = utau(ji-1,jj  ) + utau(ji,jj) 
+               zty = vtau(ji  ,jj-1) + vtau(ji,jj) 
+               zmod = 0.5 * SQRT( ztx * ztx + zty * zty )
+               taum(ji,jj) = zmod
+               wndm(ji,jj) = SQRT( zmod * zcoef )
             END DO
-            taum(:,:) = taum(:,:) * tmask(:,:,1) ; wndm(:,:) = wndm(:,:) * tmask(:,:,1)
-            CALL lbc_lnk( taum(:,:), 'T', 1. )   ;   CALL lbc_lnk( wndm(:,:), 'T', 1. )
-         ENDIF
+         END DO
+         taum(:,:) = taum(:,:) * tmask(:,:,1) ; wndm(:,:) = wndm(:,:) * tmask(:,:,1)
+         CALL lbc_lnk( taum(:,:), 'T', 1. )   ;   CALL lbc_lnk( wndm(:,:), 'T', 1. )
 
          IF( nitend-nit000 <= 100 .AND. lwp ) THEN                ! control print (if less than 100 time-step asked)