Merge pull request #68 from alex-huth/iOM4_with_bergs

Ice-shelf coupling and FMS2-compatible icebergs driver

build/env

@@ -1,16 +1,18 @@
-#source /opt/modules/default/etc/modules.sh
-module use -a /ncrc/home2/fms/local/modulefiles
-setenv MODULEPATH /usw/eslogin/modulefiles-c4:/sw/eslogin-c4/modulefiles:/opt/cray/pe/ari/modulefiles:/opt/cray/ari/modulefiles:/opt/cray/pe/modulefiles:/opt/cray/modulefiles:/opt/modulefiles:/sw/common/modulefiles
-#module unload PrgEnv-pgi PrgEnv-intel PrgEnv-gnu darshan; module load PrgEnv-gnu; module unload netcdf gcc; module load gcc/7.3.0 cray-hdf5 cray-netcdf
-
-module unload PrgEnv-pgi
-module unload PrgEnv-pathscale
-module unload PrgEnv-intel
-module unload PrgEnv-gnu
-module unload PrgEnv-cray
+#module unload PrgEnv-pgi
+#module unload PrgEnv-pathscale
+#module unload PrgEnv-intel
+#module unload PrgEnv-gnu
+#module unload PrgEnv-cray
 
 module load PrgEnv-intel
-module swap intel intel/18.0.6.288
-module unload netcdf
+module load intel-classic/2022.0.2
+#module swap intel intel/18.0.6.288
+#module load intel
+#module unload netcdf
+module load cray-hdf5
 module load cray-netcdf
-module load cray-hdf5
+
+module switch cray-libsci/22.10.1.2
+#module load cray-hdf5/1.12.1.3
+#module load cray-netcdf/4.8.1.3
+#module load cray-hdf5

build/mkmkf

@@ -1,3 +1,7 @@
+# rm -f path_names
+# ../../mkmf/bin/list_paths ../../FMS/{mpp,diag_manager,time_manager,include,memutils,constants,platform,fms,random_numbers,mosaic,exchange} ../src/ ../driver/
+# ../../mkmf/bin/mkmf -t ../../mkmf/templates/ncrc-intel.mk -c "-Duse_libMPI -Duse_netCDF" -p bergs.x path_names
+
 rm -f path_names
-../../mkmf/bin/list_paths ../../FMS/{mpp,diag_manager,time_manager,include,memutils,constants,platform,fms,random_numbers,mosaic,exchange} ../src/ ../driver/
-../../mkmf/bin/mkmf -t ../../mkmf/templates/ncrc-intel.mk -c "-Duse_libMPI -Duse_netCDF" -p bergs.x path_names
+../../mkmf/bin/list_paths -l ../src/ ../driver/
+../../mkmf/bin/mkmf -t ../../mkmf/templates/ncrc-intel.mk -o "-I../../../build/fms" -p bergs.x -l '-L../../../build/fms -lfms' -c "-Duse_libMPI -Duse_netCDF -I../../../build/fms" path_names

build/mkmkf_fms2

@@ -1,3 +1,3 @@
 rm -f path_names
-../../mkmf/bin/list_paths  ../src/ ../driver/
-../../mkmf/bin/mkmf -t ../../mkmf/templates/ncrc-intel.mk -c "-Duse_libMPI -Duse_netCDF -Duse_fms2_io -I../../../build/fms2" -p bergs.x -l '-L../../../build/fms2 -lfms' path_names
+../../mkmf/bin/list_paths -l ../src/ ../driver/
+../../mkmf/bin/mkmf -t ../../mkmf/templates/ncrc-intel.mk -o "-I../../../build/fms2" -p bergs.x -l '-L../../../build/fms2 -lfms' -c "-Duse_libMPI -Duse_netCDF -DUSE_FMS2_IO -I../../../build/fms2" path_names

driver/driver_data.F90

@@ -1,184 +1,11 @@
+!> Handles reading/writing of restart files and trajectory-based diagnostic files
 module driver_data
+! This file is part of NOAA-GFDL/icebergs. See LICENSE.md for the license.
 
