Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC
- Timestamp:
- 2018-05-11T12:53:25+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC
- Files:
-
- 29 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/cpl_oasis3.F90
r9023 r9570 85 85 86 86 !!---------------------------------------------------------------------- 87 !! NEMO/O PA3.3 , NEMO Consortium (2010)87 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 88 88 !! $Id$ 89 89 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/cyclone.F90
r9125 r9570 39 39 # include "vectopt_loop_substitute.h90" 40 40 !!---------------------------------------------------------------------- 41 !! NEMO/O PA3.3 , LOCEAN-IPSL (2010)41 !! NEMO/OCE 3.3 , LOCEAN-IPSL (2010) 42 42 !! $Id$ 43 43 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/fldread.F90
r9125 r9570 123 123 124 124 !!---------------------------------------------------------------------- 125 !! NEMO/O PA3.3 , NEMO Consortium (2010)125 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 126 126 !! $Id$ 127 127 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/geo2ocean.F90
r9471 r9570 53 53 # include "vectopt_loop_substitute.h90" 54 54 !!---------------------------------------------------------------------- 55 !! NEMO/O PA3.3 , NEMO Consortium (2010)55 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 56 56 !! $Id$ 57 57 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/ocealb.F90
r9125 r9570 20 20 21 21 !!---------------------------------------------------------------------- 22 !! NEMO/O PA4.0 , NEMO Consortium (2010)22 !! NEMO/OCE 4.0 , NEMO Consortium (2010) 23 23 !! $Id: ocealb.F90 8268 2017-07-03 15:01:04Z clem $ 24 24 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbc_ice.F90
r9019 r9570 9 9 !! 3.4 ! 2011-11 (C. Harris) CICE added as an option 10 10 !!---------------------------------------------------------------------- 11 #if defined key_ lim3 || defined key_cice12 !!---------------------------------------------------------------------- 13 !! 'key_ lim3' or 'key_cice' : LIM-3 or CICE sea-ice model11 #if defined key_si3 || defined key_cice 12 !!---------------------------------------------------------------------- 13 !! 'key_si3' or 'key_cice' : LIM-3 or CICE sea-ice model 14 14 !!---------------------------------------------------------------------- 15 15 USE par_oce ! ocean parameters 16 16 USE sbc_oce ! surface boundary condition: ocean 17 # if defined key_ lim317 # if defined key_si3 18 18 USE ice ! LIM-3 parameters 19 19 # endif … … 29 29 PUBLIC sbc_ice_alloc ! called in sbcmod.F90 or sbcice_cice.F90 30 30 31 # if defined key_ lim331 # if defined key_si3 32 32 LOGICAL , PUBLIC, PARAMETER :: lk_lim3 = .TRUE. !: LIM-3 ice model 33 33 LOGICAL , PUBLIC, PARAMETER :: lk_cice = .FALSE. !: no CICE … … 59 59 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: botmelt !: category botmelt 60 60 61 #if defined key_ lim361 #if defined key_si3 62 62 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: evap_ice !: sublimation [kg/m2/s] 63 63 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: devap_ice !: sublimation sensitivity [kg/m2/s/K] … … 108 108 109 109 !!---------------------------------------------------------------------- 110 !! NEMO/O PA4.0 , NEMO Consortium (2011)110 !! NEMO/OCE 4.0 , NEMO Consortium (2011) 111 111 !! $Id$ 112 112 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 124 124 ALLOCATE( snwice_mass(jpi,jpj) , snwice_mass_b(jpi,jpj), snwice_fmass(jpi,jpj) , STAT=ierr(1) ) 125 125 126 #if defined key_ lim3126 #if defined key_si3 127 127 ALLOCATE( qns_ice (jpi,jpj,jpl) , qsr_ice (jpi,jpj,jpl) , & 128 128 & qla_ice (jpi,jpj,jpl) , dqla_ice (jpi,jpj,jpl) , & -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbc_oce.F90
r9115 r9570 152 152 # include "vectopt_loop_substitute.h90" 153 153 !!---------------------------------------------------------------------- 154 !! NEMO/O PA4.0 , NEMO Consortium (2011)154 !! NEMO/OCE 4.0 , NEMO Consortium (2011) 155 155 !! $Id$ 156 156 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcapr.F90
r9367 r9570 41 41 42 42 !!---------------------------------------------------------------------- 43 !! NEMO/O PA4.0 , NEMO Consortium (2011)43 !! NEMO/OCE 4.0 , NEMO Consortium (2011) 44 44 !! $Id$ 45 45 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcblk.F90
r9454 r9570 45 45 USE sbc_ice ! Surface boundary condition: ice fields 46 46 USE lib_fortran ! to use key_nosignedzero 47 #if defined key_ lim347 #if defined key_si3 48 48 USE ice , ONLY : u_ice, v_ice, jpl, a_i_b, at_i_b, tm_su, rn_cnd_s 49 49 USE icethd_dh ! for CALL ice_thd_snwblow … … 65 65 PUBLIC sbc_blk_init ! called in sbcmod 66 66 PUBLIC sbc_blk ! called in sbcmod 67 #if defined key_ lim367 #if defined key_si3 68 68 PUBLIC blk_ice_tau ! routine called in iceforcing 69 69 PUBLIC blk_ice_flx ! routine called in iceforcing … … 134 134 # include "vectopt_loop_substitute.h90" 135 135 !!---------------------------------------------------------------------- 136 !! NEMO/O PA3.7 , NEMO-consortium (2014)136 !! NEMO/OCE 3.7 , NEMO-consortium (2014) 137 137 !! $Id: sbcblk.F90 6416 2016-04-01 12:22:17Z clem $ 138 138 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 534 534 & * ( MIN( sf(jp_tair)%fnow(:,:,1), rt0_snow ) - rt0 ) * cpic * tmask(:,:,1) 535 535 ! 536 #if defined key_ lim3536 #if defined key_si3 537 537 qns_oce(:,:) = zqlw(:,:) - zqsb(:,:) - zqla(:,:) ! non solar without emp (only needed by LIM3) 538 538 qsr_oce(:,:) = qsr(:,:) … … 682 682 END FUNCTION L_vap 683 683 684 #if defined key_ lim3684 #if defined key_si3 685 685 !!---------------------------------------------------------------------- 686 !! 'key_ lim3' ESIMsea-ice model686 !! 'key_si3' SI3 sea-ice model 687 687 !!---------------------------------------------------------------------- 688 688 !! blk_ice_tau : provide the air-ice stress -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcblk_algo_coare.F90
r9125 r9570 32 32 USE sbc_oce ! Surface boundary condition: ocean fields 33 33 USE sbcwave, ONLY : cdn_wave ! wave module 34 #if defined key_ lim3 || defined key_cice34 #if defined key_si3 || defined key_cice 35 35 USE sbc_ice ! Surface boundary condition: ice fields 36 36 #endif -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcblk_algo_coare3p5.F90
r9125 r9570 32 32 USE sbc_oce ! Surface boundary condition: ocean fields 33 33 USE sbcwave, ONLY : cdn_wave ! wave module 34 #if defined key_ lim3 || defined key_cice34 #if defined key_si3 || defined key_cice 35 35 USE sbc_ice ! Surface boundary condition: ice fields 36 36 #endif -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcblk_algo_ecmwf.F90
r9125 r9570 35 35 USE prtctl ! Print control 36 36 USE sbcwave, ONLY : cdn_wave ! wave module 37 #if defined key_ lim3 || defined key_cice37 #if defined key_si3 || defined key_cice 38 38 USE sbc_ice ! Surface boundary condition: ice fields 39 39 #endif -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcblk_algo_ncar.F90
r9125 r9570 28 28 USE sbc_oce ! Surface boundary condition: ocean fields 29 29 USE sbcwave, ONLY : cdn_wave ! wave module 30 #if defined key_ lim3 || defined key_cice30 #if defined key_si3 || defined key_cice 31 31 USE sbc_ice ! Surface boundary condition: ice fields 32 32 #endif -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbccpl.F90
r9168 r9570 27 27 USE sbcwave ! surface boundary condition: waves 28 28 USE phycst ! physical constants 29 #if defined key_ lim329 #if defined key_si3 30 30 USE ice ! ice variables 31 31 #endif … … 40 40 USE ice_domain_size, only: ncat 41 41 #endif 42 #if defined key_ lim342 #if defined key_si3 43 43 USE icethd_dh ! for CALL ice_thd_snwblow 44 44 #endif … … 200 200 # include "vectopt_loop_substitute.h90" 201 201 !!---------------------------------------------------------------------- 202 !! NEMO/O PA3.3 , NEMO Consortium (2010)202 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 203 203 !! $Id$ 204 204 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 216 216 ALLOCATE( alb_oce_mix(jpi,jpj), nrcvinfo(jprcv), STAT=ierr(1) ) 217 217 218 #if ! defined key_ lim3 && ! defined key_cice218 #if ! defined key_si3 && ! defined key_cice 219 219 ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) ) ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init) 220 220 #endif … … 1244 1244 ! ! ice skin temp. ! 1245 1245 ! ! ================== ! 1246 #if defined key_ lim31246 #if defined key_si3 1247 1247 ! needed by Met Office 1248 1248 IF( srcv(jpr_ts_ice)%laction ) THEN … … 1741 1741 END SELECT 1742 1742 1743 #if defined key_ lim31743 #if defined key_si3 1744 1744 ! zsnw = snow fraction over ice after wind blowing (=picefr if no blowing) 1745 1745 zsnw(:,:) = 0._wp ; CALL ice_thd_snwblow( ziceld, zsnw ) … … 1888 1888 IF( srcv(jpr_icb)%laction ) zqns_tot(:,:) = zqns_tot(:,:) - frcv(jpr_icb)%z3(:,:,1) * lfus ! remove latent heat of iceberg melting 1889 1889 1890 #if defined key_ lim31890 #if defined key_si3 1891 1891 ! --- non solar flux over ocean --- ! 1892 1892 ! note: ziceld cannot be = 0 since we limit the ice concentration to amax … … 2023 2023 ENDIF 2024 2024 2025 #if defined key_ lim32025 #if defined key_si3 2026 2026 ! --- solar flux over ocean --- ! 2027 2027 ! note: ziceld cannot be = 0 since we limit the ice concentration to amax … … 2066 2066 ENDIF 2067 2067 2068 #if defined key_ lim32068 #if defined key_si3 2069 2069 ! ! ========================= ! 2070 2070 SELECT CASE( TRIM( sn_rcv_iceflx%cldes ) ) ! ice topmelt and botmelt ! … … 2187 2187 ! ! 1st layer ice/snow temp. ! 2188 2188 ! ! ------------------------- ! 2189 #if defined key_ lim32189 #if defined key_si3 2190 2190 ! needed by Met Office 2191 2191 IF( ssnd(jps_ttilyr)%laction) THEN … … 2311 2311 ENDIF 2312 2312 2313 #if defined key_ lim32313 #if defined key_si3 2314 2314 ! ! ------------------------- ! 2315 2315 ! ! Ice melt ponds ! … … 2684 2684 IF( ssnd(jps_taum )%laction ) CALL cpl_snd( jps_taum , isec, RESHAPE ( taum, (/jpi,jpj,1/) ), info ) 2685 2685 2686 #if defined key_ lim32686 #if defined key_si3 2687 2687 ! ! ------------------------- ! 2688 2688 ! ! Sea surface freezing temp ! -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcdcy.F90
r9124 r9570 31 31 32 32 !!---------------------------------------------------------------------- 33 !! NEMO/O PA3.3 , NEMO-consortium (2010)33 !! NEMO/OCE 3.3 , NEMO-consortium (2010) 34 34 !! $Id$ 35 35 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcflx.F90
r9168 r9570 40 40 # include "vectopt_loop_substitute.h90" 41 41 !!---------------------------------------------------------------------- 42 !! NEMO/O PA3.3 , NEMO-consortium (2010)42 !! NEMO/OCE 3.3 , NEMO-consortium (2010) 43 43 !! $Id$ 44 44 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcfwb.F90
r9168 r9570 42 42 # include "vectopt_loop_substitute.h90" 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) … … 90 90 ! and in case of no melt, it can generate HSSW. 91 91 ! 92 #if ! defined key_ lim3 && ! defined key_cice92 #if ! defined key_si3 && ! defined key_cice 93 93 snwice_mass_b(:,:) = 0.e0 ! no sea-ice model is being used : no snow+ice mass 94 94 snwice_mass (:,:) = 0.e0 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcice_cice.F90
r9168 r9570 89 89 90 90 !!---------------------------------------------------------------------- 91 !! NEMO/O PA3.7 , NEMO-consortium (2015)91 !! NEMO/OCE 3.7 , NEMO-consortium (2015) 92 92 !! $Id$ 93 93 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcice_if.F90
r9168 r9570 16 16 USE eosbn2 ! equation of state 17 17 USE sbc_oce ! surface boundary condition: ocean fields 18 #if defined key_ lim318 #if defined key_si3 19 19 USE ice , ONLY : a_i 20 20 #else … … 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/SBC/sbcisf.F90
r9367 r9570 69 69 70 70 !!---------------------------------------------------------------------- 71 !! NEMO/O PA4.0 , LOCEAN-IPSL (2017)71 !! NEMO/OCE 4.0 , LOCEAN-IPSL (2017) 72 72 !! $Id$ 73 73 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcmod.F90
r9439 r9570 33 33 USE sbcblk ! surface boundary condition: bulk formulation 34 34 USE sbcice_if ! surface boundary condition: ice-if sea-ice model 35 #if defined key_ lim335 #if defined key_si3 36 36 USE icestp ! surface boundary condition: LIM 3.0 sea-ice model 37 37 #endif … … 68 68 69 69 !!---------------------------------------------------------------------- 70 !! NEMO/O PA4.0 , NEMO-consortium (2016)70 !! NEMO/OCE 4.0 , NEMO-consortium (2016) 71 71 !! $Id$ 72 72 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) … … 227 227 ! !* allocate sbc arrays 228 228 IF( sbc_oce_alloc() /= 0 ) CALL ctl_stop( 'sbc_init : unable to allocate sbc_oce arrays' ) 229 #if ! defined key_ lim3 && ! defined key_cice229 #if ! defined key_si3 && ! defined key_cice 230 230 IF( sbc_ice_alloc() /= 0 ) CALL ctl_stop( 'sbc_init : unable to allocate sbc_ice arrays' ) 231 231 #endif … … 327 327 IF( ln_apr_dyn ) CALL sbc_apr_init ! Atmo Pressure Forcing initialization 328 328 ! 329 #if defined key_ lim3329 #if defined key_si3 330 330 IF( lk_agrif .AND. nn_ice == 0 ) THEN ! allocate ice arrays in case agrif + ice-model + no-ice in child grid 331 331 IF( sbc_ice_alloc() /= 0 ) CALL ctl_stop('STOP', 'sbc_ice_alloc : unable to allocate arrays' ) … … 426 426 SELECT CASE( nn_ice ) ! Update heat and freshwater fluxes over sea-ice areas 427 427 CASE( 1 ) ; CALL sbc_ice_if ( kt ) ! Ice-cover climatology ("Ice-if" model) 428 #if defined key_ lim3428 #if defined key_si3 429 429 CASE( 2 ) ; CALL ice_stp ( kt, nsbc ) ! LIM-3 ice model 430 430 #endif -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcrnf.F90
r9367 r9570 69 69 70 70 !!---------------------------------------------------------------------- 71 !! NEMO/O PA3.3 , NEMO Consortium (2010)71 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 72 72 !! $Id$ 73 73 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcssm.F90
r9367 r9570 32 32 33 33 !!---------------------------------------------------------------------- 34 !! NEMO/O PA3.3 , NEMO Consortium (2010)34 !! NEMO/OCE 3.3 , NEMO Consortium (2010) 35 35 !! $Id$ 36 36 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcssr.F90
r9169 r9570 47 47 48 48 !!---------------------------------------------------------------------- 49 !! NEMO/O PA4.0 , NEMO Consortium (2011)49 !! NEMO/OCE 4.0 , NEMO Consortium (2011) 50 50 !! $Id$ 51 51 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbctide.F90
r9125 r9570 33 33 34 34 !!---------------------------------------------------------------------- 35 !! NEMO/O PA3.5 , NEMO Consortium (2013)35 !! NEMO/OCE 3.5 , NEMO Consortium (2013) 36 36 !! $Id$ 37 37 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcwave.F90
r9168 r9570 74 74 # include "vectopt_loop_substitute.h90" 75 75 !!---------------------------------------------------------------------- 76 !! NEMO/O PA3.7 , NEMO Consortium (2014)76 !! NEMO/OCE 3.7 , NEMO Consortium (2014) 77 77 !! $Id$ 78 78 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/tide_mod.F90
r9023 r9570 34 34 35 35 !!---------------------------------------------------------------------- 36 !! NEMO/O PA3.3 , LOCEAN-IPSL (2010)36 !! NEMO/OCE 3.3 , LOCEAN-IPSL (2010) 37 37 !! $Id$ 38 38 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/tideini.F90
r9337 r9570 39 39 40 40 !!---------------------------------------------------------------------- 41 !! NEMO/O PA3.5 , NEMO Consortium (2013)41 !! NEMO/OCE 3.5 , NEMO Consortium (2013) 42 42 !! $Id$ 43 43 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/updtide.F90
r7646 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)
Note: See TracChangeset
for help on using the changeset viewer.