Changeset 6283

Timestamp:

2016-02-03T13:06:07+01:00 (8 years ago)

Author:

drew

Message:

Commit changes Jennie made at VN3.5.

Location:

branches/UKMO/dev_r5518_seaiceobs/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• diaobs.F90 (modified) (4 diffs)
• obs_read_seaice.F90 (modified) (1 diff)
• obs_write.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_seaiceobs/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -20 +20 @@
    USE in_out_manager           ! I/O manager
    USE par_oce
+   USE sbc_oce, ONLY : fr_i     ! ice fraction
    USE dom_oce                  ! Ocean space and time domain variables
    USE obs_fbm, ONLY: ln_cl4    ! Class 4 diagnostic switch
@@ -799 +800 @@
          seaicedatqc(:)%nsurf=0
 
-         CALL obs_rea_seaice( 1, seaicedata(nseaicesets), jnumseaice, &
+         CALL obs_rea_seaice( 0, seaicedata(nseaicesets), jnumseaice, &
             &                 seaicefiles(1:jnumseaice), &
             &                 nseaicevars, nseaiceextr, nitend-nit000+2, &
@@ -1102 +1103 @@
 #endif
 
+#if defined key_cice
+      IF ( ln_seaice ) THEN
+         DO jseaiceset = 1, nseaicesets
+             CALL obs_seaice_opt( seaicedatqc(jseaiceset),           &
+               &              kstp, jpi, jpj, nit000, fr_i(:,:),     &
+               &              tmask(:,:,1), n2dint )
+         END DO         
+      ENDIF      
+#endif
+
       !  - Velocity profiles
       IF ( ln_vel3d ) THEN
@@ -1147 +1158 @@
       INTEGER :: jfbini
       CHARACTER(LEN=20) :: datestr=" ",timestr=" "
-      CHARACTER(LEN=10) :: cdtmp
+      CHARACTER(LEN=20) :: cdtmp
       !-----------------------------------------------------------------------
       ! Depending on switches call various observation output routines

branches/UKMO/dev_r5518_seaiceobs/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90

@@ -194 +194 @@
                CALL read_obfbdata( TRIM( cfilenames(jj) ), inpfiles(jj), &
                   &                ldgrid = .TRUE. )
-               IF ( ldmod .AND. ( ( inpfiles(jj)%nadd == 0 ) .OR.&
-                  &               ( inpfiles(jj)%next < 2 ) ) ) THEN
+               IF ( ldmod .AND. ( inpfiles(jj)%nadd == 0 ) ) THEN
                   CALL ctl_stop( 'Model not in input data' )
                   RETURN

branches/UKMO/dev_r5518_seaiceobs/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90

@@ -598 +598 @@
       !!      ! 07-07  (S. Ricci) Original
       !!      ! 09-01  (K. Mogensen) New feedback format.
+      !!      ! 2011-07 (D. Lea) Change SEAICE to ICECONC
       !!-----------------------------------------------------------------------
 
@@ -633 +634 @@
       CALL init_obfbdata( fbdata )
 
-      CALL alloc_obfbdata( fbdata, 1, seaicedata%nsurf, 1, 1, 0, .TRUE. )
-
-      fbdata%cname(1)      = 'SEAICE'
-      fbdata%coblong(1)    = 'Sea ice'
+      CALL alloc_obfbdata( fbdata, 1, seaicedata%nsurf, 1, &
+         &                 1 + nadd, next, .TRUE. )
+
+      fbdata%cname(1)      = 'ICECONC'
+      fbdata%coblong(1)    = 'Sea ice concentration'
       fbdata%cobunit(1)    = 'Fraction'
       DO je = 1, next