Changeset 4029 for branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO
- Timestamp:
- 2013-09-18T10:01:34+02:00 (11 years ago)
- Location:
- branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO
- Files:
-
- 13 edited
-
OFF_SRC/nemogcm.F90 (modified) (2 diffs)
-
OPA_SRC/CRS/crsfld.F90 (modified) (2 diffs)
-
OPA_SRC/SBC/sbcmod.F90 (modified) (1 diff)
-
OPA_SRC/ZDF/zdfddm_substitute.h90 (modified) (1 diff)
-
OPA_SRC/par_AMM_12km.h90 (modified) (1 diff)
-
OPA_SRC/par_EEL_R2.h90 (modified) (1 diff)
-
OPA_SRC/par_EEL_R5.h90 (modified) (1 diff)
-
OPA_SRC/par_EEL_R6.h90 (modified) (1 diff)
-
OPA_SRC/par_GYRE.h90 (modified) (1 diff)
-
OPA_SRC/par_ORCA_R025.h90 (modified) (2 diffs)
-
OPA_SRC/par_ORCA_R05.h90 (modified) (1 diff)
-
OPA_SRC/par_ORCA_R2.h90 (modified) (1 diff)
-
OPA_SRC/par_ORCA_R4.h90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90
r3827 r4029 89 89 istp = nit000 90 90 ! 91 CALL iom_init ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)91 CALL iom_init( "nemo" ) ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 92 92 ! 93 93 DO WHILE ( istp <= nitend .AND. nstop == 0 ) ! time stepping 94 94 ! 95 95 IF( istp /= nit000 ) CALL day ( istp ) ! Calendar (day was already called at nit000 in day_init) 96 CALL iom_setkt( istp - nit000 + 1 ) ! say to iom that we are at time step kstp96 CALL iom_setkt( istp - nit000 + 1, "nemo" ) ! say to iom that we are at time step kstp 97 97 CALL dta_dyn ( istp ) ! Interpolation of the dynamical fields 98 98 CALL trc_stp ( istp ) ! time-stepping … … 394 394 ierr = ierr + zdf_oce_alloc () ! ocean vertical physics 395 395 ! 396 ierr = ierr + lib_mpp_alloc (numout) ! mpp exchanges397 396 ierr = ierr + trc_oce_alloc () ! shared TRC / TRA arrays 398 397 ! -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90
r4015 r4029 90 90 vn_crs (:,:,: ) = 0._wp ! v-velocity 91 91 wn_crs (:,:,: ) = 0._wp ! w 92 av s_crs (:,:,: ) = 0._wp ! avt92 avt_crs (:,:,: ) = 0._wp ! avt 93 93 hdivn_crs(:,:,: ) = 0._wp ! hdiv 94 94 rke_crs (:,:,: ) = 0._wp ! rke … … 202 202 ! free memory 203 203 204 ! avt , avs204 ! avt 205 205 SELECT CASE ( nn_crs_kz ) 206 206 CASE ( 0 ) 207 CALL crs_dom_ope( fsavs(:,:,:), 'VOL', 'W', tmask, avs_crs, p_e12=e1e2t, p_e3=zfse3w )207 CALL crs_dom_ope( avt, 'VOL', 'W', tmask, avt_crs, p_e12=e1e2t, p_e3=zfse3w ) 208 208 CASE ( 1 ) 209 CALL crs_dom_ope( fsavs(:,:,:), 'MAX', 'W', tmask, avs_crs, p_e12=e1e2t, p_e3=zfse3w )209 CALL crs_dom_ope( avt, 'MAX', 'W', tmask, avt_crs, p_e12=e1e2t, p_e3=zfse3w ) 210 210 CASE ( 2 ) 211 CALL crs_dom_ope( fsavs(:,:,:), 'MIN', 'W', tmask, avs_crs, p_e12=e1e2t, p_e3=zfse3w )211 CALL crs_dom_ope( avt, 'MIN', 'W', tmask, avt_crs, p_e12=e1e2t, p_e3=zfse3w ) 212 212 END SELECT 213 213 ! 214 CALL iom_put( "av s", avs_crs ) ! Kz214 CALL iom_put( "avt", avt_crs ) ! Kz 215 215 216 216 ! sbc fields -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90
r3905 r4029 221 221 ENDIF 222 222 ! 223 CALL sbc_ssm_init 224 ! 223 225 IF( ln_ssr ) CALL sbc_ssr_init ! Sea-Surface Restoring initialisation 224 226 ! -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm_substitute.h90
r2715 r4029 7 7 #if defined key_zdfddm 8 8 ! 'key_zdfddm' : avs: 3D array defined in zdfddm module 9 # define fsavs(i,j,k) avs(i,j,k)9 # define fsavs(i,j,k) avs(i,j,k) 10 10 #else 11 11 ! Defautl option : avs = avt 12 # define fsavs(i,j,k) avt(i,j,k)12 # define fsavs(i,j,k) avt(i,j,k) 13 13 #endif 14 14 !!---------------------------------------------------------------------- -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_AMM_12km.h90
r4015 r4029 4 4 !! (AMM_12km configuration VN3.3) 5 5 !!--------------------------------------------------------------------- 6 CHARACTER (len=16) :: cp_cfg = "amm" !: name of the configuration 7 INTEGER :: jp_cfg = 011 !: resolution of the configuration (degrees) 8 INTEGER, PARAMETER :: & 6 CHARACTER (len=16) & 7 #if !defined key_agrif 8 , PARAMETER & 9 #endif 10 :: & 11 cp_cfg = "amm" !: name of the configuration 12 INTEGER & 13 #if !defined key_agrif 14 , PARAMETER & 15 #endif 16 :: & 17 jp_cfg = 011 , & !: resolution of the configuration (degrees) 9 18 ! Original data size 10 19 jpidta = 198, & !: first horizontal dimension > or = to jpi 11 20 jpjdta = 224, & !: second > or = to jpj 12 21 jpkdta = 33 !: number of levels > or = to jpk 22 13 23 INTEGER :: & 14 24 ! total domain matrix size -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_EEL_R2.h90
r4015 r4029 8 8 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 9 9 !!---------------------------------------------------------------------- 10 CHARACTER (len=16) :: cp_cfg = "eel" !: name of the configuration 11 INTEGER :: jp_cfg = 2 !: resolution of the configuration (km) 12 INTEGER, PARAMETER :: & 10 CHARACTER (len=16) & 11 #if !defined key_agrif 12 , PARAMETER & 13 #endif 14 :: & 15 cp_cfg = "eel" !: name of the configuration 16 INTEGER & 17 #if !defined key_agrif 18 , PARAMETER & 19 #endif 20 :: & 21 jp_cfg = 2 , & !: resolution of the configuration (km) 22 13 23 ! data size !!! * size of all the input files * 14 24 jpidta = 83, & !: 1st horizontal dimension ( >= jpi ) 15 25 jpjdta = 242, & !: 2nd " " ( >= jpj ) 16 jpkdta = 30 ,& !: number of levels ( >= jpk )26 jpkdta = 30 & !: number of levels ( >= jpk ) 17 27 18 28 INTEGER :: & -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_EEL_R5.h90
r4015 r4029 8 8 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 9 9 !!---------------------------------------------------------------------- 10 CHARACTER (len=16) :: cp_cfg = "eel" !: name of the configuration 11 INTEGER :: jp_cfg = 5 !: resolution of the configuration (km) 12 INTEGER, PARAMETER :: & 10 CHARACTER (len=16) & 11 #if !defined key_agrif 12 , PARAMETER & 13 #endif 14 :: & 15 cp_cfg = "eel" !: name of the configuration 16 INTEGER & 17 #if !defined key_agrif 18 , PARAMETER & 19 #endif 20 :: & 21 jp_cfg = 5 , & !: resolution of the configuration (km) 22 13 23 ! data size !!! * size of all the input files 14 24 jpidta = 66 , & !: first horizontal dimension > or = to jpi 15 25 jpjdta = 66 , & !: second > or = to jpj 16 jpkdta = 31 26 jpkdta = 31 & !: number of levels > or = to jpk 17 27 18 28 INTEGER :: & -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_EEL_R6.h90
r4015 r4029 8 8 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 9 9 !!---------------------------------------------------------------------- 10 CHARACTER (len=16) :: cp_cfg = "eel" !: name of the configuration 11 INTEGER :: jp_cfg = 6 !: resolution of the configuration (km) 12 INTEGER, PARAMETER :: & 10 CHARACTER (len=16) & 11 #if !defined key_agrif 12 , PARAMETER & 13 #endif 14 :: & 15 cp_cfg = "eel" !: name of the configuration 16 INTEGER & 17 #if !defined key_agrif 18 , PARAMETER & 19 #endif 20 :: & 21 jp_cfg = 6 , & !: resolution of the configuration (km) 22 13 23 ! data size !!! * size of all the input files * 14 24 jpidta = 29, & !: 1st lateral dimension ( >= jpi ) 15 25 jpjdta = 83, & !: 2nd " " ( >= jpj ) 16 jpkdta = 30 ,& !: number of levels ( >= jpk )26 jpkdta = 30 & !: number of levels ( >= jpk ) 17 27 18 28 INTEGER :: & -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_GYRE.h90
r4015 r4029 8 8 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 9 9 !!---------------------------------------------------------------------- 10 CHARACTER (len=16) :: cp_cfg = "gyre" !: name of the configuration 11 INTEGER :: jp_cfg = 1 !: resolution of the configuration 12 INTEGER, PARAMETER :: & 10 CHARACTER (len=16) & 11 #if !defined key_agrif 12 , PARAMETER & 13 #endif 14 :: & 15 cp_cfg = "gyre" !: name of the configuration 16 INTEGER & 17 #if !defined key_agrif 18 , PARAMETER & 19 #endif 20 :: & 21 jp_cfg = 1 , & !: 22 13 23 ! data size !!! * size of all the input files * 14 24 jpidta = 30*jp_cfg+2, & !: 1st horizontal dimension ( >= jpi ) -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R025.h90
r4015 r4029 9 9 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 10 10 !!---------------------------------------------------------------------- 11 CHARACTER (len=16) :: cp_cfg = "orca" !: name of the configuration 12 INTEGER :: jp_cfg = 025 !: resolution of the configuration (degrees) 13 INTEGER, PARAMETER :: & 11 CHARACTER (len=16) & 12 #if !defined key_agrif 13 , PARAMETER & 14 #endif 15 :: & 16 cp_cfg = "orca" !: name of the configuration 17 INTEGER & 18 #if !defined key_agrif 19 , PARAMETER & 20 #endif 21 :: & 22 jp_cfg = 025 , & !: resolution of the configuration (degrees) 14 23 ! Original data size 15 24 jpidta = 1442, & !: first horizontal dimension > or = to jpi … … 20 29 jpkdta = 46 !: number of levels > or = to jpk 21 30 #endif 31 22 32 INTEGER :: & 23 33 ! total domain matrix size -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R05.h90
r4015 r4029 9 9 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 10 10 !!---------------------------------------------------------------------- 11 CHARACTER (len=16) :: cp_cfg = "orca" !: name of the configuration 12 INTEGER :: jp_cfg = 05 !: resolution of the configuration (degrees) 13 INTEGER, PARAMETER :: & 14 ! data size !!! * size of all input files * 11 CHARACTER (len=16) & 12 #if !defined key_agrif 13 , PARAMETER & 14 #endif 15 :: & 16 cp_cfg = "orca" !: name of the configuration 17 INTEGER & 18 #if !defined key_agrif 19 , PARAMETER & 20 #endif 21 :: & 22 jp_cfg = 05 , & !: resolution of the configuration (degrees) 23 24 ! data size !!! * size of all the input files * 15 25 jpidta = 722, & !: 1st lateral dimension > or = to jpiglo 16 26 jpjdta = 511, & !: 2nd " " > or = to jpjglo -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R2.h90
r4015 r4029 9 9 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 10 10 !!---------------------------------------------------------------------- 11 CHARACTER (len=16) :: cp_cfg = "orca" !: name of the configuration 12 INTEGER :: jp_cfg = 2 !: resolution of the configuration (degrees) 13 INTEGER, PARAMETER :: & 11 CHARACTER (len=16) & 12 #if !defined key_agrif 13 , PARAMETER & 14 #endif 15 :: & 16 cp_cfg = "orca" !: name of the configuration 17 INTEGER & 18 #if !defined key_agrif 19 , PARAMETER & 20 #endif 21 :: & 22 jp_cfg = 2, & !: resolution of the configuration (degrees) 23 14 24 ! data size !!! * size of all input files * 15 25 jpidta = 182, & !: 1st lateral dimension ( >= jpiglo ) 16 26 jpjdta = 149, & !: 2nd " " ( >= jpjglo ) 17 jpkdta = 31 !: number of levels ( >= jpk ) 27 jpkdta = 31 !: number of levels ( >= jpk ) 18 28 19 29 #if defined key_antarctic -
branches/2013/dev_r3940_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/par_ORCA_R4.h90
r4015 r4029 9 9 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 10 10 !!---------------------------------------------------------------------- 11 CHARACTER (len=16) :: cp_cfg = "orca" !: name of the configuration 12 INTEGER :: jp_cfg = 4 !: resolution of the configuration (degrees) 13 INTEGER, PARAMETER :: & 14 ! data size !!! * size of all input files * 11 !!--------------------------------------------------------------------- 12 !! *** par_ORCA_R4.h90 *** 13 !! Ocean Domain : 4 degrees resolution global ocean 14 !! (0RCA_R4 configuration) 15 !!--------------------------------------------------------------------- 16 !!---------------------------------------------------------------------- 17 !! NEMO/OPA 3.3 , NEMO Consortium (2010) 18 !! $Id$ 19 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 20 !!---------------------------------------------------------------------- 21 CHARACTER (len=16) & 22 #if !defined key_agrif 23 , PARAMETER & 24 #endif 25 :: & 26 cp_cfg = "orca" !: name of the configuration 27 INTEGER & 28 #if !defined key_agrif 29 , PARAMETER & 30 #endif 31 :: & 32 jp_cfg = 4 , & !: resolution of the configuration (degrees) 33 ! Original data size 15 34 jpidta = 92 , & !: first horizontal dimension > or = to jpi 16 35 jpjdta = 76 , & !: second > or = to jpj 17 36 jpkdta = 31 !: number of levels > or = to jpk 18 37 19 38 INTEGER :: & 20 39 ! global domain matrix size
Note: See TracChangeset
for help on using the changeset viewer.
