Changeset 6823 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/NESTING

Timestamp:

2016-07-27T11:25:13+02:00 (8 years ago)

Author:

davestorkey

Message:

UKMO/dev_r5518_GO6_package branch: Merge in latest updates from nemo_v3_6_STABLE branch. In particular pick up bug fix to apply diurnal cycle to CICE and bug fix for ICB and northfold.
Custom merge into /branches/UKMO/dev_r5518_GO6_package/NEMOGCM: r6820 cf. r6770 of /branches/2015/nemo_v3_6_STABLE/NEMOGCM@6822

Location:

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/NESTING

Files:

• agulhas (modified) (1 diff)
• src/agrif_types.f90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/NESTING/agulhas

@@ -41 +41 @@
     N  = 31
     ldbletanh   = .FALSE.
-    ppa2        = 0.0
+    pa2         = 0.0
     ppkth2      = 0.0
     ppacr2      = 0.0

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/TOOLS/NESTING/src/agrif_types.f90

@@ -76 +76 @@
   NAMELIST /nesting/imin,imax,jmin,jmax,rho,rhot,bathy_update,updated_parent_file      
   !
-  NAMELIST /vertical_grid/ppkth,ppacr,ppdzmin,pphmax,psur,pa0,pa1,N,ldbletanh,ppa2,ppkth2,ppacr2
+  NAMELIST /vertical_grid/ppkth,ppacr,ppdzmin,pphmax,psur,pa0,pa1,N,ldbletanh,pa2,ppkth2,ppacr2
   ! 
   NAMELIST /partial_cells/partial_steps,parent_bathy_meter,parent_batmet_name,e3zps_min,e3zps_rat