Changeset 12240 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM

Timestamp:

2019-12-13T11:08:28+01:00 (4 years ago)

Author:

frrh

Message:

Manual change applied to TOP_SRC/CFC/trcsms_cfc.F90 to reflect
change from branches/UKMO/dev_r5518_GO6_package_text_diagnostics
revision 12228.

This is a result of an unexplained failure of the merge command for this
routine only, while the two other files involved, icbclv.F90 and
stpctl.F90 worked as expected.

The symptoms indicated that the change had been applied locally in the working
copy of dev_r5518_GO6_package, but svn refused to acknowledge that
any change had been made and failed to apply the change at commit time.

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -222 +222 @@
       END DO                                                !  end CFC loop  !
          !
-      IF( kt == nittrc000 ) THEN
+      IF( kt == nittrc000 .AND. lwp ) THEN
          DO jl = 1, jp_cfc   
              WRITE(NUMOUT,*) ' '