Changeset 13767 for NEMO/branches/2020

Timestamp:

2020-11-10T16:42:30+01:00 (3 years ago)

Author:

dford

Message:

Further bug fixes for compilation.

File:

• NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/OCE/OBS/diaobs.F90 (modified) (8 diffs)

NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/OCE/OBS/diaobs.F90

@@ -57 +57 @@
    PUBLIC calc_date        ! Compute the date of a timestep
 
-   LOGICAL, PUBLIC :: ln_diaobs          !: Logical switch for the obs operator
-   LOGICAL         :: ln_sstnight        !  Logical switch for night mean SST obs
-   LOGICAL         :: ln_sla_fp_indegs   !  T=> SLA obs footprint size specified in degrees, F=> in metres
-   LOGICAL         :: ln_sst_fp_indegs   !  T=> SST obs footprint size specified in degrees, F=> in metres
-   LOGICAL         :: ln_sss_fp_indegs   !  T=> SSS obs footprint size specified in degrees, F=> in metres
-   LOGICAL         :: ln_sic_fp_indegs   !  T=> sea-ice obs footprint size specified in degrees, F=> in metres
-
-   REAL(wp) ::   rn_default_avglamscl    ! E/W diameter of SLA observation footprint (metres)
-   REAL(wp) ::   rn_default_avgphiscl    ! N/S diameter of SLA observation footprint (metre
-   REAL(wp) ::   rn_sla_avglamscl        ! E/W diameter of SLA observation footprint (metres)
-   REAL(wp) ::   rn_sla_avgphiscl        ! N/S diameter of SLA observation footprint (metres)
-   REAL(wp) ::   rn_sst_avglamscl        ! E/W diameter of SST observation footprint (metres)
-   REAL(wp) ::   rn_sst_avgphiscl        ! N/S diameter of SST observation footprint (metres)
-   REAL(wp) ::   rn_sss_avglamscl        ! E/W diameter of SSS observation footprint (metres)
-   REAL(wp) ::   rn_sss_avgphiscl        ! N/S diameter of SSS observation footprint (metres)
-   REAL(wp) ::   rn_sic_avglamscl        ! E/W diameter of sea-ice observation footprint (metres)
-   REAL(wp) ::   rn_sic_avgphiscl        ! N/S diameter of sea-ice observation footprint (metres)
-
-   INTEGER :: nn_1dint                   ! Vertical interpolation method
-   INTEGER :: nn_2dint_default           ! Default horizontal interpolation method
-   INTEGER :: nn_2dint_sla               ! SLA horizontal interpolation method 
-   INTEGER :: nn_2dint_sst               ! SST horizontal interpolation method 
-   INTEGER :: nn_2dint_sss               ! SSS horizontal interpolation method 
-   INTEGER :: nn_2dint_sic               ! Seaice horizontal interpolation method 
+   LOGICAL, PUBLIC :: ln_diaobs            !: Logical switch for the obs operator
+   LOGICAL         :: ln_sstnight          !  Logical switch for night mean SST obs
+   LOGICAL         :: ln_default_fp_indegs !  T=> Default obs footprint size specified in degrees, F=> in metres
+   LOGICAL         :: ln_sla_fp_indegs     !  T=> SLA obs footprint size specified in degrees, F=> in metres
+   LOGICAL         :: ln_sst_fp_indegs     !  T=> SST obs footprint size specified in degrees, F=> in metres
+   LOGICAL         :: ln_sss_fp_indegs     !  T=> SSS obs footprint size specified in degrees, F=> in metres
+   LOGICAL         :: ln_sic_fp_indegs     !  T=> sea-ice obs footprint size specified in degrees, F=> in metres
+
+   REAL(wp) ::   rn_default_avglamscl      ! E/W diameter of SLA observation footprint (metres)
+   REAL(wp) ::   rn_default_avgphiscl      ! N/S diameter of SLA observation footprint (metre
+   REAL(wp) ::   rn_sla_avglamscl          ! E/W diameter of SLA observation footprint (metres)
+   REAL(wp) ::   rn_sla_avgphiscl          ! N/S diameter of SLA observation footprint (metres)
+   REAL(wp) ::   rn_sst_avglamscl          ! E/W diameter of SST observation footprint (metres)
+   REAL(wp) ::   rn_sst_avgphiscl          ! N/S diameter of SST observation footprint (metres)
+   REAL(wp) ::   rn_sss_avglamscl          ! E/W diameter of SSS observation footprint (metres)
+   REAL(wp) ::   rn_sss_avgphiscl          ! N/S diameter of SSS observation footprint (metres)
+   REAL(wp) ::   rn_sic_avglamscl          ! E/W diameter of sea-ice observation footprint (metres)
+   REAL(wp) ::   rn_sic_avgphiscl          ! N/S diameter of sea-ice observation footprint (metres)
+
+   INTEGER :: nn_1dint                     ! Vertical interpolation method
+   INTEGER :: nn_2dint_default             ! Default horizontal interpolation method
+   INTEGER :: nn_2dint_sla                 ! SLA horizontal interpolation method 
+   INTEGER :: nn_2dint_sst                 ! SST horizontal interpolation method 
+   INTEGER :: nn_2dint_sss                 ! SSS horizontal interpolation method 
+   INTEGER :: nn_2dint_sic                 ! Seaice horizontal interpolation method 
    INTEGER, DIMENSION(imaxavtypes) ::   nn_profdavtypes   ! Profile data types representing a daily average
    INTEGER :: nproftypes     ! Number of profile obs types
@@ -133 +134 @@
          & cn_sicfbfiles, &      ! Seaice concentration input filenames
          & cn_velfbfiles, &      ! Velocity profile input filenames
-         & cn_sstbiasfiles      ! SST bias input filenames
+         & cn_sstbiasfiles       ! SST bias input filenames
       CHARACTER(LEN=128) :: &
          & cn_altbiasfile        ! Altimeter bias input filename
@@ -139 +140 @@
          & clproffiles, &        ! Profile filenames
          & clsurffiles           ! Surface filenames
+      CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: &
+         & clvars                ! Expected variable names
          !
       LOGICAL :: ln_t3d          ! Logical switch for temperature profiles
@@ -452 +455 @@
             IF ( TRIM(cobstypesprof(jtype)) == 'prof' ) THEN
                nvarsprof(jtype) = 2
-               nextrprof(jtype) = 1
-               IF ( ln_output_clim ) ltype_clim = .TRUE.              
+               nextrprof(jtype) = 1             
                ALLOCATE( llvar (nvarsprof(jtype)) )
                ALLOCATE( clvars(nvarsprof(jtype)) )
@@ -556 +558 @@
                &               clsurffiles(jtype,1:ifilessurf(jtype)), &
                &               nvarssurf(jtype), nextrsurf(jtype), nitend-nit000+2, &
-               &               rn_dobsini, rn_dobsend, ln_ignmis, .FALSE., llnightav(jtype), *
+               &               rn_dobsini, rn_dobsend, ln_ignmis, .FALSE., llnightav(jtype), &
                &               clvars )
                !
@@ -623 +625 @@
       INTEGER :: ji, jj            ! Loop counters
       REAL(wp), DIMENSION(:,:,:,:), ALLOCATABLE :: &
-         & zprofvar,               ! Model values for variables in a prof ob
+         & zprofvar                ! Model values for variables in a prof ob
       REAL(wp), DIMENSION(:,:,:,:), ALLOCATABLE :: &
          & zprofmask               ! Mask associated with zprofvar
@@ -631 +633 @@
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: &
          & zglam,    &             ! Model longitudes for prof variables
-         & zgphi,                  ! Model latitudes for prof variables
+         & zgphi                   ! Model latitudes for prof variables
 
       !-----------------------------------------------------------------------
@@ -666 +668 @@
             SELECT CASE ( TRIM(cobstypesprof(jtype)) )
             CASE('prof')
-               zprofvar1(:,:,:) = ts(:,:,:,jp_tem,Kmm)
-               zprofvar2(:,:,:) = ts(:,:,:,jp_sal,Kmm)
+               zprofvar(:,:,:,1) = ts(:,:,:,jp_tem,Kmm)
+               zprofvar(:,:,:,2) = ts(:,:,:,jp_sal,Kmm)
             CASE('vel')
                zprofvar(:,:,:,1) = uu(:,:,:,Kmm)