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

2758 fix compilation tests #2759

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

2758 fix compilation tests #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9a8e4d
#2758 Fix cleanup of extraction libs.
hiker Oct 28, 2024
af25fcf
#2758 Fixed include path to only pick up files for LFRic.
hiker Oct 28, 2024
1eb8192
#2758 Fixed another makefile.
hiker Oct 28, 2024
c31b6ca
Merge remote-tracking branch 'origin/master' into 2758_fix_compilatio…
hiker Dec 11, 2024
19a0fa8
#2758 Remove references to NEMO api.
hiker Dec 11, 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
1 change: 1 addition & 0 deletions lib/extract/netcdf/dl_esm_inf/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
read_kernel_data_mod.f90
compare_variables_mod.F90
3 changes: 2 additions & 1 deletion lib/extract/netcdf/dl_esm_inf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ $(INF_LIB):
$(F90) $(F90FLAGS) -c $<

clean:
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_netcdf_base.f90
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_netcdf_base.F90 \
compare_variables_mod.F90 read_kernel_data_mod.f90

allclean: clean
$(MAKE) -C $(GOCEAN_INF_DIR) clean
1 change: 1 addition & 0 deletions lib/extract/netcdf/generic/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
compare_variables_mod.F90
3 changes: 2 additions & 1 deletion lib/extract/netcdf/generic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ compare_variables_mod.F90: $(PSYDATA_LIB_DIR)/extract/compare_variables_mod.jinj
$(F90) $(F90FLAGS) -c $<

clean:
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_netcdf_base.f90
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_netcdf_base.f90 \
compare_variables_mod.F90 extract_netcdf_base.F90

allclean: clean
4 changes: 2 additions & 2 deletions lib/extract/netcdf/generic/kernel_data_netcdf.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
! Author J. Henrichs, Bureau of Meteorology

!> This module implements a simple NetCDF writer using the PSyData
!! interface. It is specific to the generic NEMO API, i.e. it does
!! actually not provide any API-specific types like fields, only standard
!! interface. It is for handling generic Fortran code, i.e. it does
!! not actually provide any API-specific types like fields, only standard
!! Fortran data types. Therefore, it is just an empty wrapper around
!! the ExtractNetcdfBaseType, which provides the standard module name
!! and class name expected by the extraction scripts.
Expand Down
1 change: 1 addition & 0 deletions lib/extract/netcdf/lfric/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
kernel_data_netcdf.f90
read_kernel_data_mod.f90
compare_variables_mod.F90
4 changes: 2 additions & 2 deletions lib/extract/netcdf/lfric/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ compare_variables_mod.F90: $(PSYDATA_LIB_DIR)/extract/compare_variables_mod.jinj
$(F90) $(F90FLAGS) $(LFRIC_INCLUDE_FLAGS) -c $<

clean:
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_netcdf_base.f90 \
compare_variables_mod.f90
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_netcdf_base.F90 \
compare_variables_mod.F90 kernel_data_netcdf.f90 read_kernel_data_mod.f90

allclean: clean
$(MAKE) -C $(LFRIC_PATH) allclean
3 changes: 2 additions & 1 deletion lib/extract/standalone/dl_esm_inf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ $(INF_LIB):
$(F90) $(F90FLAGS) -c $<

clean:
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_standalone_base.f90
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_standalone_base.f90 \
compare_variables_mod.F90 read_kernel_data_mod.f90

allclean: clean
$(MAKE) -C $(GOCEAN_INF_DIR) clean
2 changes: 1 addition & 1 deletion lib/extract/standalone/generic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ compare_variables_mod.F90: $(PSYDATA_LIB_DIR)/extract/compare_variables_mod.jinj
$(F90) $(F90FLAGS) -c $<

clean:
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_standalone_base.f90 \
rm -f *.o *.mod $(PSYDATA_LIB) psy_data_base.f90 extract_standalone_base.F90 \
compare_variables_mod.F90

allclean: clean
4 changes: 2 additions & 2 deletions lib/extract/standalone/generic/kernel_data_standalone.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
! Author J. Henrichs, Bureau of Meteorology

!> This module implements a simple binary-file writer using the PSyData
!! interface. It is specific to the generic NEMO API, i.e. it does
!! actually not provide any API-specific types like fields, only standard
!! interface. It is for handling generic Fortran code, i.e. it does
!! not actually provide any API-specific types like fields, only standard
!! Fortran data types. Therefore, it is just an empty wrapper to around
!! the ExtractNetcdfBaseType, which provides the standard module name
!! and class name expected by the extraction scripts.
Expand Down
3 changes: 2 additions & 1 deletion src/psyclone/tests/domain/lfric/lfric_extract_driver_creator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ def init_module_manager():
# to read extracted data from a file) relative to the infrastructure path:
psyclone_root = os.path.dirname(os.path.dirname(os.path.dirname(
os.path.dirname(os.path.dirname(infrastructure_path)))))
read_mod_path = os.path.join(psyclone_root, "lib", "extract", "standalone")
read_mod_path = os.path.join(psyclone_root, "lib", "extract",
"standalone", "lfric")
# Enforce loading of the default ModuleManager
ModuleManager._instance = None

Expand Down
Loading