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.

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

Migration of AMM7 to NEMO 4.2 #17

Draft
wants to merge 27 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c7f7b9c
Update README.md
jdha Jan 26, 2023
d23e58c
re-jig of the repo structure adding in arch and env files for archer
jdha Feb 23, 2023
09975ab
renaming arch files and adding in branch 4.2 and tag 4.2.0 sub
jdha Mar 2, 2023
a679b69
Adding version specific cpp files
jdha Mar 2, 2023
fa10e96
Tidy 4.2 EXPREF dir
jdha Mar 2, 2023
19fafbe
remove ice related files
jdha Mar 2, 2023
0b8af1d
move non nemo scripts out of the EXPREF dir
jdha Mar 2, 2023
b34c5f6
adding 4.0.2 EXPREF
jdha Mar 2, 2023
30a1f9b
adding soft links to 4.0.2
jdha Mar 2, 2023
8e838a8
adding version specific MY_SRC
jdha Mar 2, 2023
9e47a59
updating xios arch files
jdha Mar 2, 2023
e3b5b9a
first pass at setup script
jdha Mar 2, 2023
e96f512
Updating diaar5.F90 to allow code to run with GNU (closes #20)
jdha Apr 27, 2023
231a9fd
adding 4.0.4 for completness
jdha Apr 27, 2023
0eaf98e
adding nemo arch files for 4.0.4
jdha Apr 27, 2023
632a65a
update cpp keys
jdha May 3, 2023
4235da5
adding 4.0.4 MY_SRC updates
jdha May 3, 2023
0feed8a
update namelist etc to 4.0.4
jdha May 3, 2023
1131f40
updating 4.0.2 run directory: missing soft links and updated runscript
jdha May 3, 2023
152e404
updating and adding arch files for nemo and xios
jdha May 3, 2023
1c956cb
updating env files
jdha May 3, 2023
58dfed5
updating bdydta - missed update from 4.0.2 to 4.0.4
jdha May 3, 2023
c787400
Update README.md
jdha May 3, 2023
fb5ea64
updates to arch files and setup
jdha May 18, 2023
714b490
Merge branch 'NEMOv4.2' of github.com:JMMP-Group/CO_AMM7 into NEMOv4.2
jdha May 18, 2023
35005f6
Adding updates to add commas to a 4.2 cray namelist otherwise model
jdha May 18, 2023
6a6ac7c
updating 4.2.0 EXPREF dir - including a tmp rs
jdha May 18, 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
37 changes: 37 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# System
.DS_Store
*.swp
.fuse*
1 change: 1 addition & 0 deletions CPP/4.0.2/cpp_AMM7.fcm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bld::tool::fppkeys key_mpp_mpi key_iomput
1 change: 1 addition & 0 deletions CPP/4.0.4/cpp_AMM7.fcm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bld::tool::fppkeys key_mpp_mpi key_iomput
1 change: 1 addition & 0 deletions CPP/4.2.0/cpp_AMM7.fcm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bld::tool::fppkeys key_xios key_qco
1 change: 1 addition & 0 deletions CPP/4.2.1/cpp_AMM7.fcm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bld::tool::fppkeys key_xios key_qco
1 change: 1 addition & 0 deletions CPP/4.2/cpp_AMM7.fcm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bld::tool::fppkeys key_xios key_qco
30 changes: 0 additions & 30 deletions EXP00/runscript.slurm

This file was deleted.

1 change: 1 addition & 0 deletions EXPREF/4.0.2/INPUTS
1 change: 1 addition & 0 deletions EXPREF/4.0.2/axis_def_nemo.xml
File renamed without changes.
1 change: 1 addition & 0 deletions EXPREF/4.0.2/coordinates.bdy.nc
1 change: 1 addition & 0 deletions EXPREF/4.0.2/coordinates.skagbdy.nc
1 change: 1 addition & 0 deletions EXPREF/4.0.2/domain_def_nemo.xml
1 change: 1 addition & 0 deletions EXPREF/4.0.2/field_def_nemo-oce.xml
File renamed without changes.
1 change: 1 addition & 0 deletions EXPREF/4.0.2/grid_def_nemo.xml
File renamed without changes.
42 changes: 21 additions & 21 deletions EXP00/namelist_cfg → EXPREF/4.0.2/namelist_cfg
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
&namrun ! parameters of the run
!-----------------------------------------------------------------------
nn_no = 0 ! Assimilation cycle index
cn_exp = "co9_amm7" ! experiment name
cn_exp = "co_amm7" ! experiment name
nn_it000 = 1 ! first time step
nn_itend = 288 ! last time step (288 per 24hr)
nn_date0 = 20150101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
nn_itend = 1440 ! last time step (288 per 24hr)
nn_date0 = 20050101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
nn_time0 = 0 ! initial time of day in hhmm
nn_leapy = 1 ! Leap year calendar (1) or not (0)
ln_rstart = .false. ! start from rest (F) or from a restart file (T)
Expand All @@ -51,7 +51,7 @@
cn_ocerst_out = "restart" ! suffix of ocean restart name (output)
cn_ocerst_outdir = "./RESTARTS" ! directory in which to write output ocean restarts
ln_iscpl = .false. ! cavity evolution forcing or coupling to ice sheet model
nn_istate = 1 ! output the initial state (1) or not (0)
nn_istate = 0 ! output the initial state (1) or not (0)
ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F)
nn_stock = 0 ! used only if ln_rst_list = F: output restart freqeuncy (modulo referenced to 1)
! ! = 0 force to write restart files only at the end of the run
Expand Down Expand Up @@ -85,7 +85,7 @@
!-----------------------------------------------------------------------
ln_read_cfg = .true. ! (=T) read the domain configuration file
! ! (=F) user defined configuration (F => create/check namusr_def)
cn_domcfg = "./domain_cfg_co9amm7_MEsL51r10-07.nc" ! domain configuration filename
cn_domcfg = "./INPUTS/CO9_repo/domain_cfg_co9amm7_MEsL51r10-07.nc" ! domain configuration filename
!
ln_closea = .false. ! T => keep closed seas (defined by closea_mask field) in the
! ! domain and apply special treatment of freshwater fluxes.
Expand All @@ -107,14 +107,14 @@
ln_tsd_interp = .true. ! Interpolation of T & S in the verticalinput data (T) or not (F)
ln_tsd_dmp = .false. ! T-S restoring (see namtra_dmp)

cn_dir = './' ! root directory for the T-S data location
cn_dir = './INPUTS/inputs/IC/' ! root directory for the T-S data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
sn_tem = 'initcd_y2005m01.nc', -12., 'toce', .true. , .true., 'yearly' , '' , '' , ''
sn_sal = 'initcd_y2005m01.nc', -12., 'soce', .true. , .true., 'yearly' , '' , '' , ''
sn_dep = 'initcd_y2005m01.nc', -12., 'gdept', .false. , .true., 'yearly' , '' , '' , ''
sn_msk = 'initcd_y2005m01.nc', -12., 'mask', .false. , .true., 'yearly' , '' , '' , ''
sn_tem = 'initcd_ud_y2005m01.nc', -12., 'toce', .true. , .true., 'yearly' , '' , '' , ''
sn_sal = 'initcd_ud_y2005m01.nc', -12., 'soce', .true. , .true., 'yearly' , '' , '' , ''
sn_dep = 'initcd_ud_y2005m01.nc', -12., 'gdept', .false. , .true., 'yearly' , '' , '' , ''
sn_msk = 'initcd_ud_y2005m01.nc', -12., 'mask', .false. , .true., 'yearly' , '' , '' , ''
/
!!======================================================================
!! *** Surface Boundary Condition namelists *** !!
Expand Down Expand Up @@ -165,7 +165,7 @@
nn_fwb = 0 ! FreshWater Budget: =0 unchecked
! ! =1 global mean of e-p-r set to zero at each time step
! ! =2 annual global mean of e-p-r set to zero
ln_rnf = .true. ! runoffs (T => fill namsbc_rnf)
ln_rnf = .false. ! runoffs (T => fill namsbc_rnf)
ln_apr_dyn = .true. ! Patm gradient added in ocean & ice Eqs. (T => fill namsbc_apr )
ln_isf = .false. ! ice shelf (T => fill namsbc_isf & namsbc_iscpl)
ln_wave = .false. ! Activate coupling with wave (T => fill namsbc_wave)
Expand Down Expand Up @@ -200,7 +200,7 @@
rn_vfac = 0. ! multiplicative factor for ocean & ice velocity used to
! ! calculate the wind stress (0.=absolute or 1.=relative winds)

