Changeset 11790 for NEMO/branches/2019

Timestamp:

2019-10-24T17:40:27+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2320 correction for SAS

File:

• NEMO/branches/2019/dev_r11756_text_output/src/SAS/nemogcm.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r11756_text_output/src/SAS/nemogcm.F90

@@ -234 +234 @@
                      CALL ctl_opn( numnam_ref,        'namelist_sas_ref',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
                      CALL ctl_opn( numnam_cfg,        'namelist_sas_cfg',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
-         IF( lwm .AND. nprint > 2 )   CALL ctl_opn(     numond, 'output.namelist_sas.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
       ELSE
          IF( lwm )   CALL ctl_opn(     numout,            'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
@@ -240 +239 @@
                      CALL ctl_opn( numnam_ref,            'namelist_ref',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
                      CALL ctl_opn( numnam_cfg,            'namelist_cfg',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
-         IF( lwm .AND. nprint > 2  )   CALL ctl_opn(     numond,     'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
       ENDIF
       ! open /dev/null file to be able to supress output write easily
@@ -257 +255 @@
       !
       lwp = (narea == 1) .OR. ln_ctl    ! control of all listing output print
+      !
+      nprint    = nn_print          ! convert DOCTOR namelist names into OLD names
+      ! Open output.namelist only if needed
+      IF( lk_oasis ) THEN
+         IF( lwm .AND. nprint > 2 )   CALL ctl_opn(     numond, 'output.namelist_sas.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
+      ELSE
+         IF( lwm .AND. nprint > 2 )   CALL ctl_opn(     numond,     'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
+      ENDIF
       !
       IF(lwp) THEN                      ! open listing units
@@ -323 +329 @@
          CALL usr_def_nam( cn_cfg, nn_cfg, jpiglo, jpjglo, jpkglo, jperio )
       ENDIF
-      !
-      nprint    = nn_print          ! convert DOCTOR namelist names into OLD names
       !
       IF(lwm .AND. nprint > 2)   WRITE( numond, namcfg )