Commits · f39bed452442fb24e314b6db303f2feb487216c3 · Earth Sciences / templates · GitLab

15 May, 2014 2 commits
- Merge branch 'develop-1.2_CTRL' into develop-1.2 · f39bed45
  Muhammad Asif authored May 15, 2014
  
  f39bed45
- -CTRL: setup/ctrl has been relocated under sources/runtime/ctrl · eb6457f3
  Muhammad Asif authored May 15, 2014
  
  eb6457f3
14 May, 2014 1 commit
- Merge branch 'develop-1.2_CMOR' into develop-1.2 · 8588884c
  Muhammad Asif authored May 14, 2014
```
Conflicts:
	ecearth3/ecearth3.clean
	ecearth3/ecearth3.post
```
  8588884c
13 May, 2014 3 commits
- Merge branch 'develop-1.2_ECE3.1' into develop-1.2 · 899db43e
  Muhammad Asif authored May 13, 2014
```
Conflicts:
	ecearth3/ecearth3.sim
```
  899db43e
- Merge branch 'develop-1.2_COMPILATION' into develop-1.2 · 3c77317c
  Muhammad Asif authored May 13, 2014
  
  3c77317c
- - COMPILATION: focussed/targeted nemo configuration should be compiled · 72b5fa5b
  Muhammad Asif authored May 13, 2014
  
  72b5fa5b
12 May, 2014 6 commits
- Merge branch 'ocean_nudging' into develop-1.2 · 8d73826f
  Muhammad Asif authored May 12, 2014
  
  8d73826f
- Update nudging paths according to new conventions · 8654420a
  Virginie Guemas authored May 12, 2014
  
  8654420a
- Incomplete transfer from nemo3 to ecearth3 templates for diags · 71f4571b
  Virginie Guemas authored May 12, 2014
  
  71f4571b
- PISCEs switch -- continuation · 3e1b729a
  Virginie Guemas authored May 12, 2014
  
  3e1b729a
- Forgot some PISCES switches · f37a1c31
  Virginie Guemas authored May 12, 2014
  
  f37a1c31
- Merging error : fi had disappeared · 3c8d7796
  Virginie Guemas authored May 12, 2014
  
  3c8d7796
11 May, 2014 7 commits
- README should not have been pushed to the repository · d404a10a
  Virginie Guemas authored May 11, 2014
  
  d404a10a
- Exchange of development between ocean_nudging and nemo3 in post · 65a4cc02
  Virginie Guemas authored May 11, 2014
  
  65a4cc02
- Exchange of development between ocean_nudging and nemo3 in sim · 491b7afe
  Virginie Guemas authored May 11, 2014
  
  491b7afe
- Exchange of development between ocean_nudging and nemo3 in ini · 4f69680e
  Virginie Guemas authored May 11, 2014
  
  4f69680e
- Exchange of development between ocean_nudging and nemo3 in conf and clean · 52abf293
  Virginie Guemas authored May 11, 2014
  
  52abf293
- develop-1.2 and develop-nemo3 merged into ocean_nudging · ea22191b
  Virginie Guemas authored May 11, 2014
  
  ea22191b
- Merging conflicts fixed · 3dc723eb
  Virginie Guemas authored May 11, 2014
  
  3dc723eb
10 May, 2014 2 commits
- reduced changed to diags in clean as well · 6b28edf0
  Virginie Guemas authored May 10, 2014
  
  6b28edf0
- Forcing datasets an year of forcings as conf parameters · f81fa197
  Virginie Guemas authored May 10, 2014
  
  f81fa197
09 May, 2014 3 commits
- - Merge branch 'develop-v3.0.1_PISCES' into develop-1.2 (slight change in... · cd42dfcc
  Muhammad Asif authored May 09, 2014
```
- Merge branch 'develop-v3.0.1_PISCES' into develop-1.2 (slight change in order to intact the style of commenting in templates.git)
```
  cd42dfcc
- Merge branch 'develop-v3.0.1_PISCES' into develop-1.2 · 8a67dbb8
  Muhammad Asif authored May 09, 2014
  
  8a67dbb8
- reduced replaced by the new diags option to avoid compatibility loss when merging · b8923870
  Virginie Guemas authored May 09, 2014
  
  b8923870
08 May, 2014 8 commits
- Comments · 559b433c
  Virginie Guemas authored May 08, 2014
  
  559b433c
- Merging bug-fix: double zipping · ddb650f9
  Virginie Guemas authored May 08, 2014
  
  ddb650f9
- More general version to tar the reduced outputs · 9b6fd66a
  Virginie Guemas authored May 08, 2014
  
  9b6fd66a
- Bug z naming dimension · 176d1ea1
  Virginie Guemas authored May 08, 2014
  
  176d1ea1
- Fixing time axis issue (again) · 1dbd1565
  Virginie Guemas authored May 08, 2014
  
  1dbd1565
- cdftools 2.1 is necessary for reduced option · 711ca612
  Virginie Guemas authored May 08, 2014
  
  711ca612
- Fix time axis issue · 6be7661b
  Virginie Guemas authored May 08, 2014
  
  6be7661b
- Bug-fix: output zipping · 8baeb525
  Virginie Guemas authored May 08, 2014
  
  8baeb525
07 May, 2014 8 commits
- Fixing merging errors · 1fdbdd0d
  Virginie Guemas authored May 07, 2014
  
  1fdbdd0d
- Merge ocean_nudging with develop-1.2 · 24c04132
  Virginie Guemas authored May 07, 2014
  
  24c04132
- Merge branch 'develop-nemo3' of https://dev.cfu.local//templates into develop-nemo3 · 97de4300
  Virginie Guemas authored May 07, 2014
  
  97de4300
- Generic selection of level 0 for the three configurations · 448b77dc
  Virginie Guemas authored May 07, 2014
  
  448b77dc
- reduced option activated · cfc98242
  Virginie Guemas authored May 07, 2014
  
  cfc98242
- ecearth3.sim: use of the new configuration *_NUDG when nudging activated · 25666943
  Virginie Guemas authored May 07, 2014
  
  25666943
- cdo fails to select level 0 -> replaced by ncks + ncwa · 8f0f58fa
  Virginie Guemas authored May 07, 2014
  
  8f0f58fa
- Merge with develop-1.2 · 942e5ee0
  Virginie Guemas authored May 07, 2014
  
  942e5ee0