cn_dir = './SBC/' ! root directory for the fluxes data location
cn_dir = './INPUTS/inputs/SBC/' ! root directory for the fluxes data location
!___________!_________________________!___________________!___________!_____________!________!___________!______________________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
Expand Down Expand Up @@ -228,7 +228,7 @@
nn_chldta = 0 ! RGB : Chl data (=1) or cst value (=0)
rn_si1 = 23.0 ! 2BD : longest depth of extinction

cn_dir = './SBC/' ! root directory for the chlorophyl data location
cn_dir = './INPUTS/inputs/SBC/' ! root directory for the chlorophyl data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
Expand All @@ -243,7 +243,7 @@
! or to SSS only (=1) or no damping term (=0)
rn_deds = -27.7 ! magnitude of the damping on salinity [mm/day]

cn_dir = './SBC/' ! root directory for the location of the runoff files
cn_dir = './INPUTS/inputs/SBC/' ! root directory for the location of the runoff files
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
Expand All @@ -260,7 +260,7 @@
ln_rnf_tem = .false. ! read in temperature information for runoff
ln_rnf_sal = .false. ! read in salinity information for runoff
rn_rfact = 1.e0 ! multiplicative factor for runoff
cn_dir = './RIV/' ! root directory for the flux data location
cn_dir = './INPUTS/inputs/RIV/' ! root directory for the flux data location
!___________!_________________________________!___________________!___________!_____________!_________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
Expand All @@ -277,7 +277,7 @@
ln_ref_apr = .false. ! ref. pressure: global mean Patm (T) or a constant (F)
ln_apr_obc = .true. ! inverse barometer added to OBC ssh data

cn_dir = './SBC/' ! root directory for the Patm data location
cn_dir = './INPUTS/inputs/SBC/' ! root directory for the Patm data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
Expand Down Expand Up @@ -370,7 +370,7 @@
! ! automatically defined to T if the number of vertical levels in bdy dta /= jpk
ln_full_vel = .false. ! T if [uv]3d are "full" velocities and not only its baroclinic components
!
cn_dir = './BDY/'
cn_dir = './INPUTS/inputs/BDY/2005/'
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
Expand All @@ -389,7 +389,7 @@
! ! automatically defined to T if the number of vertical levels in bdy dta /= jpk
ln_full_vel = .false. ! T if [uv]3d are "full" velocities and not only its baroclinic components
!
cn_dir = './BDY_SKAG/'
cn_dir = './INPUTS/inputs/BDY_SKAG/2005/'
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
Expand All @@ -404,7 +404,7 @@
!-----------------------------------------------------------------------
&nambdy_tide ! tidal forcing at open boundaries
!-----------------------------------------------------------------------
filtide = 'TIDE/amm7_bdytide_' ! file name root of tidal forcing files
filtide = './INPUTS/inputs/TIDE/FES/amm7_bdytide_' ! file name root of tidal forcing files
/
!!======================================================================
!! *** Top/Bottom boundary condition *** !!
Expand Down Expand Up @@ -660,8 +660,8 @@
ln_listonly = .false. ! do nothing else than listing the best domain decompositions (with land domains suppression)
! ! if T: the largest number of cores tested is defined by max(mppsize, jpni*jpnj)
ln_nnogather = .true. ! activate code to avoid mpi_allgather use at the northfold
jpni = 11 ! jpni number of processors following i (set automatically if < 1)
jpnj = 11 ! jpnj number of processors following j (set automatically if < 1)
jpni = 0 ! jpni number of processors following i (set automatically if < 1)
jpnj = 0 ! jpnj number of processors following j (set automatically if < 1)
/
!-----------------------------------------------------------------------
&namctl ! Control prints (default: OFF)
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions EXPREF/4.0.2/nemo
Loading