Skip to content
Snippets Groups Projects
Commit fe0b1950 authored by Georgiy Faikin's avatar Georgiy Faikin
Browse files

Disabling the automatic use of environmental INMCM

parent 9e5c939b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
source/carbon/carbon_model_to_core_arg_kit.f90
+ 8
− 9
View file @ fe0b1950
...@@ -25,11 +25,11 @@ module carbon_model_to_core_arg_kit ...@@ -25,11 +25,11 @@ module carbon_model_to_core_arg_kit
integer, parameter :: year_min = 1900 !< предусмотренный диапазон лет @todo прописать allocatable, т.к. требуется для типа переменной x_year, иначе ошибка integer, parameter :: year_min = 1900 !< предусмотренный диапазон лет @todo прописать allocatable, т.к. требуется для типа переменной x_year, иначе ошибка
integer, parameter :: year_max = 2025 !< integer, parameter :: year_max = 2025 !<
! (44)*12 = 528 ! Для случая Rostov: 1975 - 2018 ! Для случая Rostov: 1975 - 2018
! (73)*12 = 876 ! Для случая DAO3: 1939 - 2012 ! Для случая DAO3: 1937 - 2012
! (75)*12 = 900 ! Для случая DAO4: 1937 - 2012 ! Для случая DAO4: 1935 - 2012
! (62)*12 = 744 ! Для случая TRGK: 1956 - 2018 ! Для случая TRGK: 1956 - 2018
! (50)*12 = 600 ! Для случая VLDMR: 1968 - 2018 ! Для случая VLDMR: 1968 - 2018
contains contains
...@@ -37,8 +37,7 @@ contains ...@@ -37,8 +37,7 @@ contains
! внешние процедуры ! внешние процедуры
! --------------------------------------------------------------------------------- ! ---------------------------------------------------------------------------------
subroutine set_args(arg_kit, & subroutine set_args(arg_kit, x, x_n, x_ij, x_ijn, x_ijn_month, x_year)
& x, x_n, x_ij, x_ijn, x_ijn_month, x_year)
! --------------------------------------- ! ---------------------------------------
!< @brief установка аргументов !< @brief установка аргументов
......
source/carbon/carbon_models/carbon_model_ROTHC.f90
+ 5
− 5
View file @ fe0b1950
...@@ -20,11 +20,11 @@ module carbon_model_rothc ...@@ -20,11 +20,11 @@ module carbon_model_rothc
call set_pool(pid = n_Catm, name = 'catm') call set_pool(pid = n_Catm, name = 'catm')
call set_pool(pid = n_Cveg, name = 'cveg') call set_pool(pid = n_Cveg, name = 'cveg')
call set_pool(pid = n_CDPM, name = 'CDPM', initial_value = 0.04936, alias = CDPM) call set_pool(pid = n_CDPM, name = 'CDPM', initial_value = 0.01944, alias = CDPM)
call set_pool(pid = n_CRPM, name = 'CRPM', initial_value = 0.799, alias = CRPM) call set_pool(pid = n_CRPM, name = 'CRPM', initial_value = 1.73544, alias = CRPM)
call set_pool(pid = n_CBIO, name = 'CBIO', initial_value = 0.11873, alias = CBIO) call set_pool(pid = n_CBIO, name = 'CBIO', initial_value = 0.06188, alias = CBIO)
call set_pool(pid = n_CHUM, name = 'CHUM', initial_value = 7.07025, alias = CHUM) call set_pool(pid = n_CHUM, name = 'CHUM', initial_value = 1.0416, alias = CHUM)
call set_pool(pid = n_CIOM, name = 'CIOM', initial_value = 0.814, alias = CIOM) call set_pool(pid = n_CIOM, name = 'CIOM', initial_value = 0.245, alias = CIOM)
! station: opt: CDPM: CRPM: CBIO: CHUM: CIOM: ! station: opt: CDPM: CRPM: CBIO: CHUM: CIOM:
! DAO4 1 0.01944 1.73544 0.06188 1.0416 0.245 ! DAO4 1 0.01944 1.73544 0.06188 1.0416 0.245
......
source/environment/environment.f90
+ 1
− 1
View file @ fe0b1950
...@@ -90,7 +90,7 @@ contains ...@@ -90,7 +90,7 @@ contains
select case(environment_model_type) select case(environment_model_type)
case('inmcm') case('inmcm')
select case(environment_data_type) select case(environment_data_type)
case('none') case('none', 'station')
environment_model_init => dummy_init environment_model_init => dummy_init
environment_model_calc_at_timestep => dummy_calc_at_timestep environment_model_calc_at_timestep => dummy_calc_at_timestep
environment_model_calc_at_cell => dummy_calc_at_cell environment_model_calc_at_cell => dummy_calc_at_cell
......
source/grid.f90
+ 16
− 16
View file @ fe0b1950
...@@ -446,14 +446,14 @@ contains ...@@ -446,14 +446,14 @@ contains
select case(datetime_init_mode) select case(datetime_init_mode)
case('auto') case('auto')
select case(environment_data_type) !!! select case(environment_data_type)
case('lsm_offline') !!! case('lsm_offline')
call date_fst%init(jday = jday0_nc, UTC = UTC_user) call date_fst%init(jday = jday0_nc, UTC = UTC_user)
case('station') !!! case('station')
call date_fst%init(timestamp = DI, UTC = UTC_user) !!! call date_fst%init(timestamp = DI, UTC = UTC_user)
case default !!! case default
stop "check failed : this option can not work with these settings" !!! stop "check failed : this option can not work with these settings"
end select !!! end select
case('manual') case('manual')
call date_fst%init(timestamp = timestamp_fst, UTC = UTC_user) call date_fst%init(timestamp = timestamp_fst, UTC = UTC_user)
end select end select
...@@ -461,16 +461,16 @@ contains ...@@ -461,16 +461,16 @@ contains
select case(ntime_mode) select case(ntime_mode)
case('auto') case('auto')
select case(environment_data_type) !!! select case(environment_data_type)
case('lsm_offline') !!! case('lsm_offline')
ntime = nt_nc ntime = nt_nc
call date_lst%init(jday = date_fst%jday + ntime*dble(dt)/day2sec) call date_lst%init(jday = date_fst%jday + ntime*dble(dt)/day2sec)
case('station') !!! case('station')
call date_lst%init(timestamp = DL, UTC = UTC_user) !!! call date_lst%init(timestamp = DL, UTC = UTC_user)
ntime = nint((date_lst%jday - date_fst%jday) * day2sec/dt) !!! ntime = nint((date_lst%jday - date_fst%jday) * day2sec/dt)
case default !!! case default
stop "check failed : this option can not work with these settings" !!! stop "check failed : this option can not work with these settings"
end select !!! end select
case('ntime') case('ntime')
ntime = ntime_user ntime = ntime_user
call date_lst%init(jday = date_fst%jday + ntime*dble(dt)/day2sec) call date_lst%init(jday = date_fst%jday + ntime*dble(dt)/day2sec)
......
ui1_config.nml
+ 3
− 3
View file @ fe0b1950
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
! ----------------------------------------------------------------- ! -----------------------------------------------------------------
!> Углеродная модель: !> Углеродная модель:
carbon_model_type = 'socs' carbon_model_type = 'rothc'
! !
! 'inmcm' - модель inmc [1,2] ! 'inmcm' - модель inmc [1,2]
! 'socs' - модель SOCS [3] ! 'socs' - модель SOCS [3]
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
! дополнительно для environment_data_type = 'station': ! дополнительно для environment_data_type = 'station':
!> Имя станции: !> Имя станции:
station_name = 'DAO3' station_name = 'DAO4'
! 'DAO4' - Станция в Долгопрудном 2 ! 'DAO4' - Станция в Долгопрудном 2
! 'DAO3' - Станция в Долгопрудном 1 ! 'DAO3' - Станция в Долгопрудном 1
! 'TRGK' - Данные Торжок ! 'TRGK' - Данные Торжок
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
! 'Rostov' - Станция ФАНЦ ! 'Rostov' - Станция ФАНЦ
! !
!> Тип подачи удобрения: !> Тип подачи удобрения:
station_opt = '4' station_opt = '1'
! '1' - контрольный случай, без дополнительных удобрений ! '1' - контрольный случай, без дополнительных удобрений
! '2' - 2 способ подачи удобрений ! '2' - 2 способ подачи удобрений
! '3' - 3 способ подачи удобрений ! '3' - 3 способ подачи удобрений
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment