Skip to content
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

Dephy forcings #34

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Dephy forcings #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1fa97d1
Work in progress on dephy forcings
Jan 6, 2021
8e8a079
Dephy implementation
Feb 3, 2021
bfb3880
Makefile compilation changes. NOTE: temporarily removes SOCRATES coup…
Feb 3, 2021
8f26205
Interpolation bugfix with wider implications for MONC
Feb 3, 2021
4da3c60
Example dephy mcf file. Location to be changed.
Feb 3, 2021
28a6a9a
Somewhat longer run for initial testing
Feb 3, 2021
d4adb63
Merge remote-tracking branch 'upstream/master' into dephy_forcings
Feb 3, 2021
1bd300a
Adding rdmi to conditional diagnostics in order to do makefile compil…
Feb 3, 2021
363ef36
Implement column-mode check
Feb 3, 2021
49af5d1
Changes to TODO
Feb 3, 2021
720e782
Added documentation
Feb 8, 2021
e46db6c
Using stub socrates compilation in makefile approach (for compatibili…
Feb 9, 2021
f842c16
Further work on DEPHY+CASIM
Apr 7, 2021
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
5 changes: 3 additions & 2 deletions components/componentheaders.static
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use meanprofiles_mod, only : meanprofiles_get_descriptor
use modelsynopsis_mod, only : modelsynopsis_get_descriptor
use petsc_solver_mod, only : petsc_solver_get_descriptor
use pressuresource_mod, only : pressuresource_get_descriptor
use tvdadvection_mod, only : tvdadvection_get_descriptor
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any idea why this moved?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can check if this is strcitly needed. I had some trouble getting the order of compilations for makefiles right, but it may just be a matter of getting the order correct in the makefile.

use profile_diagnostics_mod, only : profile_diagnostics_get_descriptor
use pstep_mod, only : pstep_get_descriptor
use pwadvection_mod, only : pwadvection_get_descriptor
Expand All @@ -32,19 +33,19 @@ use setfluxlook_mod, only : setfluxlook_get_descriptor
use simplecloud_mod, only : simplecloud_get_descriptor
use simplesetup_mod, only : simplesetup_get_descriptor
use smagorinsky_mod, only : smagorinsky_get_descriptor
use socrates_couple_mod, only : socrates_couple_get_descriptor
use stepfields_mod, only : stepfields_get_descriptor
use steppingdirection_mod, only : steppingdirection_get_descriptor
use subgrid_profile_diagnostics_mod, only : subgrid_profile_diagnostics_get_descriptor
use swapsmooth_mod, only : swapsmooth_get_descriptor
use terminationcheck_mod, only : terminationcheck_get_descriptor
use thadvection_mod, only : thadvection_get_descriptor
use tvdadvection_mod, only : tvdadvection_get_descriptor
use viscosity_mod, only : viscosity_get_descriptor
use lwrad_exponential_mod, only : lwrad_exponential_get_descriptor
use lateral_bcs_mod, only : lateral_bcs_get_descriptor
use casim_mod, only : casim_get_descriptor
use casim_profile_dgs_mod, only: casim_profile_dgs_get_descriptor
use socrates_couple_mod, only : socrates_couple_get_descriptor
use conditional_diagnostics_column_mod, only : conditional_diagnostics_column_get_descriptor
use conditional_diagnostics_whole_mod, only : conditional_diagnostics_whole_get_descriptor
use pdf_analysis_mod, only : pdf_analysis_get_descriptor
use dephy_forcings_mod, only : dephy_forcings_get_descriptor
5 changes: 3 additions & 2 deletions components/componentregistrations.static
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ call add_component(component_descriptions, meanprofiles_get_descriptor())
call add_component(component_descriptions, modelsynopsis_get_descriptor())
call add_component(component_descriptions, petsc_solver_get_descriptor())
call add_component(component_descriptions, pressuresource_get_descriptor())
call add_component(component_descriptions, tvdadvection_get_descriptor())
call add_component(component_descriptions, profile_diagnostics_get_descriptor())
call add_component(component_descriptions, pstep_get_descriptor())
call add_component(component_descriptions, pwadvection_get_descriptor())
Expand All @@ -32,19 +33,19 @@ call add_component(component_descriptions, setfluxlook_get_descriptor())
call add_component(component_descriptions, simplecloud_get_descriptor())
call add_component(component_descriptions, simplesetup_get_descriptor())
call add_component(component_descriptions, smagorinsky_get_descriptor())
call add_component(component_descriptions, socrates_couple_get_descriptor())
call add_component(component_descriptions, stepfields_get_descriptor())
call add_component(component_descriptions, steppingdirection_get_descriptor())
call add_component(component_descriptions, subgrid_profile_diagnostics_get_descriptor())
call add_component(component_descriptions, swapsmooth_get_descriptor())
call add_component(component_descriptions, terminationcheck_get_descriptor())
call add_component(component_descriptions, thadvection_get_descriptor())
call add_component(component_descriptions, tvdadvection_get_descriptor())
call add_component(component_descriptions, viscosity_get_descriptor())
call add_component(component_descriptions, lwrad_exponential_get_descriptor())
call add_component(component_descriptions, lateral_bcs_get_descriptor())
call add_component(component_descriptions, casim_get_descriptor())
call add_component(component_descriptions, casim_profile_dgs_get_descriptor())
call add_component(component_descriptions, socrates_couple_get_descriptor())
call add_component(component_descriptions, conditional_diagnostics_column_get_descriptor())
call add_component(component_descriptions, conditional_diagnostics_whole_get_descriptor())
call add_component(component_descriptions, pdf_analysis_get_descriptor())
call add_component(component_descriptions, dephy_forcings_get_descriptor())
3 changes: 2 additions & 1 deletion components/conditional_diagnostics_whole/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ SRCSF = src/conditional_diagnostics_whole.F90

BUILDDIR=build
COREDIR=../../model_core/build
FFLAGS=-I $(BUILDDIR) -I $(COREDIR) $(COMPILERFFLAGS)
COLUMNDIR= ../conditional_diagnostics_column/build/
FFLAGS=-I $(BUILDDIR) -I $(COREDIR) -I $(COLUMNDIR) $(COMPILERFFLAGS)
OBJS = $(patsubst %.F90,$(BUILDDIR)/%.o,$(SRCSF))

all: create-build-dirs $(OBJS)
Expand Down
8 changes: 4 additions & 4 deletions components/conditional_diagnostics_whole/src/conditional_diagnostics_whole.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module conditional_diagnostics_whole_mod
use grids_mod, only : Z_INDEX
use datadefn_mod, only : PRECISION_TYPE, DEFAULT_PRECISION
use mpi, only : MPI_SUM, MPI_IN_PLACE, MPI_INT, MPI_REAL, MPI_DOUBLE
use missing_data_mod, only: rmdi

use optionsdatabase_mod, only : options_get_integer


Expand All @@ -22,8 +22,8 @@ module conditional_diagnostics_whole_mod
#endif

integer :: diagnostic_generation_frequency

public conditional_diagnostics_whole_get_descriptor
Real, Parameter :: RMDI = -32768.0*32768.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is RMDI? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is a missing data indicator (see e.g. http://cms.ncas.ac.uk/documents/IDL/idl_guide.html#missing)


contains

Expand Down Expand Up @@ -70,7 +70,7 @@ subroutine timestep_callback(current_state)
PRECISION_TYPE, MPI_SUM, 0, current_state%parallel%monc_communicator, ierr)
end if

!> Average summed diagnostics over the domain by dividing the total diagnostic for each condition
!> Average summed diagnostics over the domain by dividing the total diagnostic for each condition
!! by the total number of points for the associated conditions.
!! This is NOT done for the area diagnostic, identified by the requested_area position in the array.
!! Note: CondDiags_tot(k, ncond, ndiag)
Expand Down Expand Up @@ -106,7 +106,7 @@ subroutine timestep_callback(current_state)

end subroutine timestep_callback


!> Called on termination: currently doesn't need to do anything
!! @param current_state The current model state
subroutine finalisation_callback(current_state)
Expand Down
17 changes: 17 additions & 0 deletions components/dephy_forcings/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
SRCSF = src/dephy_forcings.F90

BUILDDIR=build
COREDIR=../../model_core/build
LOWERBCDIR=../lowerbc/build
SETFLUXLOOKDIR=../setfluxlook/build
GRIDMANAGERDIR=../gridmanager/build
FFLAGS=-I $(BUILDDIR) -I $(COREDIR) -I $(LOWERBCDIR) -I $(SETFLUXLOOKDIR) -I $(GRIDMANAGERDIR) $(COMPILERFFLAGS)
OBJS = $(patsubst %.F90,$(BUILDDIR)/%.o,$(SRCSF))

all: create-build-dirs $(OBJS)

create-build-dirs:
mkdir -p $(BUILDDIR)

$(OBJS) : $(BUILDDIR)/%.o : %.F90
$(FTN) $(OPT) $(FFLAGS) $< -o $(BUILDDIR)/$(notdir $@)
Loading