Ignore:
Timestamp:
2019-05-03T17:13:09+02:00 (2 years ago)
Author:
acc
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Tidy up the diurnal cycle code (DIU) to separate its stand-alone functionality from the cool skin and warm layer calculations. The latter can be called from step; the former needs to be kept out of step so that it can implement its own time-level indices.
The stand-alone functionality will need to be revisited once the new timestepping is finalised. SETTE tested (ORCA2_ICE and SAS).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU/step_diu.F90

    r10922 r10927  
    66   !! History :  3.7  ! 2015-11  (J. While)  Original code 
    77 
    8    USE diurnal_bulk    ! diurnal SST bulk routines  (diurnal_sst_takaya routine)  
    9    USE cool_skin       ! diurnal cool skin correction (diurnal_sst_coolskin routine)    
     8   USE diu_layers      ! diurnal SST bulk and coolskin routines 
    109   USE iom 
    1110   USE sbc_oce 
     
    6463      ENDIF 
    6564      
    66       ! Cool skin 
    67       IF( .NOT.ln_diurnal )   CALL ctl_stop( "stp_diurnal: ln_diurnal not set" ) 
    68           
    69       IF( .NOT. ln_blk    )   CALL ctl_stop( "stp_diurnal: diurnal flux processing only implemented for bulk forcing" )  
    70  
    71       CALL diurnal_sst_coolskin_step( qns, taum, rhop(:,:,1), rdt) 
    72  
    73       CALL iom_put( "sst_wl"   , x_dsst               )    ! warm layer (write out before update below). 
    74       CALL iom_put( "sst_cs"   , x_csdsst             )    ! cool skin 
    75  
    76       ! Diurnal warm layer model        
    77       CALL diurnal_sst_takaya_step( kstp, &  
    78       &    qsr, qns, taum, rhop(:,:,1), rdt)  
     65      call diurnal_layers( kstp )                     ! coolskin and warm layer calculations 
    7966 
    8067      IF( ln_diurnal_only ) THEN 
Note: See TracChangeset for help on using the changeset viewer.