Changeset 11380 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_DYN_optimization/src/ICE/icesbc.F90

Timestamp:

2019-07-31T15:56:02+02:00 (5 years ago)

Author:

girrmann

Message:

dev_r10984_HPC-13 : adding extra halos in dyn_spg_ts is now possible, only works with a single halo when used with tide or bdy, see #2308

File:

• NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_DYN_optimization/src/ICE/icesbc.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_DYN_optimization/src/ICE/icesbc.F90

@@ -114 +114 @@
       INTEGER, INTENT(in) ::   ksbc   ! flux formulation (user defined, bulk or Pure Coupled)
       !
-      INTEGER  ::   ji, jj, jl      ! dummy loop index
-      REAL(wp) ::   zmiss_val       ! missing value retrieved from xios 
-      REAL(wp), DIMENSION(jpi,jpj,jpl)              ::   zalb_os, zalb_cs  ! ice albedo under overcast/clear sky
-      REAL(wp), DIMENSION(:,:)        , ALLOCATABLE ::   zalb, zmsk00      ! 2D workspace
+      INTEGER  ::   ji, jj, jl                                ! dummy loop index
+      REAL(wp), DIMENSION(jpi,jpj,jpl) ::   zalb_os, zalb_cs  ! ice albedo under overcast/clear sky
+      REAL(wp), DIMENSION(jpi,jpj)     ::   zalb              ! 2D workspace
       !!--------------------------------------------------------------------
       !
@@ -127 +126 @@
          WRITE(numout,*)'~~~~~~~~~~~~~~~'
       ENDIF
-
-      ! get missing value from xml
-      CALL iom_miss_val( "icetemp", zmiss_val )
 
       ! --- cloud-sky and overcast-sky ice albedos --- !
@@ -156 +152 @@
 
       !--- output ice albedo and surface albedo ---!
-      IF( iom_use('icealb') .OR. iom_use('albedo') ) THEN
-
-         ALLOCATE( zalb(jpi,jpj), zmsk00(jpi,jpj) )
-
-         WHERE( at_i_b <= epsi06 )
-            zmsk00(:,:) = 0._wp
-            zalb  (:,:) = rn_alb_oce
-         ELSEWHERE
-            zmsk00(:,:) = 1._wp            
-            zalb  (:,:) = SUM( alb_ice * a_i_b, dim=3 ) / at_i_b
+      IF( iom_use('icealb') ) THEN
+         WHERE( at_i_b <= epsi06 )   ;   zalb(:,:) = rn_alb_oce
+         ELSEWHERE                   ;   zalb(:,:) = SUM( alb_ice * a_i_b, dim=3 ) / at_i_b
          END WHERE
-         ! ice albedo
-         CALL iom_put( 'icealb' , zalb * zmsk00 + zmiss_val * ( 1._wp - zmsk00 ) )
-         ! ice+ocean albedo
+         CALL iom_put( "icealb" , zalb(:,:) )
+      ENDIF
+      IF( iom_use('albedo') ) THEN
          zalb(:,:) = SUM( alb_ice * a_i_b, dim=3 ) + rn_alb_oce * ( 1._wp - at_i_b )
-         CALL iom_put( 'albedo' , zalb )
-
-         DEALLOCATE( zalb, zmsk00 )
-
+         CALL iom_put( "albedo" , zalb(:,:) )
       ENDIF
       !