Changeset 648 for trunk/NEMO/OPA_SRC

Timestamp:

2007-04-12T16:00:53+02:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_031:RB: correct some file names for AGRIF

Location:

trunk/NEMO/OPA_SRC

Files:

• DIA/diafwb.F90 (modified) (2 diffs)
• DIA/diawri.F90 (modified) (4 diffs)
• mppini.F90 (modified) (2 diffs)
• mppini_2.h90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DIA/diafwb.F90

@@ -67 +67 @@
 
       !! * Local declarations
+      CHARACTER (len=32) ::  clname
       INTEGER :: inum             ! temporary logical unit
       INTEGER :: ji, jj, jk, jt   ! dummy loop indices
@@ -386 +387 @@
       ! --------------------------
 
-      IF ( kt == nitend ) THEN
-
-         CALL ctlopn( inum, 'STAIT.dat', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
+      IF ( kt == nitend .AND. cp_cfg == "orca" ) THEN
+
+         clname = 'STRAIT.dat'
+         CALL ctlopn( inum, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
             &         1, numout, .TRUE., 1 )
          WRITE(inum,*)

trunk/NEMO/OPA_SRC/DIA/diawri.F90

@@ -557 +557 @@
 
       !! * Local declarations
+      CHARACTER (len=32) :: clname
       CHARACTER (len=40) :: clop
       INTEGER  ::   &
@@ -567 +568 @@
       !!----------------------------------------------------------------------
 
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'dia_wri_state : single instantaneous ocean state'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~   and forcing fields file created '
-      IF(lwp) WRITE(numout,*) '                and named :', cdfile_name, '.nc'
-
       ! 0. Initialisation
       ! -----------------
 
-      ! Define frequency of output and means
+      ! Define name, frequency of output and means
+      clname = cdfile_name
+#if defined key_agrif
+      if ( .NOT. Agrif_Root() ) clname = TRIM(Agrif_CFixed())//'_'//TRIM(clname)
+#endif
       zdt  = rdt
       zsto = rdt
@@ -582 +582 @@
       zmax = ( nitend - nit000 + 1 ) * zdt
 
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) 'dia_wri_state : single instantaneous ocean state'
+      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~   and forcing fields file created '
+      IF(lwp) WRITE(numout,*) '                and named :', clname, '.nc'
+
+
       ! 1. Define NETCDF files and fields at beginning of first time step
       ! -----------------------------------------------------------------
@@ -587 +593 @@
       ! Compute julian date from starting date of the run
       CALL ymds2ju( nyear, nmonth, nday, 0.e0, zjulian )         ! time axis 
-      CALL histbeg( cdfile_name, jpi, glamt, jpj, gphit,   &
+      CALL histbeg( clname, jpi, glamt, jpj, gphit,   &
           1, jpi, 1, jpj, 0, zjulian, zdt, nh_i, id_i, domain_id=nidom )          ! Horizontal grid : glamt and gphit
       CALL histvert( id_i, "deptht", "Vertical T levels",   &    ! Vertical grid : gdept

trunk/NEMO/OPA_SRC/mppini.F90

@@ -130 +130 @@
       !!----------------------------------------------------------------------
       !! * Local variables
+      CHARACTER (len=32) ::   clname
       INTEGER ::   ji, jj, jn               ! dummy loop indices
       INTEGER ::   &
@@ -345 +346 @@
      ! Save processor layout in layout.dat file 
        IF (lwp) THEN
-        CALL ctlopn( inum, 'layout.dat', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
+        clname = 'layout.dat'
+        CALL ctlopn( inum, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
            &         1, numout, .FALSE., 1 )
         WRITE(inum,'(a)') '   jpnij     jpi     jpj     jpk  jpiglo  jpjglo'

trunk/NEMO/OPA_SRC/mppini_2.h90

@@ -43 +43 @@
    
       !! Local variables
+      CHARACTER (len=32) :: clname
       INTEGER :: ji, jj, jn, jproc, jarea     ! dummy loop indices
       INTEGER ::  inum                        ! temporary logical unit
@@ -466 +467 @@
       ! Save processor layout in ascii file
       IF (lwp) THEN
-         CALL ctlopn( inum, 'layout.dat', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
+         clname = 'layout.dat'
+         CALL ctlopn( inum, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
             &         1, numout, .FALSE., 1 )
          WRITE(inum,'(6i8)') jpnij,jpi,jpj,jpk,jpiglo,jpjglo