Changeset 6017

Timestamp:

2015-12-08T11:38:01+01:00 (8 years ago)

Author:

timgraham

Message:

bug fixes for sette (and agrif) for DIU branch

Location:

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC

Files:

• DIU/step_diu.F90 (modified) (2 diffs)
• nemogcm.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)
• step_oce.F90 (modified) (1 diff)

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

@@ -1 @@
-MODULE stp_diu
+MODULE step_diu
    !!======================================================================
    !!                       ***  MODULE stp_diu  ***
@@ -94 +94 @@
    END SUBROUTINE stp_diurnal  
    
-END MODULE stp_diu
+END MODULE step_diu

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -80 +80 @@
    USE lib_mpp         ! distributed memory computing
    USE diurnal_bulk    ! diurnal bulk SST 
-   USE stp_diu         ! diurnal bulk SST timestepping if run offline
+   USE step_diu        ! diurnal bulk SST timestepping (called from here if run offline)
 #if defined key_iomput
    USE xios            ! xIOserver

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -40 +40 @@
    PRIVATE
 
-   PUBLIC   stp, stp_diurnal   ! called by nemogcm.F90
+   PUBLIC   stp   ! called by nemogcm.F90
 
    !! * Substitutions

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -72 +72 @@
    USE zdfmxl           ! Mixed-layer depth                (zdf_mxl routine)
 
+   USE step_diu        ! Time stepping for diurnal sst
    USE diurnal_bulk    ! diurnal SST bulk routines  (diurnal_sst_takaya routine) 
    USE cool_skin       ! diurnal cool skin correction (diurnal_sst_coolskin routine)