wave stress problem#568
Conversation
I simply add an #ifdef clause to add M_tau_wi to tau_x and tau_y. Seems simple enough, but Guillaume should test.
…op-compile-foss-ww3
Issue563 version2.1
Conflicts: model/Makefile
einola
left a comment
There was a problem hiding this comment.
Looks fine, but you need to merge with Laurent's changes when they're ready - as discussed. That's why I'm "requesting changes"
Also, there seems to be a bug in FromMeshToMeshQuick. Can you make an issue, describe the problem briefly, and assign it to me? I'll see if I can get around to it. Your changes are fine, but From MeshToMeshQuick should be faster :)
|
Hi @einola, I did the merge but can't test it while fram is out of action (back Friday or Monday). |
einola
left a comment
There was a problem hiding this comment.
This looks fine - just one change I don't get.
Check that it runs on fram, and then we can merge.
Unfortunately, then this doesn't actually compile on docker - but that's Laurent's fault, so we should fix it separately.
| endif | ||
|
|
||
| core: contrib | ||
| core: contrib modules |
There was a problem hiding this comment.
I don't think core depends on what is in modules - does it?
There was a problem hiding this comment.
core/src/Makefile requires liboasis:
ifdef USE_OASIS
CXXFLAGS += -DOASIS
CXXFLAGS += -I$(NEXTSIMDIR)/modules/oasis/include
LDFLAGS += -L$(NEXTSIMDIR)/lib -loasis
CHAN = MPI1
endif
There's some stuff in environment.cpp that relates to OASIS:
environment.cpp: //! -3) Initialise communicator and OASIS (if compiled in)
environment.cpp:#ifdef OASIS
environment.cpp: // For OASIS we need to get the local communicator first
environment.cpp: // Initialise OASIS
environment.cpp: int ierror = OASIS3::init_comp(&comp_id, comp_name);
environment.cpp: OASIS3::abort(comp_id, comp_name, "Problem calling OASIS3::init_comp");
environment.cpp: ierror = OASIS3::get_localcomm(&localComm);
environment.cpp: OASIS3::abort(comp_id, comp_name, "Problem calling OASIS3::get_localcomm");
environment.cpp: // create a Nextsim::Communicator from the OASIS communicator
environment.cpp: ierror = OASIS3::create_couplcomm(mpicomm.rank()==0, &localComm, &cplComm);
environment.cpp: OASIS3::abort(comp_id, comp_name, "Problem calling OASIS3::create_couplcomm");
I've merged the fix for this into develop, so you should merge/rebase develop into this branch before merging to develop. |
|
merged and checked that it compiles for
|
InterpMeshToMesh2dinstead ofInterpMeshToMeshQuickliboasis)Runs with these env vars for nextsim
And these for oasis/ww3: