Skip to content
Snippets Groups Projects
Commit 26d0afd1 authored by RODIER Quentin's avatar RODIER Quentin
Browse files

Revert "Removing abort to be able to run DIFF and ECOSG; abort may have be refined"

Jean W. : Marie M. has found a better solution to make DIFF and ECOSG compatible
This reverts commit bdb8e1d9.
parent ab20b563
No related branches found
No related tags found
No related merge requests found
...@@ -66,7 +66,7 @@ SUBROUTINE INIT_ISBA_n (DTCO, OREAD_BUDGETC, UG, U, USS, GCP, IM, DTZ,& ...@@ -66,7 +66,7 @@ SUBROUTINE INIT_ISBA_n (DTCO, OREAD_BUDGETC, UG, U, USS, GCP, IM, DTZ,&
!! B. Decharme 01/18 : simplify carbon spinup procedure (delete LAGRI_TO_GRASS XCO2_START XCO2_END) !! B. Decharme 01/18 : simplify carbon spinup procedure (delete LAGRI_TO_GRASS XCO2_START XCO2_END)
!! B. Decharme 04/20 : New soil carbon scheme (Morel et al. 2019 JAMES) under CRESPSL = DIF option !! B. Decharme 04/20 : New soil carbon scheme (Morel et al. 2019 JAMES) under CRESPSL = DIF option
!! B. Decharme 04/20 : Soil gas scheme (Morel et al. 2019 JAMES) under LSOILGAS = T !! B. Decharme 04/20 : Soil gas scheme (Morel et al. 2019 JAMES) under LSOILGAS = T
!! J. Wurtz 02/23 : Allowing DIF & ECOSG !!
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
!* 0. DECLARATIONS !* 0. DECLARATIONS
...@@ -442,12 +442,12 @@ IF( ((IM%O%CRESPSL/='CNT'.AND.IM%O%CRESPSL/='DIF') .AND. IM%O%LCLEACH) .OR. & ...@@ -442,12 +442,12 @@ IF( ((IM%O%CRESPSL/='CNT'.AND.IM%O%CRESPSL/='DIF') .AND. IM%O%LCLEACH) .OR. &
CALL ABOR1_SFX('INIT_ISBAN: INCONSISTENCY BETWEEN CRESPSL AND LCLEACH') CALL ABOR1_SFX('INIT_ISBAN: INCONSISTENCY BETWEEN CRESPSL AND LCLEACH')
ENDIF ENDIF
! !
!IF(U%LECOSG .AND.(IM%O%CRESPSL/='CNT'.OR.IM%O%CRESPSL/='DIF'.OR.IM%O%LLULCC.OR.IM%O%LFIRE))THEN IF(U%LECOSG .AND.(IM%O%CRESPSL/='CNT'.OR.IM%O%CRESPSL/='DIF'.OR.IM%O%LLULCC.OR.IM%O%LFIRE))THEN
! WRITE(ILUOUT,*)'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' WRITE(ILUOUT,*)'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
! WRITE(ILUOUT,*)'INIT_ISBAN: ECOSG CAN NOT BE USED WITH LAND-USE-CHANGE OR ISBA-CC FOR NOW' WRITE(ILUOUT,*)'INIT_ISBAN: ECOSG CAN NOT BE USED WITH LAND-USE-CHANGE OR ISBA-CC FOR NOW'
! WRITE(ILUOUT,*)'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' WRITE(ILUOUT,*)'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
! CALL ABOR1_SFX('INIT_ISBAN: ECOSG CAN NOT BE USED WITH LAND-USE-CHANGE OR ISBA-CC FOR NOW') CALL ABOR1_SFX('INIT_ISBAN: ECOSG CAN NOT BE USED WITH LAND-USE-CHANGE OR ISBA-CC FOR NOW')
!ENDIF ENDIF
! !
CALL END_IO_SURF_n(HPROGRAM) CALL END_IO_SURF_n(HPROGRAM)
CALL SET_SURFEX_FILEIN(HPROGRAM,'PREP') ! restore input file name CALL SET_SURFEX_FILEIN(HPROGRAM,'PREP') ! restore input file name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment