Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90 (modified) (10 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DIU/cool_skin.F90

@@ -10 +10 @@
 
    !!----------------------------------------------------------------------
-   !!   diurnal_sst_coolskin_step  : time-step the cool skin corrections
+   !!   diurnal_sst_coolskin_init : initialisation of the cool skin
+   !!   diurnal_sst_coolskin_step : time-stepping  of the cool skin corrections
    !!----------------------------------------------------------------------
    USE par_kind
@@ -21 +22 @@
    
    IMPLICIT NONE
-   
+   PRIVATE
+
    ! Namelist parameters
 
@@ -37 +39 @@
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) :: x_csthick   ! Cool skin thickness
 
-   PRIVATE
    PUBLIC diurnal_sst_coolskin_step, diurnal_sst_coolskin_init
 
       !! * Substitutions
 #  include "vectopt_loop_substitute.h90"
-   
+   !!----------------------------------------------------------------------
+   !! NEMO/OPA 4.0 , NEMO-consortium (2016) 
+   !! $Id:  $
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------   
    CONTAINS 
    
@@ -56 +61 @@
       !! 
       !!----------------------------------------------------------------------
-      
-      IMPLICIT NONE
-      
       ALLOCATE( x_csdsst(jpi,jpj), x_csthick(jpi,jpj) )
       x_csdsst = 0.
       x_csthick = 0.
-      
+      !
    END SUBROUTINE diurnal_sst_coolskin_init
- 
+
+
    SUBROUTINE diurnal_sst_coolskin_step(psqflux, pstauflux, psrho, rdt)
       !!----------------------------------------------------------------------
@@ -75 +78 @@
       !! ** Reference : 
       !!----------------------------------------------------------------------
-     
-      IMPLICIT NONE
-     
       ! Dummy variables
       REAL(wp), INTENT(IN), DIMENSION(jpi,jpj) :: psqflux     ! Heat (non-solar)(Watts)
@@ -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
- 
+      !!----------------------------------------------------------------------
+      !
+      IF( .NOT. ln_blk )   CALL ctl_stop("cool_skin.f90: diurnal flux processing only implemented for bulk forcing")
+      !
       DO jj = 1,jpj
          DO ji = 1,jpi
-            
+            !
             ! Calcualte wind speed from wind stress and friction velocity
             IF( tmask(ji,jj,1) == 1. .AND. pstauflux(ji,jj) /= 0 .AND. psrho(ji,jj) /=0 ) THEN
@@ -111 +109 @@
                z_wspd(ji,jj) = 0.     
             ENDIF
-
- 
+            !
             ! Calculate gamma function which is dependent upon wind speed
             IF( tmask(ji,jj,1) == 1. ) THEN
@@ -119 +116 @@
                IF( ( z_wspd(ji,jj) >= 10. ) ) z_gamma(ji,jj) = 6.
             ENDIF
-
-
+            !
             ! Calculate lamda function
             IF( tmask(ji,jj,1) == 1. .AND. z_fv(ji,jj) /= 0 ) THEN
@@ -127 +123 @@
                z_lamda(ji,jj) = 0.
             ENDIF
-
-
-
+            !
             ! Calculate the cool skin thickness - only when heat flux is out of the ocean
             IF( tmask(ji,jj,1) == 1. .AND. z_fv(ji,jj) /= 0 .AND. psqflux(ji,jj) < 0 ) THEN
-                x_csthick(ji,jj) = ( z_lamda(ji,jj) * pp_v ) / z_fv(ji,jj)
+               x_csthick(ji,jj) = ( z_lamda(ji,jj) * pp_v ) / z_fv(ji,jj)
             ELSE
-                x_csthick(ji,jj) = 0.
+               x_csthick(ji,jj) = 0.
             ENDIF
-
-
-
+            !
             ! Calculate the cool skin correction - only when the heat flux is out of the ocean
             IF( tmask(ji,jj,1) == 1. .AND. x_csthick(ji,jj) /= 0. .AND. psqflux(ji,jj) < 0. ) THEN
@@ -145 +137 @@
                x_csdsst(ji,jj) = 0.
             ENDIF
-
-         ENDDO
-      ENDDO
-
+            !
+         END DO
+      END DO
+      !
    END SUBROUTINE diurnal_sst_coolskin_step
 
-
+   !!======================================================================
 END MODULE cool_skin