Changeset 8514 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90

Timestamp:

2017-09-08T17:09:25+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part5 - almost done

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (modified) (7 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90

@@ -20 +20 @@
    USE ice            ! LIM variables
    USE ice1D          ! LIM thermodynamics
+   USE icethd_sal     ! sea-ice: salinity profiles
    !
    USE in_out_manager ! I/O manager
@@ -107 +108 @@
       !!------------------------------------------------------------------
 
-      ! Discriminate between varying salinity (nn_icesal=2) and prescribed cases (other values)
+      ! Discriminate between time varying salinity and constant
       SELECT CASE( nn_icesal )                  ! varying salinity or not
-         CASE( 1, 3 )   ;   zswitch_sal = 0._wp   ! prescribed salinity profile
-         CASE( 2 )      ;   zswitch_sal = 1._wp   ! varying salinity profile
+         CASE( 1 , 3 )   ;   zswitch_sal = 0._wp   ! prescribed salinity profile
+         CASE( 2 )       ;   zswitch_sal = 1._wp   ! varying salinity profile
       END SELECT
 
@@ -406 +407 @@
 
       num_iter_max = 1
-      IF( nn_icesal == 2 ) num_iter_max = 5
-
+      IF( nn_icesal == 2 )   num_iter_max = 5  ! salinity varying in time
+      
       ! Iterative procedure
       DO ji = 1, nidx
@@ -586 +587 @@
          hfx_out_1d(ji)  = hfx_out_1d(ji) + ( zq_rema(ji) * a_i_1d(ji) ) * r1_rdtice
 
-         IF( ln_limctl .AND. zq_rema(ji) < 0. .AND. lwp ) WRITE(numout,*) 'ALERTE zq_rema <0 = ', zq_rema(ji)
+         IF( ln_icectl .AND. zq_rema(ji) < 0. .AND. lwp ) WRITE(numout,*) 'ALERTE zq_rema <0 = ', zq_rema(ji)
       END DO
 
@@ -613 +614 @@
          sfx_sni_1d(ji) = sfx_sni_1d(ji) + sss_1d(ji) * a_i_1d(ji) * zfmdt * r1_rdtice 
 
-         ! virtual salt flux to keep salinity constant
+         ! Case constant salinity in time: virtual salt flux to keep salinity constant
          IF( nn_icesal == 1 .OR. nn_icesal == 3 )  THEN
             sfx_bri_1d(ji) = sfx_bri_1d(ji) - sss_1d (ji) * a_i_1d(ji) * zfmdt                  * r1_rdtice  & ! put back sss_m     into the ocean
@@ -665 +666 @@
       REAL(wp), DIMENSION(:,:), INTENT(in   ) :: pin   ! previous fraction lead ( 1. - a_i_b )
       REAL(wp), DIMENSION(:,:), INTENT(inout) :: pout
-      pout = ( 1._wp - ( pin )**rn_betas )
+      pout = ( 1._wp - ( pin )**rn_blow_s )
    END SUBROUTINE ice_thd_snwblow_2d
 
@@ -671 +672 @@
       REAL(wp), DIMENSION(:), INTENT(in   ) :: pin
       REAL(wp), DIMENSION(:), INTENT(inout) :: pout
-      pout = ( 1._wp - ( pin )**rn_betas )
+      pout = ( 1._wp - ( pin )**rn_blow_s )
    END SUBROUTINE ice_thd_snwblow_1d