Changeset 13428

Timestamp:

2020-08-21T19:32:10+02:00 (4 years ago)

Author:

smueller

Message:

Adjustments of modifications made in [5168] (see ticket #1360) and bugfix in module asminc

Location:

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/asminc.F90 (modified) (5 diffs)
• nemogcm.F90 (modified) (2 diffs)
• step.F90 (modified) (1 diff)

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -703 +703 @@
         DO jk = 1, jpk
            DO jj = 1, jpj
-              DO ji = 1, jpk
+              DO ji = 1, jpi
                  fzptnz (ji,jj,jk) = ( -0.0575_wp + 1.710523e-3_wp * SQRT( tsn(ji,jj,jk,jp_sal) )                   &
                                                   - 2.154996e-4_wp *       tsn(ji,jj,jk,jp_sal)   ) * tsn(ji,jj,jk,jp_sal)  &
@@ -735 +735 @@
                   ! Do not apply negative increments if the temperature will fall below freezing
                   WHERE(t_bkginc(:,:,jk) > 0.0_wp .OR. &
-                     &   t_bkg(:,:,jk) + tsa(:,:,jk,jp_tem) + t_bkginc(:,:,jk) * wgtiau(it) > fzptnz(:,:,jk) )
+                     &   tsn(:,:,jk,jp_tem) + tsa(:,:,jk,jp_tem) + t_bkginc(:,:,jk) * wgtiau(it) > fzptnz(:,:,jk) )
                      tsa(:,:,jk,jp_tem) = tsa(:,:,jk,jp_tem) + t_bkginc(:,:,jk) * zincwgt
                   END WHERE
@@ -745 +745 @@
                   ! minimum value salfixmin
                   WHERE(s_bkginc(:,:,jk) > 0.0_wp .OR. &
-                     &  s_bkg(:,:,jk) + tsa(:,:,jk,jp_sal) + s_bkginc(:,:,jk) * wgtiau(it) > salfixmin )
+                     &  tsn(:,:,jk,jp_sal) + tsa(:,:,jk,jp_sal) + s_bkginc(:,:,jk) * wgtiau(it) > salfixmin )
                      tsa(:,:,jk,jp_sal) = tsa(:,:,jk,jp_sal) + s_bkginc(:,:,jk) * zincwgt
                   END WHERE
@@ -775 +775 @@
                ! Do not apply negative increments if the temperature will fall below freezing
                WHERE(t_bkginc(:,:,:) > 0.0_wp .OR. &
-                  &   tsn(:,:,:,jp_tem) + t_bkginc(:,:,:) > fzptnz(:,:,:) )
+                  &   t_bkg(:,:,:) + t_bkginc(:,:,:) > fzptnz(:,:,:) )
                   tsn(:,:,:,jp_tem) = t_bkg(:,:,:) + t_bkginc(:,:,:)
                END WHERE
@@ -785 +785 @@
                ! minimum value salfixmin
                WHERE(s_bkginc(:,:,:) > 0.0_wp .OR. &
-                  &   tsn(:,:,:,jp_sal) + s_bkginc(:,:,:) > salfixmin )
+                  &   s_bkg(:,:,:) + s_bkginc(:,:,:) > salfixmin )
                   tsn(:,:,:,jp_sal) = s_bkg(:,:,:) + s_bkginc(:,:,:)
                END WHERE

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -111 +111 @@
       !!              Madec, 2008, internal report, IPSL.
       !!----------------------------------------------------------------------
-      INTEGER ::   istp, jk      ! time step index
+      INTEGER ::   istp       ! time step index
       !!----------------------------------------------------------------------
       !
@@ -156 +156 @@
             CALL Agrif_Step( stp )           ! AGRIF: time stepping
 #else
-            !-------------------------------------------------------------!
-            ! This trick ensures a minimum consistency between mixing coef.
-            ! and other variables
-            IF( lk_zdftke .AND. lk_asminc .AND. ln_asmdin .AND. ( istp == nit000) ) THEN
-            CALL tke_avn                        ! recompute avt, avm,
-                                                ! avmu, avmv and dissl (approximation)
-               DO jk = nit000, nit000 + 2
-                  CALL zdf_tke( jk )   ;
-               END DO
-
-            END IF
-            !-------------------------------------------------------------!
-
             CALL stp( istp )                 ! standard time stepping
 #endif

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -112 +112 @@
       !
       !  VERTICAL PHYSICS
+
+#if defined key_zdftke
+      !-------------------------------------------------------------!
+      ! This trick ensures a minimum consistency between mixing coef.
+      ! and other variables
+      IF( lk_zdftke .AND. lk_asminc .AND. ln_asmdin .AND. ( kstp == nit000) ) THEN
+         CALL tke_avn                        ! recompute avt, avm,
+                                             ! avmu, avmv and dissl (approximation)
+         DO jk = nit000, nit000 + 2
+            CALL zdf_tke( jk )
+         END DO
+         
+      END IF
+      !-------------------------------------------------------------!
+#endif
+
                          CALL zdf_bfr( kstp )         ! bottom friction