Skip to content

Refactor of the CABLE-POP Met input routines. #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Whyborn merged 30 commits into from
Jul 18, 2024
Merged

Refactor of the CABLE-POP Met input routines. #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
eec8769
Start an extension of the CRU met input routines to handle ACCESS met…
Whyborn Mar 28, 2024
397faeb
Finished first pass at new IO prep routine for MET data.
Whyborn Apr 2, 2024
c51a9ca
Continuing work of adapting the POP-TRENDY code to accept CMIP6 Met f…
Whyborn Apr 4, 2024
178a61e
Add routines to read non-standard CO2 and Nitrogen deposition files.
Whyborn Apr 8, 2024
9f5978a
Built the dataset reader routine and split the input into it's own file.
Whyborn Apr 15, 2024
3a7864f
Remove scratch files used during preliminary testing stages.
Whyborn May 14, 2024
65c0ad9
Large set of changes generalising the input routines for the Met forc…
Whyborn May 14, 2024
3ae08ba
Documentation brought in line with the documentation guidelines and
Whyborn Jun 5, 2024
f762c68
Use the INDEX() Fortran intrinsic.
Whyborn Jun 5, 2024
d51b188
Removed unused variable.
Whyborn Jun 5, 2024
d144c6a
Handle instances where sim year is out of NDep and CO2 bounds.
Whyborn Jun 5, 2024
6df6d7f
Remove some unintended characters.
Whyborn Jun 6, 2024
bdc2a7b
Fix usage of L/UBOUND
Whyborn Jun 6, 2024
06486ec
Fix some errors in handling start and end of era.
Whyborn Jun 10, 2024
61d2ea2
Returned DirectRead option to the TRENDY Met input routines.
Whyborn Jun 19, 2024
58bef5f
Re-added DirectRead to the cru namelist
Whyborn Jun 19, 2024
3a07140
Update offline/cable_input.F90
Whyborn Jun 25, 2024
89bb01f
Remove handle_err from IF blocks
Whyborn Jun 25, 2024
0470713
Finding relevant file moved to indepedent subroutine
Whyborn Jun 25, 2024
697fa84
Use named indexes for met variables and utilise nMet
Whyborn Jun 25, 2024
574ee02
Change all NC_ABORT to handle_err for consistency
Whyborn Jun 25, 2024
f64d22d
Add warning to read_metvals subroutine documentation
Whyborn Jun 25, 2024
a33e9b9
Fix minor errors in previous commits.
Whyborn Jun 25, 2024
4913f4f
Trim filenames in error messages.
Whyborn Jun 26, 2024
67337bd
Fix error introduced while clarifying IF blocks
Whyborn Jun 26, 2024
fb78280
Add defaults to 2 missed namelist options.
Whyborn Jun 27, 2024
9c7648d
Added RecycYearStart to cru namelist (prompted by issue #329)
Whyborn Jul 2, 2024
9813bc0
Remove Esatf function from cable_cru_TRENDY.f90
Whyborn Jul 8, 2024
551d0f0
Revert "Remove Esatf function from cable_cru_TRENDY.f90"
Whyborn Jul 8, 2024
405fb54
Small adjustments to comply with Fortran standards
Whyborn Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions offline/Makefile_offline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#
# ==============================================================================
##########################################################################

# these are all the files we are compiling
LSRC = cable_data.F90 cable_common.F90 cable_define_types.F90 cable_iovars.F90 \
cable_abort.F90 casa_variable.F90 cable_parameters.F90 cable_soilsnow.F90 \
Expand Down Expand Up @@ -85,9 +85,9 @@ $(PROG) : cable_driver.o
cable_abort.o: cable_abort.F90 cable_iovars.o cable_define_types.o

cable_data.o: cable_data.F90

cable_diag.o: cable_diag.F90 cable_common.o

cable_air.o: cable_air.F90 cable_define_types.o cable_common.o cable_data.o

cable_albedo.o: cable_albedo.F90 cable_define_types.o cable_common.o cable_data.o
Expand Down Expand Up @@ -142,7 +142,7 @@ casa_variable.o: casa_variable.F90 POP.o cable_define_types.o
spincasacnp.o: spincasacnp.F90 cable_define_types.o cable_carbon.o cable_common.o casa_variable.o \
cable_c13o2.o cable_c13o2_def.o casa_inout.o blaze.o blaze_driver.o casa_cable.o pop_io.o

#cable_LUC.o: cable_LUC.F90 cable_carbon.o cable_common.o casa_variable.o POP.o POPLUC.o cable_LUC_EXPT.o cable_c13o2.o cable_c13o2_def.o
# cable_LUC.o: cable_LUC.F90 cable_carbon.o cable_common.o casa_variable.o POP.o POPLUC.o cable_LUC_EXPT.o cable_c13o2.o cable_c13o2_def.o

CASAONLY_LUC.o: CASAONLY_LUC.F90 cable_define_types.o cable_carbon.o cable_common.o casa_variable.o POP.o \
POPLUC.o cable_LUC_EXPT.o cable_c13o2.o cable_c13o2_def.o casa_cable.o casa_inout.o pop_io.o
Expand All @@ -168,7 +168,7 @@ pop_io.o: pop_io.F90 POP.o casa_variable.o cable_common.o

cable_sli_main.o: cable_sli_main.F90 cable_define_types.o cable_common.o cable_sli_numbers.o \
cable_sli_roots.o cable_sli_solve.o cable_soilsnow.o

cable_sli_numbers.o: cable_sli_numbers.F90 cable_define_types.o

cable_sli_roots.o: cable_sli_roots.F90 cable_sli_numbers.o cable_define_types.o
Expand All @@ -180,7 +180,7 @@ cable_sli_utils.o: cable_sli_utils.F90 cable_sli_numbers.o cable_define_types.o
cable_plume_mip.o: cable_plume_mip.F90 cable_iovars.o cable_define_types.o cable_checks.o cable_weathergenerator.o

cable_cru_TRENDY.o: cable_cru_TRENDY.F90 cable_iovars.o cable_define_types.o cable_checks.o \
cable_weathergenerator.o casa_variable.o
cable_weathergenerator.o casa_variable.o cable_input.o

cable_site.o: cable_site.F90 cable_iovars.o cable_common.o

Expand Down
Loading