-use fms_mod, only : read_data
-use fms_mod, only : file_exist
-use fms_mod, only : field_exist
-use fms_mod, only : error_mesg
-use fms_mod, only : FATAL
-use mpp_domains_mod, only : domain2D
-use mpp_mod, only : mpp_pe
-use mpp_mod, only : mpp_root_pe
-use mpp_mod, only: mpp_sync
-use constants_mod, only: pi
-use netcdf
-!include 'netcdf.inc'
-
-implicit none
-
-contains
-
-  !> Determine dimensions of A68 background grid
-  subroutine a68_dims(data_dir,ni,nj)
-    ! Arguments
-    character(len=*) :: data_dir
-    integer, intent(out):: ni,nj
-    ! Local variables
-    character(len=1000):: infile
-    integer(kind=4) :: ncid
-    integer :: status
-
-    infile=trim(trim(data_dir)//'a68_experiment_ll_p125_grid.nc')
-
-    !Open netCDF file
-    call handle_err(nf90_open(infile, nf90_nowrite, ncid))
-    !Inquire about the dimensions
-    call handle_err(nf90_inquire_dimension(ncid,1,len=nj))
-    call handle_err(nf90_inquire_dimension(ncid,2,len=ni))
-    !Close netCDF file
-    call handle_err(nf90_close(ncid))
-  end subroutine a68_dims
-
-  !> Handle for errors
-  subroutine handle_err(status)
-    integer, intent (in) :: status
-
-    if(status /= nf90_noerr) then
-      print *, trim(nf90_strerror(status))
-      stop "Stopped"
-    end if
-  end subroutine handle_err
-
-  !>A68 grid setup
-  subroutine a68_prep(data_dir,mpp_domain,lon,lat,dx,dy,area,REarth)
-    ! Arguments
-    character(len=*) :: data_dir
-    type(domain2D) :: mpp_domain
-    real :: lon(:,:) !< Longitude or position in x
-    real :: lat(:,:) !< Latitude or position in y
-    real :: dx(:,:) !< Length of northern edge of cell (m)
-    real :: dy(:,:) !< Length of eatern edge of cell (m)
-    real :: area(:,:) !< Area of cell (m2)
-    real :: REarth
-    ! Local variables
-    character(len=1000) :: filename
-    real, parameter :: gres=0.125
-
-    !Grid specs: lon,lat,dx,dy,area
-    filename=trim(trim(data_dir)//'a68_experiment_ll_p125_grid.nc')
-    call read_a68_data(mpp_domain,filename,'longitude',lon)
-    lon=lon+360
-    call read_a68_data(mpp_domain,filename,'latitude',lat)
-
-    call haversine_dist_and_area(REarth,gres,lon,lat,dx,dy,area)
-  end subroutine a68_prep
-
-  !> Haversine distance and area
-  subroutine haversine_dist_and_area(REarth,gres,lon1,lat1,dx,dy,area)
-    ! Arguments
-    real, intent(in) :: REarth    !Earth radius (m)
-    real, intent(in) :: gres      !grid resolution (degrees)
-    real, intent(in) :: lon1(:,:) !grid longitude
-    real, intent(in) :: lat1(:,:) !grid latitude
-    real, intent(out) :: dx(:,:)  !grid dx (m)
-    real, intent(out) :: dy(:,:)   !grid dy (m)
-    real, intent(out) :: area(:,:) !grid area (m^2)
-    ! Local variables
-    real, parameter :: pi_180=pi/180.
-    real, dimension(size(lon1,1),size(lon1,2)) :: lon2,lat2,p1,p2,dp,dm,a,c
-
-    !calculate dx
-    lon2=lon1-gres
-    lat2=lat1
-    p1 = lat1 * pi_180; p2 = lat2 * pi_180; dp = (lat2-lat1) * pi_180; dm = (lon2-lon1) * pi_180
-    a = sin(0.5*dp)**2. + cos(p1) * cos(p2) * sin(0.5*dm)**2.; c = 2. * atan2(sqrt(a), sqrt(1-a))
-    dx = REarth * c
-
-    !calculate dy
-    lat2=lat1-gres
-    lon2=lon1
-    p1 = lat1 * pi_180; p2 = lat2 * pi_180; dp = (lat2-lat1) * pi_180; dm = (lon2-lon1) * pi_180
-    a = sin(0.5*dp)**2. + cos(p1) * cos(p2) * sin(0.5*dm)**2.; c = 2. * atan2(sqrt(a), sqrt(1-a))
-    dy = REarth * c
-
-    !calculate area
-    area=pi_180*(REarth**2.)*abs(sin(lat1*pi_180)-sin(lat2*pi_180))*abs(gres)
-  end subroutine haversine_dist_and_area
-
-
-  !> Read in static (not time-varying) data for A68 experiment from file
-  subroutine read_a68_data(domain,filename,var,field)
-    ! Arguments
-    type(domain2D) :: domain !< Parallel decomposition
-    character(len=*), intent(in) :: filename, var
-    real :: field(:,:)
-
-    call mpp_sync()
-    if (mpp_pe().eq.mpp_root_pe()) write(*,'(2a)') 'icebergs_driver: Reading ',var
-    if (file_exist(filename)) then
-      if (field_exist(filename, var)) then
-        call read_data(filename, var, field, domain)
-      else
-        if (mpp_pe().eq.mpp_root_pe()) then
-          call error_mesg('icebergs_driver:','Variable missing in file!', FATAL)
-        endif
-      endif
-    else
-      if (mpp_pe().eq.mpp_root_pe()) then
-        call error_mesg('icebergs_driver:','File for variable not found!', FATAL)
-      endif
-    endif
-    call mpp_sync()
-  end subroutine read_a68_data
-
-  !> Calls read_a68_data for wind velocity, ocean velocity, and ssh
-  subroutine a68_prep_3d(data_dir,mpp_domain,tauxa_hr,tauya_hr,uo_hr,vo_hr,ssh_hr)
-    ! Arguments
-    character(len=*) :: data_dir
-
-    type(domain2D) :: mpp_domain
-    real :: tauxa_hr(:,:,:) !< Zonal jra55 wind velocity (m/s, hourly)
-    real :: tauya_hr(:,:,:) !< Meridional jra55 wind velocity (m/s, hourly)
-    real :: uo_hr(:,:,:) !< Zonal OSCAR ocean surface velocity (m/s, hourly)
-    real :: vo_hr(:,:,:) !< Meridional OSCAR ocean surface velocity (m/s, hourly)
-    real :: ssh_hr(:,:,:) !< Effective sea surface height (m, hourly)
-    ! Local variables
-    character(len=1000) :: filename
-
-    filename=trim(trim(data_dir)//'a68_experiment_wind_vel_ncep_10m_dec2020_HOURLY_ll_p125.nc')
-    call read_a68_data_3d(mpp_domain,filename,'ua',tauxa_hr)
-    call read_a68_data_3d(mpp_domain,filename,'va',tauya_hr)
-
-    filename=trim(trim(data_dir)//'a68_experiment_ocean_surf_vel_oscar_dec2020_HOURLY_ll_p125.nc')
-    call read_a68_data_3d(mpp_domain,filename,'uo',uo_hr)
-    call read_a68_data_3d(mpp_domain,filename,'vo',vo_hr)
-
-    filename=trim(trim(data_dir)//'a68_experiment_ssh_duacs_dec2020_HOURLY_ll_p125.nc')
-    call read_a68_data_3d(mpp_domain,filename,'SSH',ssh_hr)
-  end subroutine a68_prep_3d
-
-  !> Read in time-varying A68 data
-  subroutine read_a68_data_3d(domain,filename,var,field)
-    ! Arguments
-    type(domain2D) :: domain !< Parallel decomposition
-    character(len=*), intent(in) :: filename, var
-    real :: field(:,:,:)
-
-    call mpp_sync()
-    if (mpp_pe().eq.mpp_root_pe()) write(*,'(2a)') 'icebergs_driver: Reading ',var
-    if (file_exist(filename)) then
-      if (field_exist(filename, var)) then
-        call read_data(filename, var, field, domain)
-      else
-        if (mpp_pe().eq.mpp_root_pe()) then
-          call error_mesg('icebergs_driver:','Variable missing in file!', FATAL)
-        endif
-      endif
-    else
-      if (mpp_pe().eq.mpp_root_pe()) then
-        call error_mesg('icebergs_driver:','File for variable not found!', FATAL)
-      endif
-    endif
-    call mpp_sync()
-  end subroutine read_a68_data_3d
+#ifndef USE_FMS2_IO
+  use driver_data_fms
+#else
+  use driver_data_fms2
+#endif
 
 end module driver_data