Changeset 8916

Timestamp:

2017-12-06T13:24:18+01:00 (6 years ago)

Author:

alexwestmohc

Message:

Protected reading and writing of top layer ice temperature and effective
conductivity in restarts by ln_meto_cpl

Corrected meltponds setting in sbccpl

Added rt0 to sstfrz as this is output in Celsius

Location:

branches/UKMO/dev_r8183_ICEMODEL_svn_removed/NEMOGCM/NEMO

Files:

• LIM_SRC_3/icerst.F90 (modified) (3 diffs)
• OPA_SRC/SBC/sbccpl.F90 (modified) (2 diffs)

branches/UKMO/dev_r8183_ICEMODEL_svn_removed/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90

@@ -18 +18 @@
    USE ice            ! sea-ice variables
    USE dom_oce        ! ocean domain
-   USE sbc_oce , ONLY : nn_fsbc
+   USE sbc_oce , ONLY : nn_fsbc, ln_meto_cpl
    USE icectl
    !
@@ -145 +145 @@
          z2d(:,:) = t_su(:,:,jl)
          CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! t_su
-         znam = 'cnd_ice'//'_htc'//zchar
-         z2d(:,:) = cnd_ice(:,:,jl)
-         CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! cnd_ice
-         znam = 't1_ice'//'_htc'//zchar
-         z2d(:,:) = t1_ice(:,:,jl)
-         CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! t1_ice
+
+         IF (ln_meto_cpl) THEN
+            znam = 'cnd_ice'//'_htc'//zchar
+            z2d(:,:) = cnd_ice(:,:,jl)
+            CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! cnd_ice
+            znam = 't1_ice'//'_htc'//zchar
+            z2d(:,:) = t1_ice(:,:,jl)
+            CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! t1_ice
+         ENDIF
+
       END DO
 
@@ -249 +253 @@
          CALL iom_get( numrir, jpdom_autoglo, znam , z2d )
          t_su(:,:,jl) = z2d(:,:)
-         znam = 'cnd_ice'//'_htc'//zchar
-         CALL iom_get( numrir, jpdom_autoglo, znam , z2d )
-         cnd_ice(:,:,jl) = z2d(:,:)
-         znam = 't1_ice'//'_htc'//zchar
-         CALL iom_get( numrir, jpdom_autoglo, znam , z2d )
-         t1_ice(:,:,jl) = z2d(:,:)
+
+         IF (ln_meto_cpl) THEN
+            znam = 'cnd_ice'//'_htc'//zchar
+            CALL iom_get( numrir, jpdom_autoglo, znam , z2d )
+            cnd_ice(:,:,jl) = z2d(:,:)
+            znam = 't1_ice'//'_htc'//zchar
+            CALL iom_get( numrir, jpdom_autoglo, znam , z2d )
+            t1_ice(:,:,jl) = z2d(:,:)
+         ENDIF
+
       END DO
 

branches/UKMO/dev_r8183_ICEMODEL_svn_removed/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -2405 +2405 @@
       IF( ssnd(jps_a_p)%laction .OR. ssnd(jps_ht_p)%laction ) THEN 
          SELECT CASE( sn_snd_mpnd%cldes)  
-         CASE( 'weighted ice' )  
+         CASE( 'ice only' )  
             SELECT CASE( sn_snd_mpnd%clcat )  
             CASE( 'yes' )  
@@ -2768 +2768 @@
 
       CALL eos_fzp(tsn(:,:,1,jp_sal), sstfrz)
-      ztmp1(:,:) = sstfrz(:,:)
+      ztmp1(:,:) = sstfrz(:,:) + rt0
       IF( ssnd(jps_sstfrz)%laction )  CALL cpl_snd( jps_sstfrz, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info)