Changeset 9939 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/NST/agrif_top_update.F90

Timestamp:

2018-07-13T09:28:50+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branche phased with MLF@9937 branche

Location:

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3

Files:

• . (copied) (copied from NEMO/trunk)
• src/NST/agrif_top_update.F90 (modified) (7 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/NST/agrif_top_update.F90

@@ -109 +109 @@
                   tabin(jk,:) = tabres(ji,jj,jk,n1:n2-1)/tabres(ji,jj,jk,n2)
                   h_in(N_in) = tabres(ji,jj,jk,n2)
-               ENDDO
+               END DO
                N_out = 0
                DO jk=1,jpk ! jpk of parent grid
@@ -115 +115 @@
                   N_out = N_out + 1
                   h_out(N_out) = e3t_n(ji,jj,jk) !Parent grid scale factors. Could multiply by e1e2t here instead of division above
-               ENDDO
+               END DO
                IF (N_in > 0) THEN !Remove this?
                   h_diff = sum(h_out(1:N_out))-sum(h_in(1:N_in))
@@ -126 +126 @@
                   DO jn=1,jptra
                      CALL reconstructandremap(tabin(1:N_in,jn),h_in(1:N_in),tabres_child(ji,jj,1:N_out,jn),h_out(1:N_out),N_in,N_out)
-                  ENDDO
+                  END DO
                ENDIF
-            ENDDO
-         ENDDO
-
-         IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
+            END DO
+         END DO
+
+         IF ( .NOT.( lk_agrif_fstep .AND. l_1st_euler ) ) THEN
+!!gm         IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
             ! Add asselin part
             DO jn = 1,jptra
@@ -139 +140 @@
                         IF( tabres_child(ji,jj,jk,jn) .NE. 0. ) THEN
                            trb(ji,jj,jk,jn) = tsb(ji,jj,jk,jn) & 
-                                 & + atfp * ( tabres_child(ji,jj,jk,jn) &
-                                 &          - trn(ji,jj,jk,jn) ) * tmask(ji,jj,jk)
+                                 & + rn_atfp * ( tabres_child(ji,jj,jk,jn) - trn(ji,jj,jk,jn) ) * tmask(ji,jj,jk)
                         ENDIF
-                     ENDDO
-                  ENDDO
-               ENDDO
-            ENDDO
+                     END DO
+                  END DO
+               END DO
+            END DO
          ENDIF
          DO jn = 1,jptra
@@ -195 +195 @@
             tabres(i1:i2,j1:j2,k1:k2,jn) =  tabres(i1:i2,j1:j2,k1:k2,jn) * e3t_0(i1:i2,j1:j2,k1:k2) &
                                          & * tmask(i1:i2,j1:j2,k1:k2)
-         ENDDO
+         END DO
 !< jc tmp
-         IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
+         IF (.NOT.( lk_agrif_fstep .AND. l_1st_euler ) ) THEN
+!!gm         IF (.NOT.(lk_agrif_fstep.AND.(neuler==0))) THEN
             ! Add asselin part
             DO jn = n1,n2
@@ -207 +208 @@
                            ztnu = tabres(ji,jj,jk,jn)
                            ztno = trn(ji,jj,jk,jn) * e3t_a(ji,jj,jk)
-                           trb(ji,jj,jk,jn) = ( ztb + atfp * ( ztnu - ztno) )  & 
-                                     &        * tmask(ji,jj,jk) / e3t_b(ji,jj,jk)
+                           trb(ji,jj,jk,jn) = ( ztb + rn_atfp * ( ztnu - ztno) ) / e3t_b(ji,jj,jk) * tmask(ji,jj,jk)
                         ENDIF
-                     ENDDO
-                  ENDDO
-               ENDDO
-            ENDDO
+                     END DO
+                  END DO
+               END DO
+            END DO
          ENDIF
          DO jn = n1,n2
@@ -227 +227 @@
          END DO
          !
-         IF  ((neuler==0).AND.(Agrif_Nb_Step()==0) ) THEN
+         IF ( l_1st_euler .AND. Agrif_Nb_Step() == 0 ) THEN
+!!gm         IF  ((neuler==0).AND.(Agrif_Nb_Step()==0) ) THEN
             trb(i1:i2,j1:j2,k1:k2,n1:n2)  = trn(i1:i2,j1:j2,k1:k2,n1:n2)
          ENDIF