Changeset 6010 for branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU

Timestamp:

2015-12-07T14:32:39+01:00 (8 years ago)

Author:

timgraham

Message:

Tidying of DIU code

Location:

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU

Files:

• cool_skin.F90 (modified) (1 diff)
• diurnal_bulk.F90 (modified) (4 diffs)
• step_diu.F90 (added)

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90

@@ -94 +94 @@
      
       INTEGER :: ji,jj
-      
+     
+      IF ( .NOT. ln_blk_core ) THEN
+         CALL ctl_stop("cool_skin.f90: diurnal flux processing only implemented"//&
+         &             " for core bulk forcing")
+      ENDIF
+ 
       DO jj = 1,jpj
          DO ji = 1,jpi

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIU/diurnal_bulk.F90

@@ -81 +81 @@
    END SUBROUTINE diurnal_sst_bulk_init
    
-   SUBROUTINE diurnal_sst_takaya_step(psolflux, pqflux, ptauflux, prho, p_rdt,&
-            &                  pla, pthick, pcoolthick, pmu, ld_calcfrac, &
+   SUBROUTINE diurnal_sst_takaya_step(kt, psolflux, pqflux, ptauflux, prho, p_rdt,&
+            &                  pla, pthick, pcoolthick, pmu, &
             &                  p_fvel_bkginc, p_hflux_bkginc)
       !!----------------------------------------------------------------------
@@ -123 +123 @@
       REAL(wp), INTENT(IN) :: p_rdt                         ! time-step
       
-      LOGICAL, OPTIONAL, &
-      &     INTENT(IN)  :: ld_calcfrac   ! Set TRUE to recalculate the 
-                                         ! solar fraction
-      
       ! Local variables 
       REAL(wp), DIMENSION(jpi,jpj) :: z_fvel              ! friction velocity     
@@ -136 +132 @@
       
       INTEGER :: ji,jj
+      INTEGER, INTENT(IN) :: kt                           ! time step
 
       ! Set optional arguments to their defaults
@@ -158 +155 @@
          zla(:,:) = pla(:,:)
       ENDIF
-      IF ( .NOT. PRESENT(ld_calcfrac) ) THEN
-         ll_calcfrac = .FALSE.
-      ELSE
-         ll_calcfrac = ld_calcfrac
-      ENDIF     
       
       ! If not done already, calculate the solar fraction
-      IF (ll_calcfrac ) THEN
+      IF ( kt==nit000 ) THEN
          DO jj = 1,jpj
             DO ji = 1, jpi