Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion etc/fcm-make/compiler/cray_12_plus.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ $SOURCE_PATH_PREFIX{?} = jules
build.prop{fc.flags}[$SOURCE_PATH_PREFIX/src/io/model_interface/model_interface_mod.F90] = -O0 -Ovector0 -hfp0 -hflex_mp=strict -hipa0
#
# File override to circumvent compiler bug - compiler version: cce/12.0.1
build.prop{fc.flags}[$SOURCE_PATH_PREFIX/src/initialisation/standalone/init_prescribed_data.F90] = $fflags_common -O1
build.prop{fc.flags}[$SOURCE_PATH_PREFIX/src/initialisation/standalone/init_prescribed_data_mod.F90] = $fflags_common -O1
2 changes: 1 addition & 1 deletion etc/fcm-make/make-river.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ extract.path-incl[river] = $extract_path_incl \
src/initialisation/standalone/init_output_mod.F90 \
src/initialisation/standalone/init_rivers.F90 \
Comment thread
ericaneininger marked this conversation as resolved.
src/initialisation/standalone/init_initial_mod.F90 \
src/initialisation/standalone/init_prescribed_data.F90 \
src/initialisation/standalone/init_prescribed_data_mod.F90 \
src/io/dump \
src/io/file_handling \
src/io/input/fill_variables_from_file_mod.F90 \
Expand Down
6 changes: 1 addition & 5 deletions etc/fcm-make/make.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,7 @@ preprocess.prop{file-ext.h} = .inc
build.target = rose-run jules.exe

# Explicit dependencies that need to be defined
build.prop{ns-dep.o}[jules/src/control/standalone/jules.F90] = jules/src/initialisation/standalone \
jules/src/science \
jules/src/control/imogen \
jules/utils
build.prop{dep.o}[jules/src/control/standalone/jules.F90] = control.o
build.prop{ns-dep.o}[jules/src/control/standalone/jules.F90] = jules/utils


################################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE clim_calc_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE clim_calc(land_pts, mm, md, nsdmax, seed_rain, imgn_drive, ainfo)

USE missing_data_mod, ONLY: rmdi
Expand All @@ -18,6 +24,7 @@ SUBROUTINE clim_calc(land_pts, mm, md, nsdmax, seed_rain, imgn_drive, ainfo)
USE ancil_info, ONLY: ainfo_type
USE theta_field_sizes, ONLY: t_i_length
USE imogen_run, ONLY: l_daily_metdata_climatol
USE day_calc_mod, ONLY: day_calc

IMPLICIT NONE

Expand Down Expand Up @@ -47,7 +54,7 @@ SUBROUTINE clim_calc(land_pts, mm, md, nsdmax, seed_rain, imgn_drive, ainfo)
! Seeding number for subdaily rainfall.

TYPE(imgn_drive_type), INTENT(IN OUT) :: imgn_drive
TYPE(ainfo_type), INTENT(IN OUT) :: ainfo
TYPE(ainfo_type), INTENT(IN) :: ainfo

! Create "subdaily" values of the arrays below using day_calc
REAL :: &
Expand Down Expand Up @@ -220,4 +227,5 @@ SUBROUTINE clim_calc(land_pts, mm, md, nsdmax, seed_rain, imgn_drive, ainfo)
RETURN

