Changeset 14644 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/ABL/sbcabl.F90

Timestamp:

2021-03-26T15:33:49+01:00 (3 years ago)

Author:

sparonuz

Message:

Merge trunk -r14642:HEAD

Location:

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

Files:

• . (modified) (1 prop)
• src/ABL/sbcabl.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/ABL/sbcabl.F90

@@ -36 +36 @@
    USE sbc_ice, ONLY : wndm_ice, utau_ice, vtau_ice
 #endif
-#if ! defined key_iomput
+#if ! defined key_xios
    USE diawri    , ONLY : dia_wri_alloc_abl
 #endif
@@ -149 +149 @@
       CALL iom_close( inum )
 
-#if ! defined key_iomput
+#if ! defined key_xios
       IF( dia_wri_alloc_abl()  /= 0 ) CALL ctl_stop( 'STOP', 'abl_init : unable to allocate arrays' )
 #endif
@@ -363 +363 @@
             &              sf(jp_hpgi)%fnow(:,:,:), sf(jp_hpgj)%fnow(:,:,:),   &   !   <<= in
             &              zcd_du, zsen, zevp,                                 &   !   <=> in/out
-            &              wndm, utau, vtau, taum                              &   !   =>> out
+            &              zlat, wndm, utau, vtau, taum                        &   !   =>> out
 #if defined key_si3
             &            , tm_su, u_ice, v_ice, zssqi, zcd_dui                 &   !   <<= in
@@ -377 +377 @@
          CALL blk_oce_2( tq_abl(:,:,2,nt_n,jp_ta), sf(jp_qlw )%fnow(:,:,1),   &
             &            sf(jp_prec)%fnow(:,:,1) , sf(jp_snow)%fnow(:,:,1),   &
-            &            tsk_m, zsen, zlat, zevp                                )
+            &            tsk_m, zsen, zlat, zevp                              )
 
          CALL abl_rst_opn( kt )                       ! Open abl restart file (if necessary)
@@ -384 +384 @@
 #if defined key_si3
          ! Avoid a USE abl in icesbc module
-         sf(jp_tair)%fnow(:,:,1) = tq_abl(:,:,2,nt_n,jp_ta);  sf(jp_humi)%fnow(:,:,1) = tq_abl(:,:,2,nt_n,jp_qa)
+         theta_air_zt = tq_abl(:,:,2,nt_n,jp_ta) ;   q_air_zt = tq_abl(:,:,2,nt_n,jp_qa)
 #endif
       END IF

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette