Changeset 8626 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3

Timestamp:

2017-10-13T19:21:48+02:00 (7 years ago)

Author:

clem

Message:

rebin thickness after bdy in case itd is not the same between the input and simulation + prepare some changes in salinity

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3

Files:

• iceistate.F90 (modified) (1 diff)
• icethd.F90 (modified) (1 diff)
• icethd_dh.F90 (modified) (1 diff)

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

@@ -314 +314 @@
 
          ! for constant salinity in time
-         IF( nn_icesal == 1 .OR. nn_icesal == 3 )  THEN
+         IF( nn_icesal /= 2 )  THEN
             CALL ice_var_salprof
             sv_i = s_i * v_i

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

@@ -584 +584 @@
                        CALL ice_thd_pnd_init   ! set melt ponds parameters
       !
-      IF( ln_icedS .AND. nn_icesal == 1 ) THEN
-         ln_icedS = .FALSE.
-         CALL ctl_warn('ln_icedS is set to false since constant ice salinity is chosen (nn_icesal=1)')
-      ENDIF
-      !
    END SUBROUTINE ice_thd_init
 

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

@@ -615 +615 @@
 
          ! Case constant salinity in time: virtual salt flux to keep salinity constant
-         IF( nn_icesal == 1 .OR. nn_icesal == 3 )  THEN
+         IF( nn_icesal /= 2 )  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
                &                            - s_i_1d(ji)  * a_i_1d(ji) * dh_snowice(ji) * rhoic * r1_rdtice    ! and get  rn_icesal from the ocean