From 10127da9d4bba500384b89ff5f0ba2cef04b136c Mon Sep 17 00:00:00 2001 From: Carsten Lemmen Date: Fri, 18 Feb 2022 15:15:06 -0500 Subject: [PATCH] Rebnamed schism_cmi_esmf -> schism_esmf_cap --- Makefile | 4 ++-- concurrent_esmf_test.F90 | 2 +- multi_schism.F90 | 2 +- schism_pdaf.F90 | 4 ++-- src/Makefile | 2 +- src/PDAF_bindings/Makefile | 2 +- src/driver/Makefile | 2 +- src/driver/toplevel_schism_atm.F90 | 2 +- src/driver/toplevel_schism_netcdf.F90 | 2 +- src/schism/Makefile | 4 ++-- src/schism/{schism_cmi_esmf.F90 => schism_esmf_cap.F90} | 6 +++--- triple_schism.F90 | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) rename src/schism/{schism_cmi_esmf.F90 => schism_esmf_cap.F90} (99%) diff --git a/Makefile b/Makefile index c787d97..9e6bb76 100644 --- a/Makefile +++ b/Makefile @@ -136,8 +136,8 @@ pdaf: schism_pdaf # Internal make targets for final linking SCHISM_NUOPC_MODS=$(addprefix src/schism/,schism_nuopc_util.mod schism_nuopc_cap.mod) SCHISM_NUOPC_OBJS=$(addprefix src/schism/,schism_nuopc_util.o schism_nuopc_cap.o) -SCHISM_ESMF_MODS=$(addprefix src/schism/,schism_cmi_esmf.mod) -SCHISM_ESMF_OBJS=$(addprefix src/schism/,schism_cmi_esmf.o) +SCHISM_ESMF_MODS=$(addprefix src/schism/,schism_esmf_cap.mod) +SCHISM_ESMF_OBJS=$(addprefix src/schism/,schism_esmf_cap.o) SCHISM_MODS=$(addprefix src/schism/,schism_bmi.mod schism_esmf_util.mod) SCHISM_OBJS=$(addprefix src/schism/,schism_bmi.o schism_esmf_util.o) PDAF_OBJS=$(addprefix src/PDAF_bindings/,parser_mpi.o mod_parallel_pdaf.o mod_assimilation.o init_parallel_pdaf.o \ diff --git a/concurrent_esmf_test.F90 b/concurrent_esmf_test.F90 index fe2a2e6..9731d37 100644 --- a/concurrent_esmf_test.F90 +++ b/concurrent_esmf_test.F90 @@ -32,7 +32,7 @@ program main use esmf - use schism_cmi_esmf, only: schismSetServices => SetServices + use schism_esmf_cap, only: schismSetServices => SetServices use atmosphere_cmi_esmf, only: atmosSetServices => SetServices implicit none diff --git a/multi_schism.F90 b/multi_schism.F90 index e8f48ad..088c16a 100644 --- a/multi_schism.F90 +++ b/multi_schism.F90 @@ -32,7 +32,7 @@ program main use esmf - use schism_cmi_esmf, only: schismSetServices => SetServices + use schism_esmf_cap, only: schismSetServices => SetServices use schism_esmf_util, only: clockCreateFrmParam implicit none diff --git a/schism_pdaf.F90 b/schism_pdaf.F90 index 8416be9..fea339b 100644 --- a/schism_pdaf.F90 +++ b/schism_pdaf.F90 @@ -1,7 +1,7 @@ ! This code is a main driver for a coupled SCHISM and PDAF ! program for running multiple schism components concurrently in flexible mode ! (i.e. multiple tasks can share same PET list). The coupling model interface is -! schism_cmi_esmf.F90 (and interfaces are defined in schism_bmi.F90) +! schism_esmf_cap.F90 (and interfaces are defined in schism_bmi.F90) ! ! @copyright (C) 2018, 2019, 2020-2021 Helmholtz-Zentrum Geesthacht ! @author Richard Hofmeister @@ -36,7 +36,7 @@ program main use esmf - use schism_cmi_esmf, only: schismSetServices => SetServices + use schism_esmf_cap, only: schismSetServices => SetServices ! use schism_msgp, only: parallel_abort,myrank ! use schism_glbl, only: errmsg,tr_el ! USE mod_assimilation, & ! Variables for assimilation diff --git a/src/Makefile b/src/Makefile index 7cef8ff..5b59293 100644 --- a/src/Makefile +++ b/src/Makefile @@ -61,7 +61,7 @@ default: all $(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) $(ESMF_F90COMPILEFREECPP) $(ESMF_F90COMPILECPPFLAGS) $(F90FLAGS) -o $@ $< main_esmf: main_esmf.o driver/toplevel_schism_netcdf.o model/atmosphere_cmi_nuopc.o \ - $(addprefix schism/,schism_cmi_esmf.o schism_esmf_util.o schism_bmi.o) + $(addprefix schism/,schism_esmf_cap.o schism_esmf_util.o schism_bmi.o) $(ESMF_F90LINKER) $(ESMF_F90LINKOPTS) $(ESMF_F90LINKPATHS) $(ESMF_F90LINKRPATHS) -I. -o $@ $^ $(ESMF_F90ESMFLINKLIBS) $(F90FLAGS) $(MOSSCO_LIB) $(LDFLAGS) $(LIBS) main_nuopc: main_nuopc.o driver/driver_schism_atm.o model/atmosphere_cmi_nuopc.o \ diff --git a/src/PDAF_bindings/Makefile b/src/PDAF_bindings/Makefile index 0523cd7..27d82a8 100644 --- a/src/PDAF_bindings/Makefile +++ b/src/PDAF_bindings/Makefile @@ -73,7 +73,7 @@ LDFLAGS+= -L$(SCHISM_BUILD_DIR)/lib -L$(PDAF_BUILD_DIR) -lpdaf-d $(ESMF_F90COMPILER) -c $(ESMF_F90COMPILEOPTS) $(ESMF_F90COMPILEPATHS) $(ESMF_F90COMPILEFREECPP) $(ESMF_F90COMPILECPPFLAGS) $(F90FLAGS) $< #schism_nuopc_cap.o: schism_esmf_util.o schism_bmi.o -#schism_cmi_esmf.o: schism_esmf_util.o schism_bmi.o +#schism_esmf_cap.o: schism_esmf_util.o schism_bmi.o #schism_esmf_util.o: schism_bmi.o .PHONY: clean default all diff --git a/src/driver/Makefile b/src/driver/Makefile index dd8cfdb..d4b37ba 100644 --- a/src/driver/Makefile +++ b/src/driver/Makefile @@ -36,7 +36,7 @@ CMI_NUOPC_OBJS:=$(addprefix ../model/,$(CMI_NUOPC)) CMI_ESMF_OBJS:=$(addprefix ../model/,$(CMI_ESMF)) CMI_MOSSCO_OBJS:=$(addprefix ../mossco/,$(CMI_MOSSCO)) CMI_NUOPC_SCHISM_OBJ:=$(addprefix ../schism/,schism_nuopc_cap.o) -CMI_ESMF_SCHISM_OBJ:=$(addprefix ../schism/,schism_cmi_esmf.o) +CMI_ESMF_SCHISM_OBJ:=$(addprefix ../schism/,schism_esmf_cap.o) F90FLAGS += -I../model -I ../schism ifeq ($(origin MOSSCO_DIR), environment) diff --git a/src/driver/toplevel_schism_atm.F90 b/src/driver/toplevel_schism_atm.F90 index d69b7f3..bde93b2 100644 --- a/src/driver/toplevel_schism_atm.F90 +++ b/src/driver/toplevel_schism_atm.F90 @@ -32,7 +32,7 @@ module toplevel_schism_atm use esmf - use schism_cmi_esmf, only: schismSetServices => SetServices + use schism_esmf_cap, only: schismSetServices => SetServices use atmosphere_cmi_esmf, only: atmosSetServices => SetServices implicit none diff --git a/src/driver/toplevel_schism_netcdf.F90 b/src/driver/toplevel_schism_netcdf.F90 index ae58bd4..23c64ac 100644 --- a/src/driver/toplevel_schism_netcdf.F90 +++ b/src/driver/toplevel_schism_netcdf.F90 @@ -31,7 +31,7 @@ module toplevel_schism_netcdf use esmf - use schism_cmi_esmf, only: schismSetServices => SetServices + use schism_esmf_cap, only: schismSetServices => SetServices use netcdf_component, only: netcdfSetServices => SetServices implicit none diff --git a/src/schism/Makefile b/src/schism/Makefile index 1d4ecb0..0d12eff 100644 --- a/src/schism/Makefile +++ b/src/schism/Makefile @@ -58,7 +58,7 @@ else endif schism_nuopc_cap.o: schism_nuopc_util.o schism_esmf_util.o schism_bmi.o -schism_cmi_esmf.o: schism_esmf_util.o schism_bmi.o +schism_esmf_cap.o: schism_esmf_util.o schism_bmi.o schism_esmf_util.o: schism_bmi.o schism_nuopc_util.o: schism_bmi.o @@ -66,7 +66,7 @@ schism_nuopc_util.o: schism_bmi.o default: all all: nuopc esmf -esmf: schism_cmi_esmf.o +esmf: schism_esmf_cap.o nuopc: schism_nuopc_cap.o common: schism_esmf_util.o schism_bmi.o diff --git a/src/schism/schism_cmi_esmf.F90 b/src/schism/schism_esmf_cap.F90 similarity index 99% rename from src/schism/schism_cmi_esmf.F90 rename to src/schism/schism_esmf_cap.F90 index d818aaf..467bab8 100644 --- a/src/schism/schism_cmi_esmf.F90 +++ b/src/schism/schism_esmf_cap.F90 @@ -24,11 +24,11 @@ #define ESMF_CONTEXT line=__LINE__,file=ESMF_FILENAME,method=ESMF_METHOD #define ESMF_ERR_PASSTHRU msg="SCHISM subroutine call returned error" #undef ESMF_FILENAME -#define ESMF_FILENAME "schism_cmi_esmf.F90" +#define ESMF_FILENAME "schism_esmf_cap.F90" #define _SCHISM_LOG_AND_FINALIZE_ON_ERROR_(X) if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, ESMF_CONTEXT, rcToReturn=X)) call ESMF_Finalize(rc=localrc, endflag=ESMF_END_ABORT) -module schism_cmi_esmf +module schism_esmf_cap use schism_bmi use schism_esmf_util @@ -1577,4 +1577,4 @@ subroutine schism_get_state(ci) ncid_schism_io=ncid_c(ci) end subroutine schism_get_state -end module schism_cmi_esmf +end module schism_esmf_cap diff --git a/triple_schism.F90 b/triple_schism.F90 index f3637d1..ccdd1e9 100644 --- a/triple_schism.F90 +++ b/triple_schism.F90 @@ -33,7 +33,7 @@ program main use esmf use schism_esmf_util, only: clockCreateFrmParam - use schism_cmi_esmf, only: schismSetServices => SetServices + use schism_esmf_cap, only: schismSetServices => SetServices use atmosphere_cmi_esmf, only: atmosSetServices => SetServices implicit none