Changeset 10989 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU

Timestamp:

2019-05-16T17:45:46+02:00 (5 years ago)

Author:

acc

Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Convert NST routines in preparation for getting AGRIF back up and running. AGRIF conv stage now works but requires some renaming of recently changes DIU modules (included in this commit). AGRIF compile and link stage not yet working (agrif routines need to be passed the time-level indices) but non-AGRIF SETTE tests are all OK

Location:

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU

Files:

• diu_bulk.F90 (moved) (moved from NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU/diurnal_bulk.F90) (2 diffs)
• diu_coolskin.F90 (moved) (moved from NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU/diurnal_coolskin.F90) (4 diffs)
• diu_layers.F90 (moved) (moved from NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU/diurnal_layers.F90) (1 diff)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU/diu_bulk.F90

@@ -1 @@
-MODULE diurnal_bulk
+MODULE diu_bulk
    !!======================================================================
-   !!                    ***  MODULE  diurnal_bulk  ***
+   !!                    ***  MODULE  diu_bulk  ***
    !!     Takaya model of diurnal warming (Takaya, 2010)
    !!=====================================================================
@@ -265 +265 @@
       END FUNCTION t_imp
 
-END MODULE diurnal_bulk
+END MODULE diu_bulk

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU/diu_coolskin.F90

@@ -1 @@
-MODULE cool_skin
+MODULE diu_coolskin
    !!======================================================================
-   !!                    ***  MODULE  cool_skin  ***
+   !!                    ***  MODULE  diu_coolskin  ***
    !!     Cool skin thickness and delta T correction using Artele et al. (2002)
    !!     [see also Tu and Tsuang (2005)]
@@ -38 +38 @@
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) :: x_csdsst    ! Cool skin delta SST
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) :: x_csthick   ! Cool skin thickness
-
    PUBLIC diurnal_sst_coolskin_step, diurnal_sst_coolskin_init
 
@@ -96 +95 @@
       !!----------------------------------------------------------------------
       !
-      IF( .NOT. ln_blk )   CALL ctl_stop("cool_skin.f90: diurnal flux processing only implemented for bulk forcing")
+      IF( .NOT. ln_blk )   CALL ctl_stop("diu_coolskin.f90: diurnal flux processing only implemented for bulk forcing")
       !
       DO jj = 1,jpj
@@ -144 +143 @@
 
    !!======================================================================
-END MODULE cool_skin
+END MODULE diu_coolskin

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DIU/diu_layers.F90

@@ -6 +6 @@
    !! History :  3.7  ! 2015-11  (J. While)  Original code
 
-   USE diurnal_bulk    ! diurnal SST bulk routines  (diurnal_sst_takaya routine) 
-   USE cool_skin       ! diurnal cool skin correction (diurnal_sst_coolskin routine)   
+   USE diu_bulk     ! diurnal SST bulk routines  (diurnal_sst_takaya routine) 
+   USE diu_coolskin ! diurnal cool skin correction (diurnal_sst_coolskin routine)   
    USE oce
    USE iom
    USE sbc_oce
-   USE sbcmod           ! surface boundary condition       (sbc     routine)
+   USE sbcmod       ! surface boundary condition       (sbc     routine)
    
    IMPLICIT NONE