Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS
- Timestamp:
- 2018-05-11T12:53:25+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC
- Files:
-
- 36 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/ddatetoymdhms.h90
r4990 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/diaobs.F90
r9354 r9570 97 97 98 98 !!---------------------------------------------------------------------- 99 !! NEMO/O PA3.3 , NEMO Consortium (2010)99 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 100 100 !! $Id$ 101 101 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 324 324 & lfpindegs, llnightav ) 325 325 ENDIF 326 #if defined key_ lim3 || defined key_cice326 #if defined key_si3 || defined key_cice 327 327 IF( ln_sic ) THEN 328 328 jtype = jtype + 1 … … 500 500 USE oce , ONLY : tsn, un, vn, sshn ! Ocean dynamics and tracers variables 501 501 USE phycst , ONLY : rday ! Physical constants 502 #if defined key_ lim3502 #if defined key_si3 503 503 USE ice , ONLY : at_i ! LIM3 Ice model variables 504 504 #endif … … 611 611 CYCLE 612 612 ELSE 613 #if defined key_cice || defined key_ lim3613 #if defined key_cice || defined key_si3 614 614 zsurfvar(:,:) = fr_i(:,:) 615 615 #else -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/find_obs_proc.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/grt_cir_dis.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/grt_cir_dis_saa.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/linquad.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/maxdist.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/mpp_map.F90
r9523 r9570 14 14 USE dom_oce , ONLY : mig, mjg, nldi, nlei, nldj, nlej, nlci, nlcj, narea ! Ocean space and time domain variables 15 15 #if defined key_mpp_mpi 16 USE lib_mpp, ONLY : mpi_comm_o pa! MPP library16 USE lib_mpp, ONLY : mpi_comm_oce ! MPP library 17 17 #endif 18 18 USE in_out_manager ! I/O manager … … 26 26 27 27 !!---------------------------------------------------------------------- 28 !! NEMO/O PA3.3 , NEMO Consortium (2010)28 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 29 29 !! $Id$ 30 30 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 73 73 ! Call the MPI library to find the max across processors 74 74 CALL mpi_allreduce( imppmap, mppmap, jpiglo*jpjglo, mpi_integer, & 75 & mpi_max, mpi_comm_o pa, ierr )75 & mpi_max, mpi_comm_oce, ierr ) 76 76 #else 77 77 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_averg_h2d.F90
r9023 r9570 44 44 45 45 !!---------------------------------------------------------------------- 46 !! NEMO/O PA3.3 , NEMO Consortium (2010)46 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 47 47 !! $Id: obs_averg_h2d.F90 2715 2011-03-30 15:58:35Z rblod $ 48 48 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_const.F90
r2287 r9570 5 5 !!===================================================================== 6 6 !!---------------------------------------------------------------------- 7 !! NEMO/O PA3.3 , NEMO Consortium (2010)7 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 8 8 !! $Id$ 9 9 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_conv.F90
r2287 r9570 35 35 36 36 !!---------------------------------------------------------------------- 37 !! NEMO/O PA3.3 , NEMO Consortium (2010)37 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 38 38 !! $Id$ 39 39 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_conv_functions.h90
r7646 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_fbm.F90
r6140 r9570 128 128 129 129 !!---------------------------------------------------------------------- 130 !! NEMO/O PA3.3 , NEMO Consortium (2010)130 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 131 131 !! $Id$ 132 132 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_grid.F90
r9523 r9570 86 86 87 87 !!---------------------------------------------------------------------- 88 !! NEMO/O PA3.3 , NEMO Consortium (2010)88 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 89 89 !! $Id$ 90 90 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_inter_h2d.F90
r2715 r9570 47 47 48 48 !!---------------------------------------------------------------------- 49 !! NEMO/O PA3.3 , NEMO Consortium (2010)49 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 50 50 !! $Id$ 51 51 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_inter_sup.F90
r9523 r9570 27 27 28 28 !!---------------------------------------------------------------------- 29 !! NEMO/O PA3.3 , NEMO Consortium (2010)29 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 30 30 !! $Id$ 31 31 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_inter_z1d.F90
r2287 r9570 25 25 26 26 !!---------------------------------------------------------------------- 27 !! NEMO/O PA3.3 , NEMO Consortium (2010)27 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 28 28 !! $Id$ 29 29 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_level_search.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_mpp.F90
r9023 r9570 22 22 USE in_out_manager 23 23 #if defined key_mpp_mpi 24 USE lib_mpp, ONLY : mpi_comm_o pa! MPP library24 USE lib_mpp, ONLY : mpi_comm_oce ! MPP library 25 25 #endif 26 26 IMPLICIT NONE … … 38 38 39 39 !!---------------------------------------------------------------------- 40 !! NEMO/O PA3.3 , NEMO Consortium (2010)40 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 41 41 !! $Id$ 42 42 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 53 53 !! 54 54 !! ** Action : This does only work for MPI. 55 !! MPI_COMM_O PAneeds to be replace for OASIS4.!55 !! MPI_COMM_OCE needs to be replace for OASIS4.! 56 56 !! 57 57 !! References : http://www.mpi-forum.org … … 70 70 ! Call the MPI library to broadcast data 71 71 CALL mpi_bcast( kvals, kno, mpi_integer, & 72 & kroot, mpi_comm_o pa, ierr )72 & kroot, mpi_comm_oce, ierr ) 73 73 #else 74 74 ! no MPI: empty routine … … 88 88 !! ** Action : This does only work for MPI. 89 89 !! It does not work for SHMEM. 90 !! MPI_COMM_O PAneeds to be replace for OASIS4.!90 !! MPI_COMM_OCE needs to be replace for OASIS4.! 91 91 !! 92 92 !! References : http://www.mpi-forum.org … … 105 105 ! Call the MPI library to find the maximum across processors 106 106 CALL mpi_allreduce( kvals, ivals, kno, mpi_integer, & 107 & mpi_max, mpi_comm_o pa, ierr )107 & mpi_max, mpi_comm_oce, ierr ) 108 108 kvals(:) = ivals(:) 109 109 #else … … 203 203 !----------------------------------------------------------------------- 204 204 CALL mpi_allreduce( kvalsin, kvalsout, kno, mpi_integer, & 205 & mpi_sum, mpi_comm_o pa, ierr )205 & mpi_sum, mpi_comm_oce, ierr ) 206 206 #else 207 207 !----------------------------------------------------------------------- … … 241 241 !----------------------------------------------------------------------- 242 242 CALL mpi_allreduce( kvalin, kvalout, 1, mpi_integer, & 243 & mpi_sum, mpi_comm_o pa, ierr )243 & mpi_sum, mpi_comm_oce, ierr ) 244 244 #else 245 245 !----------------------------------------------------------------------- … … 286 286 287 287 CALL mpi_allreduce( zcp, pval, jpiglo*jpjglo, mpivar, & 288 & mpi_max, mpi_comm_o pa, ierr )288 & mpi_max, mpi_comm_oce, ierr ) 289 289 290 290 DEALLOCATE( & … … 326 326 CALL mpi_alltoall( kvalsin, kno, mpi_integer, & 327 327 & kvalsout, kno, mpi_integer, & 328 & mpi_comm_o pa, ierr )328 & mpi_comm_oce, ierr ) 329 329 #else 330 330 !----------------------------------------------------------------------- … … 378 378 CALL mpi_alltoallv( kvalsin, kinv, isdsp, mpi_integer, & 379 379 & kvalsout, koutv, irdsp, mpi_integer, & 380 & mpi_comm_o pa, ierr )380 & mpi_comm_oce, ierr ) 381 381 #else 382 382 !----------------------------------------------------------------------- … … 432 432 CALL mpi_alltoallv( pvalsin, kinv, isdsp, mpivar, & 433 433 & pvalsout, koutv, irdsp, mpivar, & 434 & mpi_comm_o pa, ierr )434 & mpi_comm_oce, ierr ) 435 435 #else 436 436 !----------------------------------------------------------------------- -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_oper.F90
r9490 r9570 32 32 33 33 !!---------------------------------------------------------------------- 34 !! NEMO/O PA4.0 , NEMO Consortium (2018)34 !! NEMO/OCE 4.0 , NEMO Consortium (2018) 35 35 !! $Id$ 36 36 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_prep.F90
r9490 r9570 34 34 35 35 !!---------------------------------------------------------------------- 36 !! NEMO/O PA3.3 , NEMO Consortium (2010)36 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 37 37 !! $Id$ 38 38 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_profiles.F90
r2733 r9570 6 6 !!===================================================================== 7 7 !!---------------------------------------------------------------------- 8 !! NEMO/O PA3.3 , NEMO Consortium (2010)8 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 9 9 !! $Id$ 10 10 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_profiles_def.F90
r9023 r9570 190 190 191 191 !!---------------------------------------------------------------------- 192 !! NEMO/O PA3.3 , NEMO Consortium (2010)192 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 193 193 !! $Id$ 194 194 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_read_altbias.F90
r9125 r9570 42 42 43 43 !!---------------------------------------------------------------------- 44 !! NEMO/O PA3.3 , NEMO Consortium (2010)44 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 45 45 !! $Id$ 46 46 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_read_prof.F90
r9023 r9570 36 36 37 37 !!---------------------------------------------------------------------- 38 !! NEMO/O PA3.3 , NEMO Consortium (2010)38 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 39 39 !! $Id$ 40 40 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_read_surf.F90
r9023 r9570 31 31 32 32 !!---------------------------------------------------------------------- 33 !! NEMO/O PA3.3 , NEMO Consortium (2010)33 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 34 34 !! $Id: obs_read_surf.F90 4990 2014-12-15 16:42:49Z timgraham $ 35 35 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_readmdt.F90
r9125 r9570 38 38 39 39 !!---------------------------------------------------------------------- 40 !! NEMO/O PA3.3 , NEMO Consortium (2010)40 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 41 41 !! $Id$ 42 42 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_rot_vel.F90
r9125 r9570 29 29 30 30 !!---------------------------------------------------------------------- 31 !! NEMO/O PA3.3 , NEMO Consortium (2010)31 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 32 32 !! $Id$ 33 33 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_sort.F90
r2287 r9570 21 21 22 22 !!---------------------------------------------------------------------- 23 !! NEMO/O PA3.3 , NEMO Consortium (2010)23 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 24 24 !! $Id$ 25 25 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_surf_def.F90
r9023 r9570 114 114 115 115 !!---------------------------------------------------------------------- 116 !! NEMO/O PA3.3 , NEMO Consortium (2010)116 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 117 117 !! $Id$ 118 118 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_types.F90
r6140 r9570 48 48 49 49 !!---------------------------------------------------------------------- 50 !! NEMO/O PA3.3 , NEMO Consortium (2010)50 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 51 51 !! $Id$ 52 52 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_utils.F90
r2715 r9570 35 35 36 36 !!---------------------------------------------------------------------- 37 !! NEMO/O PA3.3 , NEMO Consortium (2010)37 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 38 38 !! $Id$ 39 39 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_write.F90
r9023 r9570 47 47 48 48 !!---------------------------------------------------------------------- 49 !! NEMO/O PA3.3 , NEMO Consortium (2010)49 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 50 50 !! $Id$ 51 51 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obsinter_h2d.h90
r9023 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obsinter_z1d.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/str_c_to_for.h90
r2287 r9570 1 1 !!---------------------------------------------------------------------- 2 !! NEMO/O PA3.3 , NEMO Consortium (2010)2 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 3 3 !! $Id$ 4 4 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
Note: See TracChangeset
for help on using the changeset viewer.