Changeset 7739 for branches/UKMO/r6232_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

Timestamp:

2017-02-27T13:07:05+01:00 (7 years ago)

Author:

jcastill

Message:

Add a 'standard formulation' for calculating momentum from forcing winds using a constant drag coefficient; remove drag coefficient checks after fixing the wave model

File:

• branches/UKMO/r6232_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90 (modified) (2 diffs)

branches/UKMO/r6232_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx.F90

@@ -38 +38 @@
    LOGICAL , PUBLIC    ::   ln_shelf_flx = .FALSE. ! UKMO SHELF specific flux flag
    INTEGER             ::   jpfld_local   ! maximum number of files to read (locally modified depending on ln_shelf_flx) 
+
+   INTEGER, PUBLIC            ::   nn_drag        ! type of formula to calculate wind stress from wind components
+   INTEGER, PUBLIC, PARAMETER ::   jp_ukmo  = 0        ! UKMO SHELF formulation
+   INTEGER, PUBLIC, PARAMETER ::   jp_std   = 1        ! standard formulation with forced or coupled drag coefficient 
+   INTEGER, PUBLIC, PARAMETER ::   jp_const = 2        ! standard formulation with constant drag coefficient 
 
    !! * Substitutions
@@ -147 +152 @@
          !                                                        ! add modification due to drag coefficient read from wave forcing
          !                                                        ! this code is inefficient but put here to allow merging with another UKMO branch
-         IF( ln_shelf_flx .AND. ln_cdgw .AND. nn_drag == jp_std ) THEN
-            IF( cpl_wdrag ) THEN 
-               ! reset utau and vtau to the wind components: the momentum will
-               ! be calculated from the coupled value of the drag coefficient
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
-                     utau(ji,jj) = sf(jp_utau)%fnow(ji,jj,1)
-                     vtau(ji,jj) = sf(jp_vtau)%fnow(ji,jj,1)
+         IF( ln_shelf_flx ) THEN
+            IF( ln_cdgw .AND. nn_drag == jp_std ) THEN
+               IF( cpl_wdrag ) THEN 
+                  ! reset utau and vtau to the wind components: the momentum will
+                  ! be calculated from the coupled value of the drag coefficient
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
+                        utau(ji,jj) = sf(jp_utau)%fnow(ji,jj,1)
+                        vtau(ji,jj) = sf(jp_vtau)%fnow(ji,jj,1)
+                     END DO
                   END DO
-               END DO
-            ELSE
+               ELSE
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
+                        totwind = sqrt((sf(jp_utau)%fnow(ji,jj,1))**2.0 + (sf(jp_vtau)%fnow(ji,jj,1))**2.0)
+                        utau(ji,jj) = zrhoa * cdn_wave(ji,jj) * sf(jp_utau)%fnow(ji,jj,1) * totwind
+                        vtau(ji,jj) = zrhoa * cdn_wave(ji,jj) * sf(jp_vtau)%fnow(ji,jj,1) * totwind
+                     END DO
+                  END DO
+               ENDIF
+            ELSE IF( nn_drag == jp_const ) THEN
                DO jj = 1, jpj
                   DO ji = 1, jpi
                      totwind = sqrt((sf(jp_utau)%fnow(ji,jj,1))**2.0 + (sf(jp_vtau)%fnow(ji,jj,1))**2.0)
-                     utau(ji,jj) = zrhoa * cdn_wave(ji,jj) * sf(jp_utau)%fnow(ji,jj,1) * totwind
-                     vtau(ji,jj) = zrhoa * cdn_wave(ji,jj) * sf(jp_vtau)%fnow(ji,jj,1) * totwind
+                     utau(ji,jj) = zrhoa * zcdrag * sf(jp_utau)%fnow(ji,jj,1) * totwind
+                     vtau(ji,jj) = zrhoa * zcdrag * sf(jp_vtau)%fnow(ji,jj,1) * totwind
                   END DO
                END DO