Changeset 2073 for LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90
- Timestamp:
- Jun 25, 2014, 5:43:19 PM (10 years ago)
- Location:
- LMDZ5/branches/testing
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/branches/testing
- Property svn:mergeinfo changed
/LMDZ5/trunk merged: 2057-2059,2062,2064-2070
- Property svn:mergeinfo changed
-
LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90
r2056 r2073 53 53 ! type_ocean: type d'ocean (force, slab, couple) 54 54 ! version_ocean: version d'ocean (opa8/nemo pour type_ocean=couple ou 55 ! sicOBS pour type_ocean=slab)55 ! sicOBS,sicINT,sicNO pour type_ocean=slab) 56 56 ! ok_veget: type de modele de vegetation 57 57 ! ok_journe: sorties journalieres … … 1933 1933 IF (type_ocean=='slab' .AND. version_ocean=='xxxxxx') THEN 1934 1934 version_ocean='sicOBS' 1935 ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS') THEN 1935 ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS' & 1936 .AND. version_ocean/='sicINT' .AND. version_ocean/='sicNO') THEN 1936 1937 WRITE(lunout,*)' ERROR version_ocean=',version_ocean,' not valid with slab ocean' 1937 1938 CALL abort_gcm('conf_phys','version_ocean not valid',1)
Note: See TracChangeset
for help on using the changeset viewer.