Changeset 8757

Timestamp:

2017-11-20T17:29:37+01:00 (7 years ago)

Author:

jcastill

Message:

Changes to the branch to make it merge with branch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/r6232_HZG_WAVE-coupling
WARNING: This branch will probably not compile on its own - changes in the original branch will have to be copied here

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_UKEP/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) (5 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_UKEP/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

@@ -29 +29 @@
    PUBLIC sbc_flx       ! routine called by step.F90
 
-   INTEGER , PARAMETER ::   jpfld   = 6   ! 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
-   INTEGER , PARAMETER ::   jp_press = 6  ! index of pressure for UKMO shelf fluxes
+   INTEGER             ::   jpfld   = 6   ! 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             ::   jp_press      ! index of pressure for UKMO shelf fluxes
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf    ! structure of input fields (file informations, fields read)
    LOGICAL , PUBLIC    ::   ln_shelf_flx = .FALSE. ! UKMO SHELF specific flux flag
@@ -104 +104 @@
       !!---------------------------------------------------------------------
       !
+      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
+      jp_press = jpfld+4
+      jpfld = jpfld+4
+
       IF( kt == nit000 ) THEN                ! First call kt=nit000  
          ! set file information
@@ -153 +170 @@
 
          !!UKMO SHELF wind speed relative to surface currents - put here to allow merging with coupling branch
-         IF( ln_shelf_flx ) THEN
+         IF( ln_shelf_flx .AND. ln_readtau ) THEN
             CALL wrk_alloc( jpi,jpj, zwnd_i, zwnd_j )
 
@@ -192 +209 @@
                       pressnow(ji,jj) = sf(jp_press)%fnow(ji,jj,1)
                       !! UKMO SHELF flux files contain wind speed not wind stress
+                      IF( ln_readtau) THEN
                       totwindspd = sqrt(zwnd_i(ji,jj)*zwnd_i(ji,jj) + zwnd_j(ji,jj)*zwnd_j(ji,jj))
                       cs = 0.63 + (0.066 * totwindspd)
                       utau(ji,jj) = cs * (rhoa/rau0) * zwnd_i(ji,jj) * totwindspd
                       vtau(ji,jj) = cs * (rhoa/rau0) * zwnd_j(ji,jj) * totwindspd
+                      ENDIF
                    ELSE
+                      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
                    ENDIF
                    qsr (ji,jj) = sf(jp_qsr )%fnow(ji,jj,1)
@@ -252 +273 @@
          ENDIF
          !
-         IF( ln_shelf_flx ) THEN
+         IF( ln_shelf_flx .AND. ln_readtau ) THEN
             CALL wrk_dealloc( jpi,jpj, zwnd_i, zwnd_j )
          ENDIF