Skip to content

Commit 4882c1c

Browse files
use centralized version of climate type (#533)
# CABLE Thank you for submitting a pull request to the CABLE Project. ## Description Please include a brief summary of the change and list the issues that are fixed. Please also include relevant motivation and context. You can link issues by using a supported keyword in the pull request's description or in a commit message: Fixes #(issue) ## Type of change Please delete options that are not relevant. - [ ] Bug fix - [ ] New or updated documentation ## Checklist - [ ] The new content is accessible and located in the appropriate section - [ ] I have checked that links are valid and point to the intended content - [ ] I have checked my code/text and corrected any misspellings ## Testing - [x] Are the changes bitwise-compatible with the main branch? If working on an optional feature, are the results bitwise-compatible when this feature is off? If yes, copy benchcab output showing successful completion of the bitwise compatibility tests or equivalent results below this line. 2025-01-17 13:27:09,851 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S0_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S0_out.nc are identical 2025-01-17 13:27:10,097 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S1_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S1_out.nc are identical 2025-01-17 13:27:11,436 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S3_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S3_out.nc are identical 2025-01-17 13:27:11,524 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S1_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S1_out.nc are identical 2025-01-17 13:27:11,554 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S2_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S2_out.nc are identical 2025-01-17 13:27:11,585 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S0_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S0_out.nc are identical 2025-01-17 13:27:21,206 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S3_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S3_out.nc are identical 2025-01-17 13:27:21,216 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S0_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S0_out.nc are identical 2025-01-17 13:27:21,437 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S2_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S2_out.nc are identical 2025-01-17 13:27:21,453 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S3_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S3_out.nc are identical 2025-01-17 13:27:21,460 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S2_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S2_out.nc are identical 2025-01-17 13:27:21,755 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S1_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S1_out.nc are identical 2025-01-17 13:27:22,925 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S2_out.nc AU-How_2003-2017_OzFlux_Met_R1_S2_out.nc are identical 2025-01-17 13:27:22,926 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S1_out.nc AU-How_2003-2017_OzFlux_Met_R1_S1_out.nc are identical 2025-01-17 13:27:22,967 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S3_out.nc AU-How_2003-2017_OzFlux_Met_R1_S3_out.nc are identical 2025-01-17 13:27:23,231 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S0_out.nc AU-How_2003-2017_OzFlux_Met_R1_S0_out.nc are identical 2025-01-17 13:27:29,439 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S3_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S3_out.nc are identical 2025-01-17 13:27:29,465 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S1_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S1_out.nc are identical 2025-01-17 13:27:29,634 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S2_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S2_out.nc are identical 2025-01-17 13:27:29,649 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S0_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S0_out.nc are identical 2025-01-17 13:27:29,673 - INFO - benchcab.benchcab.py:391 - 0 failed, 20 passed - [ ] Are the changes non bitwise-compatible with the main branch because of a bug fix or a feature being newly implemented or improved? If yes, add the link to the modelevaluation.org analysis versus the main branch or equivalent results below this line. Please add a reviewer when ready for review. <!-- readthedocs-preview cable start --> ---- 📚 Documentation preview 📚: https://cable--533.org.readthedocs.build/en/533/ <!-- readthedocs-preview cable end --> --------- Co-authored-by: Claire Carouge <[email protected]>
1 parent 8e72012 commit 4882c1c

File tree

2 files changed

+397
-92
lines changed

2 files changed

+397
-92
lines changed

src/offline/cable_define_types.F90

+2-49
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
!#define UM_BUILD yes
2525
MODULE cable_def_types_mod
2626

27+
USE cable_climate_type_mod, ONLY: climate_type
28+
2729
! Contains all variables which are not subroutine-internal
2830

2931
IMPLICIT NONE
@@ -668,55 +670,6 @@ MODULE cable_def_types_mod
668670

669671
! .............................................................................
670672

671-
! Climate data:
672-
TYPE climate_type
673-
674-
INTEGER :: nyear_average = 20
675-
INTEGER :: nday_average = 31
676-
! INTEGER, POINTER :: &
677-
INTEGER :: &
678-
nyears, & ! number of years in climate record
679-
doy ! day of year
680-
681-
INTEGER, DIMENSION(:), POINTER :: &
682-
chilldays, & ! length of chilling period (period with T<5deg)
683-
iveg, & ! potential vegetation type based on climatic constraints
684-
biome
685-
686-
REAL, DIMENSION(:), POINTER :: &
687-
dtemp, & ! daily temperature
688-
dmoist, & ! daily moisture availability
689-
mtemp, & ! mean temperature over the last 31 days
690-
qtemp, & ! mean temperature over the last 91 days
691-
mmoist, & ! monthly moisture availability
692-
mtemp_min, & ! minimum monthly temperature
693-
mtemp_max, & ! maximum monhtly temperature
694-
qtemp_max, & ! mean temperature of the warmest quarter (so far this year)
695-
qtemp_max_last_year, & ! mean temperature of the warmest quarter (last calendar year)
696-
mtemp_min20, & ! minimum monthly temperature, averaged over 20 y
697-
mtemp_max20, & ! maximum monhtly temperature, averaged over 20 y
698-
atemp_mean, & ! annual average temperature
699-
AGDD5, &
700-
GDD5, & ! growing degree day sum relative to 5deg base temperature
701-
AGDD0, & !
702-
GDD0, & ! growing degree day sum relative to 0deg base temperature
703-
alpha_PT, & ! ratio of annual evap to annual PT evap
704-
evap_PT, & ! annual PT evap [mm]
705-
aevap , & ! annual evap [mm]
706-
alpha_PT20
707-
708-
REAL, DIMENSION(:,:), POINTER :: &
709-
mtemp_min_20, & ! mimimum monthly temperatures for the last 20 y
710-
mtemp_max_20, & ! maximum monthly temperatures for the last 20 y
711-
dtemp_31 , & ! daily temperature for the last 31 days
712-
dmoist_31 , & ! daily moisture availability for the last 31 days
713-
alpha_PT_20, & ! priestley Taylor Coefft for last 20 y
714-
dtemp_91 ! daily temperature for the last 91 days
715-
716-
END TYPE climate_type
717-
718-
! .............................................................................
719-
720673
! Cumulative flux variables:
721674
TYPE sum_flux_type
722675

0 commit comments

Comments
 (0)