Changeset 6379 for branches/UKMO/dev_r5518_debug_GO6CICE_pkg/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90

Timestamp:

2016-03-10T14:49:10+01:00 (8 years ago)

Author:

frrh

Message:

merge -r 5781:6237 of STABLE_copy

NOTE: This is a mess because it introduces more SVN keywords
which should be cleared from he code.

File:

• branches/UKMO/dev_r5518_debug_GO6CICE_pkg/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_debug_GO6CICE_pkg/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90

@@ -99 +99 @@
                                    CALL wrk_alloc( jpi, jpj, z2d )
                                    z2d(:,:) = wn(:,:,1) * ( &
-                                      &   - ( rab_n(:,:,1,jp_tem) + rab_pe(:,:,1,jp_tem) ) * tsn(:,:,1,jp_tem)    &
-                                      &   + ( rab_n(:,:,1,jp_sal) + rab_pe(:,:,1,jp_sal) ) * tsn(:,:,1,jp_sal)    &
-                                      &                  ) / fse3t(:,:,1)
+                                       &   - ( rab_n(:,:,1,jp_tem) + rab_pe(:,:,1,jp_tem) ) * tsn(:,:,1,jp_tem)    &
+                                       &   + ( rab_n(:,:,1,jp_sal) + rab_pe(:,:,1,jp_sal) ) * tsn(:,:,1,jp_sal)    &
+                                       &             ) / fse3t(:,:,1)
                                    CALL iom_put( "petrd_sad" , z2d )
                                    CALL wrk_dealloc( jpi, jpj, z2d )