Changeset 15004 for NEMO/trunk/src/OCE/DYN

Timestamp:

2021-06-16T12:33:18+02:00 (3 years ago)

Author:

mathiot

Message:

ticket #2960: commit fix to the trunk (WARNING: output convention of isf fluxes changed from oce->isf to isf->oce), no impact on the input file needed for some options

Location:

NEMO/trunk/src/OCE/DYN

Files:

• dynspg_ts.F90 (modified) (1 diff)
• sshwzv.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/DYN/dynspg_ts.F90

@@ -320 +320 @@
       !                                   ! ---------------------------------------------------  !
       IF (ln_bt_fw) THEN                          ! FORWARD integration: use kt+1/2 fluxes (NOW+1/2)
-         zssh_frc(:,:) = r1_rho0 * ( emp(:,:) - rnf(:,:) + fwfisf_cav(:,:) + fwfisf_par(:,:) )
+         zssh_frc(:,:) = r1_rho0 * ( emp(:,:) - rnf(:,:) - fwfisf_cav(:,:) - fwfisf_par(:,:) )
       ELSE                                        ! CENTRED integration: use kt-1/2 + kt+1/2 fluxes (NOW)
          zztmp = r1_rho0 * r1_2
          zssh_frc(:,:) = zztmp * (   emp(:,:)        + emp_b(:,:)          &
             &                      - rnf(:,:)        - rnf_b(:,:)          &
-            &                      + fwfisf_cav(:,:) + fwfisf_cav_b(:,:)   &
-            &                      + fwfisf_par(:,:) + fwfisf_par_b(:,:)   )
+            &                      - fwfisf_cav(:,:) - fwfisf_cav_b(:,:)   &
+            &                      - fwfisf_par(:,:) - fwfisf_par_b(:,:)   )
       ENDIF
       !                                   !=  Add Stokes drift divergence  =!   (if exist)

NEMO/trunk/src/OCE/DYN/sshwzv.F90

@@ -305 +305 @@
                &                          - zcoef   * (         emp_b(:,:) -        emp(:,:)   &
                &                                              - rnf_b(:,:) +        rnf(:,:)   &
-               &                                       + fwfisf_cav_b(:,:) - fwfisf_cav(:,:)   &
-               &                                       + fwfisf_par_b(:,:) - fwfisf_par(:,:)   ) * ssmask(:,:)
+               &                                       - fwfisf_cav_b(:,:) + fwfisf_cav(:,:)   &
+               &                                       - fwfisf_par_b(:,:) + fwfisf_par(:,:)   ) * ssmask(:,:)
 
             ! ice sheet coupling