New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/OBS – NEMO

Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (7 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

Location:
trunk/NEMOGCM/NEMO/OPA_SRC/OBS
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_conv_functions.h90

    r2287 r7646  
    7171 
    7272      !! * Arguments 
    73       REAL(KIND=wp) :: pft   ! in situ temperature in degrees celcius 
     73      REAL(KIND=wp) :: pft   ! in situ temperature in degrees Celsius 
    7474      REAL(KIND=wp) :: pfs   ! salinity in psu 
    7575      REAL(KIND=wp) :: pfp   ! pressure in bars 

  • trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

    r6140 r7646  
    12511251 
    12521252      ! At the end of the day get interpolated means 
    1253       IF ( idayend == 0 .AND. ldnightav ) THEN 
    1254  
    1255          ALLOCATE( & 
    1256             & zsurfm(2,2,isurf)  & 
    1257             & ) 
    1258  
    1259          CALL obs_int_comm_2d( 2, 2, isurf, kpi, kpj, igrdi, igrdj, & 
    1260             &               surfdataqc%vdmean(:,:), zsurfm ) 
    1261  
     1253      IF (ldnightav ) THEN 
     1254         IF ( idayend == 0 ) THEN 
     1255 
     1256            ALLOCATE( & 
     1257               & zsurfm(2,2,isurf)  & 
     1258               & ) 
     1259 
     1260            CALL obs_int_comm_2d( 2, 2, isurf, kpi, kpj, igrdi, igrdj, & 
     1261               &               surfdataqc%vdmean(:,:), zsurfm ) 
     1262 
     1263         ENDIF 
    12621264      ENDIF 
    12631265 
    … …  
    13221324 
    13231325      ! At the end of the day also deallocate night-time mean array 
    1324       IF ( idayend == 0 .AND. ldnightav ) THEN 
    1325          DEALLOCATE( & 
    1326             & zsurfm  & 
    1327             & ) 
     1326      IF ( ldnightav ) THEN 
     1327         IF ( idayend == 0 ) THEN 
     1328            DEALLOCATE( & 
     1329               & zsurfm  & 
     1330               & ) 
     1331         ENDIF 
    13281332      ENDIF 
    13291333 

  • trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

    r6140 r7646  
    1313   !!   obs_sor       : Sort the observation arrays 
    1414   !!--------------------------------------------------------------------- 
    15    !! * Modules used 
    16    USE par_kind, ONLY : & ! Precision variables 
    17       & wp    
     15   USE par_kind, ONLY : wp ! Precision variables 
    1816   USE in_out_manager     ! I/O manager 
    1917   USE obs_profiles_def   ! Definitions for storage arrays for profiles 
    … …  
    2422   USE obs_inter_sup      ! Interpolation support 
    2523   USE obs_oper           ! Observation operators 
    26    USE lib_mpp, ONLY : & 
    27       & ctl_warn, ctl_stop 
     24   USE lib_mpp, ONLY :   ctl_warn, ctl_stop 
    2825 
    2926   IMPLICIT NONE 
    30  
    31    !! * Routine accessibility 
    3227   PRIVATE 
    3328 
    34    PUBLIC & 
    35       & obs_pre_prof, &    ! First level check and screening of profile obs 
    36       & obs_pre_surf, &    ! First level check and screening of surface obs 
    37       & calc_month_len     ! Calculate the number of days in the months of a year 
     29   PUBLIC   obs_pre_prof     ! First level check and screening of profile obs 
     30   PUBLIC   obs_pre_surf     ! First level check and screening of surface obs 
     31   PUBLIC   calc_month_len   ! Calculate the number of days in the months of a year 
    3832 
    3933   !!---------------------------------------------------------------------- 
    … …  
    6357      !!        !  2015-02  (M. Martin) Combined routine for surface types. 
    6458      !!---------------------------------------------------------------------- 
    65       !! * Modules used 
    66       USE domstp              ! Domain: set the time-step 
    6759      USE par_oce             ! Ocean parameters 
    68       USE dom_oce, ONLY : &   ! Geographical information 
    69          & glamt,   & 
    70          & gphit,   & 
    71          & tmask,   & 
    72          & nproc 
     60      USE dom_oce, ONLY       :   glamt, gphit, tmask, nproc   ! Geographical information 
    7361      !! * Arguments 
    7462      TYPE(obs_surf), INTENT(INOUT) :: surfdata    ! Full set of surface data 
    7563      TYPE(obs_surf), INTENT(INOUT) :: surfdataqc   ! Subset of surface data not failing screening 
    7664      LOGICAL, INTENT(IN) :: ld_nea         ! Switch for rejecting observation near land 
    77       !! * Local declarations 
     65      ! 
    7866      INTEGER :: iyea0        ! Initial date 
    7967      INTEGER :: imon0        !  - (year, month, day, hour, minute) 
    … …  
    9482      INTEGER :: inlasobsmpp    !  - close to land 
    9583      INTEGER :: igrdobsmpp     !  - fail the grid search 
    96       LOGICAL, DIMENSION(:), ALLOCATABLE :: &  
    97          & llvalid            ! SLA data selection 
     84      LOGICAL, DIMENSION(:), ALLOCATABLE ::   llvalid            ! SLA data selection 
    9885      INTEGER :: jobs         ! Obs. loop variable 
    9986      INTEGER :: jstp         ! Time loop variable 
    10087      INTEGER :: inrc         ! Time index variable 
    101  
    102       IF(lwp) WRITE(numout,*)'obs_pre_surf : Preparing the surface observations...' 
    103       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
     88      !!---------------------------------------------------------------------- 
     89 
     90      IF(lwp) WRITE(numout,*) 'obs_pre_surf : Preparing the surface observations...' 
     91      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~' 
    10492       
    10593      ! Initial date initialization (year, month, day, hour, minute) 
    … …  
    253241      !! 
    254242      !!---------------------------------------------------------------------- 
    255       !! * Modules used 
    256       USE domstp              ! Domain: set the time-step 
    257       USE par_oce             ! Ocean parameters 
    258       USE dom_oce, ONLY : &   ! Geographical information 
    259          & gdept_1d,             & 
    260          & nproc 
     243      USE par_oce           ! Ocean parameters 
     244      USE dom_oce, ONLY :   gdept_1d, nproc   ! Geographical information 
    261245 
    262246      !! * Arguments 
    … …  
    314298      INTEGER :: jstp         ! Time loop variable 
    315299      INTEGER :: inrc         ! Time index variable 
     300      !!---------------------------------------------------------------------- 
    316301 
    317302      IF(lwp) WRITE(numout,*)'obs_pre_prof: Preparing the profile data...' 
Note: See TracChangeset for help on using the changeset viewer.