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

Jump to bottom

WIP: Icebin changes needed for latest PISM #1

Open
wants to merge 4 commits into
base: devlr
Choose a base branch
from
Open

WIP: Icebin changes needed for latest PISM #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f38f153
Bump to C 14
mankoff Apr 17, 2023
f42600f
Include algorithm
mankoff Apr 17, 2023
c868b1a
printf format
mankoff Jun 9, 2023
1fdc64b
Update for PISM includes
mankoff Jun 12, 2023
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.1)
project (GLINT2)
enable_language(Fortran)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 14)

list (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
include (setup_rpath)
Expand Down
1 change: 1 addition & 0 deletions slib/icebin/GridSpec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <icebin/GridSpec.hpp>
#include <ibmisc/netcdf.hpp>
#include <algorithm>

using namespace netCDF;
using namespace ibmisc;
Expand Down
2 changes: 1 addition & 1 deletion slib/icebin/contracts/modele_pism.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <mpi.h> // Must be first
#include <limits>
#include <pism/base/enthalpyConverter.hh>
#include <pism/enthalpyConverter.hh>
#include <ibmisc/VarTransformer.hpp>
#include <icebin/contracts/contracts.hpp>
#include <icebin/modele/GCMCoupler_ModelE.hpp>
Expand Down
2 changes: 1 addition & 1 deletion slib/icebin/modele/GCMCoupler_ModelE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ bool run_ice) // if false, only initialize
{
printf("BEGIN GCMCoupler_ModelE::couple()\n");
// Call superclass coupling for starters
printf("GCMCoupler_ModelE::couple time_s = %dg run_ice=%c \n",time_s, run_ice);
printf("GCMCoupler_ModelE::couple time_s = %d run_ice=%d \n",time_s, run_ice);
GCMInput out(this->GCMCoupler::couple(time_s, gcm_ovalsE, run_ice));
printf("Returned from GCMCoupler_ModelE::couple \n");

Expand Down
4 changes: 2 additions & 2 deletions slib/icebin/pism/IceCoupler_PISM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include <boost/filesystem.hpp>
#include <boost/format.hpp>

#include <pism/base/stressbalance/PISMStressBalance.hh>
#include <pism/earth/PISMBedDef.hh>
#include <pism/stressbalance/StressBalance.hh>
#include <pism/earth/BedDef.hh>

#include <ibmisc/netcdf.hpp>
#include <ibmisc/ibmisc.hpp>
Expand Down
22 changes: 11 additions & 11 deletions slib/icebin/pism/IceCoupler_PISM.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
// PISM Includes... want to be included first
#include <petsc.h>
#include <petscvec.h>
#include <pism/base/util/Context.hh>
#include <pism/base/util/IceGrid.hh>
#include <pism/base/util/iceModelVec.hh>
#include <pism/base/iceModel.hh>
#include <pism/util/Context.hh>
#include <pism/util/IceGrid.hh>
#include <pism/util/iceModelVec.hh>
#include <pism/icemodel/IceModel.hh>

#include <pism/base/util/pism_options.hh>
#include <pism/coupler/atmosphere/PAFactory.hh>
#include <pism/coupler/ocean/POFactory.hh>
#include <pism/coupler/surface/PSFactory.hh>
#include <pism/util/pism_options.hh>
#include <pism/coupler/atmosphere/Factory.hh>
#include <pism/coupler/ocean/Factory.hh>
#include <pism/coupler/surface/Factory.hh>

#include <pism/base/util/PISMTime.hh>
#include <pism/util/Time.hh>

#include <pism/icebin/IBIceModel.hh>
#include <pism/icebin/VecBundleWriter.hh>
#include <pism/icebin/IBSurfaceModel.hh>
#include <pism/base/util/petscwrappers/PetscInitializer.hh>
#include <pism/base/util/petscwrappers/Vec.hh>
#include <pism/util/petscwrappers/PetscInitializer.hh>
#include <pism/util/petscwrappers/Vec.hh>
// --------------------------------
#include <mpi.h>
#include <icebin/GCMCoupler.hpp>
Expand Down