Changeset 10249 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2018-10-29T13:03:40+01:00 (5 years ago)

Author:

kingr

Message:

Merged AMM15_v3_6_STABLE_package_collate@10237

File:

• branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (8 diffs)

branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -225 +225 @@
       ENDIF
 
+      ! Cool skin
+      IF ( ln_diurnal ) THEN  
+         IF ( ln_blk_core ) THEN
+            CALL diurnal_sst_coolskin_step( &  
+                    qns(:,:)+(rn_abs*qsr(:,:)), taum, rhop(:,:,1), rdt) 
+         ELSE
+            CALL diurnal_sst_coolskin_step( &  
+                    qns, taum, rhop(:,:,1), rdt) 
+         ENDIF
+      ENDIF
+
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! diagnostics and outputs             (ua, va, tsa used as workspace)
@@ -238 +249 @@
       IF( ln_crs     )      CALL crs_fld( kstp )         ! ocean model: online field coarsening & output
 
+      !Diurnal warm layer model        
+      IF ( ln_diurnal ) THEN
+         IF ( ln_blk_core ) THEN
+            IF( kstp == nit000 )THEN  
+               CALL diurnal_sst_takaya_step( &  
+               &    qsr(:,:)-(rn_abs*qsr(:,:)), qns(:,:)+(rn_abs*qsr(:,:)), &
+               &    taum, rhop(:,:,1), &
+               &    rdt, ld_calcfrac = .TRUE.)  
+            ELSE  
+               CALL diurnal_sst_takaya_step( &  
+               &    qsr(:,:)-(rn_abs*qsr(:,:)), qns(:,:)+(rn_abs*qsr(:,:)), &
+               &    taum, rhop(:,:,1), rdt )  
+            ENDIF 
+         ELSE
+            IF( kstp == nit000 )THEN  
+               CALL diurnal_sst_takaya_step( &  
+               &    qsr, qns, taum, rhop(:,:,1), &
+               &    rdt, ld_calcfrac = .TRUE.)  
+            ELSE  
+               CALL diurnal_sst_takaya_step( &  
+               &    qsr, qns, taum, rhop(:,:,1), rdt )  
+            ENDIF 
+         ENDIF
+      ENDIF
+
 #if defined key_top
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -255 +291 @@
                              CALL tra_sbc    ( kstp )       ! surface boundary condition
       IF( ln_traqsr      )   CALL tra_qsr    ( kstp )       ! penetrative solar radiation qsr
+      IF( ln_tradwl      )   CALL tra_dwl    ( kstp )       ! Polcoms Style Short Wave Radiation 
       IF( ln_trabbc      )   CALL tra_bbc    ( kstp )       ! bottom heat flux
       IF( lk_trabbl      )   CALL tra_bbl    ( kstp )       ! advective (and/or diffusive) bottom boundary layer scheme
@@ -299 +336 @@
       ! Dynamics                                    (tsa used as workspace)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+      IF( ln_bkgwri )        CALL asm_bkg_wri( kstp )     ! output background fields
+
       IF( lk_dynspg_ts   )  THEN
                                                              ! revert to previously computed momentum tendencies
@@ -317 +357 @@
         IF(  lk_asminc .AND. ln_asmiau .AND. &
            & ln_dyninc      )  CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment
-        IF( ln_bkgwri )        CALL asm_bkg_wri( kstp )     ! output background fields
         IF( ln_neptsimp )      CALL dyn_nept_cor( kstp )    ! subtract Neptune velocities (simplified)
         IF( lk_bdy          )  CALL bdy_dyn3d_dmp(kstp )    ! bdy damping trends
@@ -336 +375 @@
                                CALL ssh_swp( kstp )         ! swap of sea surface height
       IF( lk_vvl           )   CALL dom_vvl_sf_swp( kstp )  ! swap of vertical scale factors
-      !
-      IF( lrst_oce         )   CALL rst_write( kstp )       ! write output ocean restart file
 
 #if defined key_agrif
@@ -361 +398 @@
                                CALL dia_wri_state( 'output.abort', kstp )
       ENDIF
+      IF( ln_harm_ana_store   )   CALL harm_ana( kstp )        ! Harmonic analysis of tides 
       IF( kstp == nit000   )   THEN
                  CALL iom_close( numror )     ! close input  ocean restart file
@@ -366 +404 @@
          IF( lwm.AND.numoni /= -1 ) CALL FLUSH    ( numoni )     ! flush output namelist ice
       ENDIF
+      IF( lrst_oce         )   CALL rst_write    ( kstp )   ! write output ocean restart file
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>