END SUBROUTINE clim_calc
END MODULE clim_calc_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
!
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE day_calc_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE day_calc( &
land_pts, swdown_daily, precip_daily, tl1_daily, diurnal_tl1_daily, &
lwdown_daily, pstar_daily, wind_daily, ql1_daily, swdown_subdaily, &
Expand All @@ -24,6 +31,7 @@ SUBROUTINE day_calc( &
USE model_grid_mod, ONLY: latitude, longitude
USE theta_field_sizes, ONLY: t_i_length, t_j_length
USE jules_fields_mod, ONLY: ainfo
USE rndm_mod, ONLY: rndm
! USE update_mod, ONLY: t_for_snow, t_for_con_rain
! ejb add trap in imogen nml to ensure they are read
! not activated in #1322 because metadata is a nightmare
Expand Down Expand Up @@ -468,4 +476,5 @@ SUBROUTINE day_calc( &
RETURN

END SUBROUTINE day_calc
END MODULE day_calc_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,18 @@
!
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE delta_temp_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE delta_temp( &
n_olevs,f_ocean,kappa_o,lambda_l,lambda_o,mu,dqradf,dtemp_l,dtemp_o, dtemp_g)

USE invert_mod, ONLY: invert

USE veg_param, ONLY: secs_per_360days

USE jules_print_mgr, ONLY: jules_message, jules_print
Expand Down Expand Up @@ -204,4 +213,5 @@ SUBROUTINE delta_temp( &
RETURN

END SUBROUTINE delta_temp
END MODULE delta_temp_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
!
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE diff_atmos_ch4_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE diff_atmos_ch4(d_land_atmos_ch4, ch4_ppbv)

USE io_constants, ONLY: imogen_unit
Expand Down Expand Up @@ -130,6 +137,6 @@ SUBROUTINE diff_atmos_ch4(d_land_atmos_ch4, ch4_ppbv)

RETURN

END

END SUBROUTINE diff_atmos_ch4
END MODULE diff_atmos_ch4_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
! *********************************************************************
! Calculates the global change in atmospheric CH4
! *********************************************************************

MODULE diffcarb_land_ch4_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE diffcarb_land_ch4(land_pts, d_land_atmos_ch4, darea, dctot_ch4)

USE imogen_run, ONLY: fch4_ref, yr_fch4_ref
Expand Down Expand Up @@ -78,4 +85,5 @@ SUBROUTINE diffcarb_land_ch4(land_pts, d_land_atmos_ch4, darea, dctot_ch4)
RETURN

END SUBROUTINE diffcarb_land_ch4
END MODULE diffcarb_land_ch4_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE diffcarb_land_co2_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE diffcarb_land_co2(land_pts, d_land_atmos_co2, darea, dctot_co2)

USE conversions_mod, ONLY: conv_gtc_to_ppm
Expand Down Expand Up @@ -66,4 +72,5 @@ SUBROUTINE diffcarb_land_co2(land_pts, d_land_atmos_co2, darea, dctot_co2)
RETURN

END SUBROUTINE diffcarb_land_co2
END MODULE diffcarb_land_co2_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE drdat_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE drdat(iyear)

USE fill_variables_from_file_mod, ONLY: fill_variables_from_file
Expand Down Expand Up @@ -82,4 +88,5 @@ SUBROUTINE drdat(iyear)
RETURN

END SUBROUTINE drdat
END MODULE drdat_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
!
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE imogen_check_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE imogen_check( &
c_emissions, include_co2, include_non_co2_radf, land_feed_co2, &
land_feed_ch4, ocean_feed, change_metdata_method, l_change_metdata)
Expand Down Expand Up @@ -284,4 +291,5 @@ SUBROUTINE imogen_check( &
RETURN

END SUBROUTINE imogen_check
END MODULE imogen_check_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE imogen_update_carb_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE imogen_update_carb(progs, imgn_vars)

USE model_grid_mod, ONLY: grid_area_ij
Expand Down Expand Up @@ -42,6 +48,14 @@ SUBROUTINE imogen_update_carb(progs, imgn_vars)
USE imogen_io_vars, ONLY: &
yr_emiss,c_emiss

USE diffcarb_land_co2_mod, ONLY: diffcarb_land_co2

USE ocean_co2_mod, ONLY: ocean_co2

USE diffcarb_land_ch4_mod, ONLY: diffcarb_land_ch4

USE diff_atmos_ch4_mod, ONLY: diff_atmos_ch4

USE logging_mod, ONLY: log_fatal

!TYPE definitions
Expand Down Expand Up @@ -246,4 +260,5 @@ SUBROUTINE imogen_update_carb(progs, imgn_vars)
RETURN

END SUBROUTINE imogen_update_carb
END MODULE imogen_update_carb_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE imogen_update_clim_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE imogen_update_clim(progs, imgn_drive, imgn_vars, ainfo)

USE model_time_mod, ONLY: current_time
Expand All @@ -34,6 +40,20 @@ SUBROUTINE imogen_update_clim(progs, imgn_drive, imgn_vars, ainfo)

USE imogen_constants, ONLY: n_olevs

USE radf_co2_mod, ONLY: radf_co2

USE radf_non_co2_mod, ONLY: radf_non_co2

USE radf_ch4_mod, ONLY: radf_ch4

USE delta_temp_mod, ONLY: delta_temp

USE pattern_scaling_mod, ONLY: pattern_scaling

USE drdat_mod, ONLY: drdat

USE clim_calc_mod, ONLY: clim_calc

USE logging_mod, ONLY: log_fatal

USE jules_print_mgr, ONLY: &
Expand Down Expand Up @@ -269,4 +289,5 @@ SUBROUTINE imogen_update_clim(progs, imgn_drive, imgn_vars, ainfo)
RETURN

END SUBROUTINE imogen_update_clim
END MODULE imogen_update_clim_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
!
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE invert_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE invert( &
u_old,u_new,p,lambda_old,lambda_new,r1,r2,dz_top,n_olevs &
)
Expand Down Expand Up @@ -184,4 +191,5 @@ SUBROUTINE invert( &

RETURN
END SUBROUTINE invert
END MODULE invert_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,20 @@
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE ocean_co2_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE ocean_co2( &
iyear,year_co2,co2_atmos_ppmv,co2_atmos_init_ppmv,dt_ocean, &
fa_ocean,ocean_area,grad_co2_atmos_ppmv,year_run, &
t_ocean_init,nfarray,d_ocean_atmos &
)

USE response_mod, ONLY: response

USE jules_print_mgr, ONLY: &
jules_message, &
jules_print
Expand Down Expand Up @@ -202,4 +210,5 @@ SUBROUTINE ocean_co2( &
RETURN

END SUBROUTINE ocean_co2
END MODULE ocean_co2_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE pattern_scaling_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE pattern_scaling(land_pts, mm, dtemp_g, imgn_drive, ainfo)

USE imgn_drive_mod, ONLY: imgn_drive_type
Expand Down Expand Up @@ -77,4 +83,5 @@ SUBROUTINE pattern_scaling(land_pts, mm, dtemp_g, imgn_drive, ainfo)

RETURN
END SUBROUTINE pattern_scaling
END MODULE pattern_scaling_mod
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
!
! [Met Office Ref SC0237]
!******************************COPYRIGHT**************************************

MODULE radf_ch4_mod

IMPLICIT NONE

CONTAINS

SUBROUTINE radf_ch4(ch4_ppbv, q_ch4)

USE io_constants, ONLY: imogen_unit
Expand Down Expand Up @@ -124,8 +131,6 @@ SUBROUTINE calc_q_ch4(ch4_ppbv, ch4_interp_ppbv, n2o_interp_ppbv, q_ch4)

! Local parameters
REAL :: &
overlap, &
! overlap function.
olap, &
! overlap fn output with modelled ch4 conc
olap_interp ! overlap fn output with reference ch4 conc.
Expand Down Expand Up @@ -169,4 +174,5 @@ FUNCTION overlap(ch4_ppbv, n2o_ppbv) RESULT(overlap_val)
+ (5.31e-15 * ch4_ppbv * (ch4_ppbv * n2o_ppbv)** 1.52))

END FUNCTION overlap
END MODULE radf_ch4_mod
#endif
Loading