Changeset 1057 for trunk/NEMO/OPA_SRC

Timestamp:

2008-06-04T20:44:44+02:00 (16 years ago)

Author:

rblod

Message:

ctlopn with dimg diagnostics and additonnal stuff related to dimg

Location:

trunk/NEMO/OPA_SRC

Files:

• DIA/diadimg.F90 (modified) (2 diffs)
• DIA/diawri_dimg.h90 (modified) (4 diffs)
• SBC/sbcssr.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DIA/diadimg.F90

@@ -104 +104 @@
     IF ( ln_dimgnnn  ) THEN
        WRITE(clname,'(a,a,i3.3)') TRIM(cd_name),'.',narea
-       OPEN (inum, FILE=clname, FORM='UNFORMATTED', ACCESS='DIRECT', RECL=irecl4 )
+       CALL ctlopn(inum, clname,'UNKNOWN','UNFORMATTED','DIRECT',irecl4,numout,lwp,1)
        WRITE(inum,REC=1 ) clver, cd_text, irecl4, &
             &     jpi,jpj, klev, 1 , 1 ,            &
@@ -131 +131 @@
        !! Standard dimgproc (1 file per variable, all procs. write to this file )
        !! * Open file
-       OPEN (inum, FILE=cd_name, FORM='UNFORMATTED', ACCESS='DIRECT', RECL=irecl4 )
+       CALL ctlopn(inum, cd_name,'UNKNOWN','UNFORMATTED','DIRECT',irecl4,numout,lwp,1)
 
        !! * Write header on record #1

trunk/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -170 +170 @@
        fsel(:,:,3 ) = fsel(:,:,3 ) + qsr (:,:) + qns  (:,:) 
        fsel(:,:,4 ) = fsel(:,:,4 ) + emp (:,:)
-       fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1) - sst(:,:)
+       fsel(:,:,5 ) = fsel(:,:,5 ) + tb  (:,:,1) - sf_sst(1)%fnow(:,:)
 #if ! defined key_dynspg_rl
        fsel(:,:,6 ) = fsel(:,:,6 ) + sshn(:,:)    ! SSH
@@ -182 +182 @@
        fsel(:,:,11) = fsel(:,:,11) + hmlp(:,:)
        fsel(:,:,12) = fsel(:,:,12) + fr_i(:,:)
-       fsel(:,:,13) = fsel(:,:,13) + sst(:,:)
+       fsel(:,:,13) = fsel(:,:,13) + sf_sst(1)%fnow(:,:)
        !        fsel(:,:,14) = fsel(:,:,14) + qct(:,:)
        !        fsel(:,:,15) = fsel(:,:,15) + fbt(:,:)
@@ -249 +249 @@
           fsel(:,:,1 ) = utau(:,:) * umask(:,:,1)
           fsel(:,:,2 ) = vtau(:,:) * vmask(:,:,1)
-          fsel(:,:,3 ) = (qsr (:,:) + qnr (:,:)) * tmask(:,:,1)
+          fsel(:,:,3 ) = (qsr (:,:) + qns (:,:)) * tmask(:,:,1)
           fsel(:,:,4 ) = emp (:,:) * tmask(:,:,1)
-          fsel(:,:,5 ) = (tb  (:,:,1) -sst(:,:)) *tmask(:,:,1)
+          fsel(:,:,5 ) = (tb  (:,:,1) - sf_sst(1)%fnow(:,:) ) *tmask(:,:,1)
 
 #if ! defined key_dynspg_rl
@@ -264 +264 @@
           fsel(:,:,11) = hmlp(:,:) * tmask(:,:,1)
           fsel(:,:,12) = fr_i(:,:) * tmask(:,:,1)
-          fsel(:,:,13) =  sst(:,:)  
+          fsel(:,:,13) = sf_sst(1)%fnow(:,:)
           !         fsel(:,:,14) =  qct(:,:)
           !         fsel(:,:,15) =  fbt(:,:)

trunk/NEMO/OPA_SRC/SBC/sbcssr.F90

@@ -30 +30 @@
    REAL(wp), ALLOCATABLE, DIMENSION(:)   ::   buffer   ! Temporary buffer for exchange
 
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sst   ! structure of input SST (file informations, fields read)
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sss   ! structure of input SSS (file informations, fields read)
+   TYPE(FLD), PUBLIC, ALLOCATABLE, DIMENSION(:) ::   sf_sst   ! structure of input SST (file informations, fields read)
+   TYPE(FLD), PUBLIC, ALLOCATABLE, DIMENSION(:) ::   sf_sss   ! structure of input SSS (file informations, fields read)
 
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   erp       !: evaporation damping                          [kg/m2/s]