Changeset 10513
- Timestamp:
- 2019-01-15T14:43:24+01:00 (6 years ago)
- Location:
- NEMO/trunk/tests/ICE_ADV1D
- Files:
-
- 1 deleted
- 8 edited
- 1 copied
- 1 moved
-
. (moved) (moved from NEMO/trunk/tests/ICEADV)
-
EXPREF/namelist_cfg (modified) (4 diffs)
-
EXPREF/namelist_cfg_120pts (modified) (4 diffs)
-
EXPREF/namelist_cfg_240pts (modified) (4 diffs)
-
EXPREF/namelist_cfg_60pts (modified) (4 diffs)
-
MY_SRC/usrdef_hgr.F90 (modified) (4 diffs)
-
MY_SRC/usrdef_nam.F90 (modified) (5 diffs)
-
MY_SRC/usrdef_sbc.F90 (modified) (6 diffs)
-
MY_SRC/usrdef_zgr.F90 (modified) (2 diffs)
-
cpp_ICEADV.fcm (deleted)
-
cpp_ICE_ADV1D.fcm (copied) (copied from NEMO/trunk/tests/ICEADV/cpp_ICEADV.fcm)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg
r10413 r10513 2 2 !! NEMO Configuration namelist : overwrite default values defined in SHARED/namelist_ref 3 3 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 4 !! ICE ADV (LIPSCOMB test) configuration!!4 !! ICE_ADV1D configuration !! 5 5 !!====================================================================== 6 6 !! *** Domain & Run management namelists *** !! … … 18 18 ! 19 19 !----------------------------------------------------------------------- 20 &namusr_def ! ICE ADVuser defined namelist20 &namusr_def ! ICE_ADV1D user defined namelist 21 21 !----------------------------------------------------------------------- 22 22 rn_dx = 4. ! horizontal resolution in meters … … 29 29 !----------------------------------------------------------------------- 30 30 nn_no = 0 ! job number (no more used...) 31 cn_exp = "ICE ADV"! experience name31 cn_exp = "ICE_ADV1D" ! experience name 32 32 nn_it000 = 1 ! first time step 33 33 nn_itend = 40 ! last time step (std 5475) … … 48 48 ln_read_cfg = .false. ! (=T) read the domain configuration file 49 49 ! ! (=F) user defined configuration ==>>> see usrdef(_...) modules 50 cn_domcfg = "ICE ADV_domcfg" ! domain configuration filename50 cn_domcfg = "ICE_ADV1D_domcfg" ! domain configuration filename 51 51 / 52 52 !!====================================================================== -
NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts
r10413 r10513 2 2 !! NEMO Configuration namelist : overwrite default values defined in SHARED/namelist_ref 3 3 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 4 !! ICE ADV (LIPSCOMB test) configuration!!4 !! ICE_ADV1D configuration !! 5 5 !!====================================================================== 6 6 !! *** Domain & Run management namelists *** !! … … 18 18 ! 19 19 !----------------------------------------------------------------------- 20 &namusr_def ! ICE ADVuser defined namelist20 &namusr_def ! ICE_ADV1D user defined namelist 21 21 !----------------------------------------------------------------------- 22 22 rn_dx = 4. ! horizontal resolution in meters … … 29 29 !----------------------------------------------------------------------- 30 30 nn_no = 0 ! job number (no more used...) 31 cn_exp = "ICE ADV"! experience name31 cn_exp = "ICE_ADV1D" ! experience name 32 32 nn_it000 = 1 ! first time step 33 33 nn_itend = 80 ! last time step (std 5475) … … 48 48 ln_read_cfg = .false. ! (=T) read the domain configuration file 49 49 ! ! (=F) user defined configuration ==>>> see usrdef(_...) modules 50 cn_domcfg = "ICE ADV_domcfg" ! domain configuration filename50 cn_domcfg = "ICE_ADV1D_domcfg" ! domain configuration filename 51 51 / 52 52 !!====================================================================== -
NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts
r10413 r10513 2 2 !! NEMO Configuration namelist : overwrite default values defined in SHARED/namelist_ref 3 3 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 4 !! ICE ADV (LIPSCOMB test) configuration!!4 !! ICE_ADV1D configuration !! 5 5 !!====================================================================== 6 6 !! *** Domain & Run management namelists *** !! … … 18 18 ! 19 19 !----------------------------------------------------------------------- 20 &namusr_def ! ICE ADVuser defined namelist20 &namusr_def ! ICE_ADV1D user defined namelist 21 21 !----------------------------------------------------------------------- 22 22 rn_dx = 4. ! horizontal resolution in meters … … 29 29 !----------------------------------------------------------------------- 30 30 nn_no = 0 ! job number (no more used...) 31 cn_exp = "ICE ADV"! experience name31 cn_exp = "ICE_ADV1D" ! experience name 32 32 nn_it000 = 1 ! first time step 33 33 nn_itend = 160 ! last time step (std 5475) … … 48 48 ln_read_cfg = .false. ! (=T) read the domain configuration file 49 49 ! ! (=F) user defined configuration ==>>> see usrdef(_...) modules 50 cn_domcfg = "ICE ADV_domcfg" ! domain configuration filename50 cn_domcfg = "ICE_ADV1D_domcfg" ! domain configuration filename 51 51 / 52 52 !!====================================================================== -
NEMO/trunk/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts
r10413 r10513 2 2 !! NEMO Configuration namelist : overwrite default values defined in SHARED/namelist_ref 3 3 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 4 !! ICE ADV (LIPSCOMB test) configuration!!4 !! ICE_ADV1D configuration !! 5 5 !!====================================================================== 6 6 !! *** Domain & Run management namelists *** !! … … 18 18 ! 19 19 !----------------------------------------------------------------------- 20 &namusr_def ! ICE ADVuser defined namelist20 &namusr_def ! ICE_ADV1D user defined namelist 21 21 !----------------------------------------------------------------------- 22 22 rn_dx = 4. ! horizontal resolution in meters … … 29 29 !----------------------------------------------------------------------- 30 30 nn_no = 0 ! job number (no more used...) 31 cn_exp = "ICE ADV"! experience name31 cn_exp = "ICE_ADV1D" ! experience name 32 32 nn_it000 = 1 ! first time step 33 33 nn_itend = 40 ! last time step (std 5475) … … 48 48 ln_read_cfg = .false. ! (=T) read the domain configuration file 49 49 ! ! (=F) user defined configuration ==>>> see usrdef(_...) modules 50 cn_domcfg = "ICE ADV_domcfg" ! domain configuration filename50 cn_domcfg = "ICE_ADV1D_domcfg" ! domain configuration filename 51 51 / 52 52 !!====================================================================== -
NEMO/trunk/tests/ICE_ADV1D/MY_SRC/usrdef_hgr.F90
r10413 r10513 3 3 !! *** MODULE usrdef_hgr *** 4 4 !! 5 !! === ICE ADVconfiguration ===5 !! === ICE_ADV1D configuration === 6 6 !! 7 7 !! User defined : mesh and Coriolis parameter of a user configuration … … 11 11 12 12 !!---------------------------------------------------------------------- 13 !! usr_def_hgr : initialize the horizontal mesh for ICE ADVconfiguration13 !! usr_def_hgr : initialize the horizontal mesh for ICE_ADV1D configuration 14 14 !!---------------------------------------------------------------------- 15 15 USE dom_oce ! ocean space and time domain … … 45 45 !! 46 46 !! ** Method : set all intent(out) argument to a proper value 47 !! ICE ADVconfiguration : uniform grid spacing (rn_dx)47 !! ICE_ADV1D configuration : uniform grid spacing (rn_dx) 48 48 !! without Coriolis force (f=0) 49 49 !! … … 68 68 ! 69 69 IF(lwp) WRITE(numout,*) 70 IF(lwp) WRITE(numout,*) 'usr_def_hgr : ICE ADVconfiguration bassin'70 IF(lwp) WRITE(numout,*) 'usr_def_hgr : ICE_ADV1D configuration bassin' 71 71 IF(lwp) WRITE(numout,*) 72 72 IF(lwp) WRITE(numout,*) ' f-plane with regular grid-spacing rn_dx, rn_dy' -
NEMO/trunk/tests/ICE_ADV1D/MY_SRC/usrdef_nam.F90
r10413 r10513 3 3 !! *** MODULE usrdef_nam *** 4 4 !! 5 !! === ICE ADVconfiguration ===5 !! === ICE_ADV1D configuration === 6 6 !! 7 7 !! User defined : set the domain characteristics of a user configuration … … 48 48 !! ** Method : read in namusr_def containing all the user specific namelist parameter 49 49 !! 50 !! Here ICE ADVconfiguration50 !! Here ICE_ADV1D configuration 51 51 !! 52 52 !! ** input : - namusr_def namelist found in namelist_cfg … … 72 72 WRITE( ldnam(:), namusr_def ) 73 73 ! 74 cd_cfg = 'ICE ADV' ! name & resolution (not used)74 cd_cfg = 'ICE_ADV1D' ! name & resolution (not used) 75 75 kk_cfg = INT( rn_dx ) 76 76 ! 77 ! Global Domain size: ICE ADVdomain is 480 m x 480 m x 10 m77 ! Global Domain size: ICE_ADV1D domain is 480 m x 480 m x 10 m 78 78 kpi = INT( 480.*0.5 / rn_dx ) -1 79 79 kpj = INT( 480.*0.5 / rn_dy ) -1 … … 86 86 WRITE(ldtxt(ii),*) 'usr_def_nam : read the user defined namelist (namusr_def) in namelist_cfg' ; ii = ii + 1 87 87 WRITE(ldtxt(ii),*) '~~~~~~~~~~~ ' ; ii = ii + 1 88 WRITE(ldtxt(ii),*) ' Namelist namusr_def : ICE ADV test case'; ii = ii + 188 WRITE(ldtxt(ii),*) ' Namelist namusr_def : ICE_ADV1D test case' ; ii = ii + 1 89 89 WRITE(ldtxt(ii),*) ' horizontal resolution rn_dx = ', rn_dx, ' meters' ; ii = ii + 1 90 90 WRITE(ldtxt(ii),*) ' horizontal resolution rn_dy = ', rn_dy, ' meters' ; ii = ii + 1 91 WRITE(ldtxt(ii),*) ' ICE ADV domain '; ii = ii + 191 WRITE(ldtxt(ii),*) ' ICE_ADV1D domain ' ; ii = ii + 1 92 92 WRITE(ldtxt(ii),*) ' LX [km]: ', zlx ; ii = ii + 1 93 93 WRITE(ldtxt(ii),*) ' LY [km]: ', zly ; ii = ii + 1 … … 98 98 ! 99 99 ! ! Set the lateral boundary condition of the global domain 100 kperio = 0 ! ICE ADVconfiguration : bi-periodic basin100 kperio = 0 ! ICE_ADV1D configuration : bi-periodic basin 101 101 ! 102 102 WRITE(ldtxt(ii),*) ' ' ; ii = ii + 1 103 103 WRITE(ldtxt(ii),*) ' Lateral boundary condition of the global domain' ; ii = ii + 1 104 WRITE(ldtxt(ii),*) ' ICE ADV : closed basin jperio = ', kperio; ii = ii + 1104 WRITE(ldtxt(ii),*) ' ICE_ADV1D : closed basin jperio = ', kperio ; ii = ii + 1 105 105 ! 106 106 END SUBROUTINE usr_def_nam -
NEMO/trunk/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90
r10413 r10513 3 3 !! *** MODULE usrdef_sbc *** 4 4 !! 5 !! === ICE ADVconfiguration ===5 !! === ICE_ADV1D configuration === 6 6 !! 7 7 !! User defined : surface forcing of a user configuration … … 11 11 12 12 !!---------------------------------------------------------------------- 13 !! usr_def_sbc : user defined surface bounday conditions in ICE ADVcase13 !! usr_def_sbc : user defined surface bounday conditions in ICE_ADV1D case 14 14 !!---------------------------------------------------------------------- 15 15 USE oce ! ocean dynamics and tracers … … 49 49 !! condition, i.e. the momentum, heat and freshwater fluxes. 50 50 !! 51 !! ** Method : all 0 fields, for ICE ADVcase51 !! ** Method : all 0 fields, for ICE_ADV1D case 52 52 !! CAUTION : never mask the surface stress field ! 53 53 !! … … 61 61 IF( kt == nit000 ) THEN 62 62 ! 63 IF(lwp) WRITE(numout,*)' usrdef_sbc_oce : ICE ADVcase: NO surface forcing'63 IF(lwp) WRITE(numout,*)' usrdef_sbc_oce : ICE_ADV1D case: NO surface forcing' 64 64 ! --- oce variables --- ! 65 65 utau(:,:) = 0._wp … … 91 91 INTEGER, INTENT(in) :: kt ! ocean time step 92 92 !!--------------------------------------------------------------------- 93 IF( kt==nit000 .AND. lwp) WRITE(numout,*)' usrdef_sbc_ice : ICE ADVcase: no stress forcing'93 IF( kt==nit000 .AND. lwp) WRITE(numout,*)' usrdef_sbc_ice : ICE_ADV1D case: no stress forcing' 94 94 ! 95 95 utau_ice(:,:) = 0._wp … … 112 112 !!--------------------------------------------------------------------- 113 113 ! 114 IF( kt==nit000 .AND. lwp) WRITE(numout,*)' usrdef_sbc_ice : ICE ADVcase: NO flux forcing'114 IF( kt==nit000 .AND. lwp) WRITE(numout,*)' usrdef_sbc_ice : ICE_ADV1D case: NO flux forcing' 115 115 ! 116 116 ! ocean variables (renaming) -
NEMO/trunk/tests/ICE_ADV1D/MY_SRC/usrdef_zgr.F90
r10413 r10513 3 3 !! *** MODULE usrdef_zgr *** 4 4 !! 5 !! === ICE ADVcase ===5 !! === ICE_ADV1D case === 6 6 !! 7 7 !! Ocean domain : user defined vertical coordinate system … … 59 59 ! 60 60 IF(lwp) WRITE(numout,*) 61 IF(lwp) WRITE(numout,*) 'usr_def_zgr : ICE ADVconfiguration (slab ocean - advection of ice in one direction)'61 IF(lwp) WRITE(numout,*) 'usr_def_zgr : ICE_ADV1D configuration (slab ocean - advection of ice in one direction)' 62 62 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 63 63 ! 64 64 ! 65 ! type of vertical coordinate ==>>> here ICE ADV: slab ocean always65 ! type of vertical coordinate ==>>> here ICE_ADV1D : slab ocean always 66 66 ! --------------------------- 67 67 ld_zco = .TRUE. ! z-full-step coordinate
Note: See TracChangeset
for help on using the changeset viewer.
