Changeset 5231 for LMDZ6/branches/Amaury_dev
- Timestamp:
- Sep 25, 2024, 1:34:49 PM (2 months ago)
- Location:
- LMDZ6/branches/Amaury_dev
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/Amaury_dev
- Property svn:mergeinfo changed
/LMDZ6/trunk merged: 5217
- Property svn:mergeinfo changed
-
LMDZ6/branches/Amaury_dev/libf/phylmd/calltherm.F90
r5158 r5231 236 236 #ifdef ISO 237 237 IF (.NOT.new_thermcell) THEN 238 CALL abort_ gcm('calltherm 234','isos pas prevus ici',1)238 CALL abort_physic('calltherm 234','isos pas prevus ici',1) 239 239 endif 240 240 #ifdef ISOVERIF -
LMDZ6/branches/Amaury_dev/libf/phylmd/fonte_neige_mod.F90
r5153 r5231 148 148 149 149 USE infotrac_phy, ONLY: niso 150 USE lmdz_abort_physic, ONLY: abort_physic 150 151 #ifdef ISOVERIF 151 152 USE isotopes_mod, ONLY: iso_eau,iso_HDO … … 172 173 IF (error /= 0) THEN 173 174 abort_message='Pb allocation run_off_lic' 174 CALL abort_ gcm(modname,abort_message,1)175 CALL abort_physic(modname,abort_message,1) 175 176 ENDIF 176 177 … … 193 194 IF (error /= 0) THEN 194 195 abort_message='Pb allocation xtrun_off_ter' 195 CALL abort_ gcm(modname,abort_message,1)196 CALL abort_physic(modname,abort_message,1) 196 197 ENDIF 197 198 xtrun_off_ter(:,:) = 0. … … 200 201 IF (error /= 0) THEN 201 202 abort_message='Pb allocation xtrun_off_lic' 202 CALL abort_ gcm(modname,abort_message,1)203 CALL abort_physic(modname,abort_message,1) 203 204 ENDIF 204 205 xtrun_off_lic(:,:) = 0. … … 207 208 IF (error /= 0) THEN 208 209 abort_message='Pb allocation fxtfonte_global' 209 CALL abort_ gcm(modname,abort_message,1)210 CALL abort_physic(modname,abort_message,1) 210 211 ENDIF 211 212 fxtfonte_global(:,:,:) = 0.0 … … 214 215 IF (error /= 0) THEN 215 216 abort_message='Pb allocation fxtcalving_global' 216 CALL abort_ gcm(modname,abort_message,1)217 CALL abort_physic(modname,abort_message,1) 217 218 ENDIF 218 219 fxtcalving_global(:,:,:) = 0.0 … … 221 222 IF (error /= 0) THEN 222 223 abort_message='Pb allocation xtrunofflic_global' 223 CALL abort_ gcm(modname,abort_message,1)224 CALL abort_physic(modname,abort_message,1) 224 225 ENDIF 225 226 xtrunofflic_global(:,:) = 0.0 -
LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90
r5179 r5231 226 226 227 227 ALLOCATE(xtsnow(niso,klon,nbsrf), stat=ierr) 228 IF (ierr /= 0) CALL abort_ gcm('pbl_surface_init', 'pb in allocation',1)228 IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1) 229 229 230 230 ALLOCATE(Rland_ice(niso,klon), stat=ierr) 231 IF (ierr /= 0) CALL abort_ gcm('pbl_surface_init', 'pb in allocation',1)231 IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1) 232 232 233 233 ALLOCATE(Roce(niso,klon), stat=ierr) 234 IF (ierr /= 0) CALL abort_ gcm('pbl_surface_init', 'pb in allocation',1)234 IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1) 235 235 236 236 xtsnow(:,:,:) = xtsnow_rst(:,:,:) … … 2252 2252 ELSE IF (iflag_split >= 1) THEN 2253 2253 #ifdef ISO 2254 CALL abort_ gcm('pbl_surface_mod 2149','isos pas encore dans iflag_split=1',1)2254 CALL abort_physic('pbl_surface_mod 2149','isos pas encore dans iflag_split=1',1) 2255 2255 #endif 2256 2256 … … 2735 2735 IF (iflag_split >= 1) THEN 2736 2736 #ifdef ISO 2737 CALL abort_ gcm('pbl_surface_mod 2607','isos pas encore dans iflag_split=1',1)2737 CALL abort_physic('pbl_surface_mod 2607','isos pas encore dans iflag_split=1',1) 2738 2738 #endif 2739 2739 -
LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_mod.F90
r5158 r5231 73 73 #endif 74 74 75 75 USE lmdz_print_control, ONLY: lunout 76 76 USE lmdz_clesphys 77 77 USE lmdz_dimpft, ONLY: nvm_lmdz 78 78 USE lmdz_yomcst 79 USE lmdz_abort_physic, ONLY: abort_physic 79 80 80 81 INCLUDE "dimsoil.h" … … 229 230 230 231 #ifdef ISO 231 CALL abort_ gcm('surf_land_mod 220','isos pas prevus dans orchidee',1)232 CALL abort_physic('surf_land_mod 220','isos pas prevus dans orchidee',1) 232 233 #endif 233 234 ! temporary for keeping same results using lwdown_m instead of lwdown -
LMDZ6/branches/Amaury_dev/libf/phylmd/surf_landice_mod.F90
r5221 r5231 265 265 266 266 #ifdef ISO 267 CALL abort_ gcm('surf_landice 235','isotopes pas dans INLANDSIS',1)267 CALL abort_physic('surf_landice 235','isotopes pas dans INLANDSIS',1) 268 268 #endif 269 269 -
LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_routines.F90
r5160 r5231 1694 1694 IF (icvflag_Tpa == 2) THEN 1695 1695 #ifdef ISO 1696 CALL abort_ gcm('cv3_routines 1813','isos pas prevus ici',1)1696 CALL abort_physic('cv3_routines 1813','isos pas prevus ici',1) 1697 1697 #endif 1698 1698 … … 1808 1808 1809 1809 #ifdef ISO 1810 CALL abort_ gcm('cv3_routines 1813','isos pas prevus ici',1)1810 CALL abort_physic('cv3_routines 1813','isos pas prevus ici',1) 1811 1811 #endif 1812 1812 DO k = minorig + 1, nl … … 3977 3977 IF (cvflag_prec_eject) THEN 3978 3978 #ifdef ISO 3979 CALL abort_ gcm('cv3_routines 4037','isos pas prevus ici',1)3979 CALL abort_physic('cv3_routines 4037','isos pas prevus ici',1) 3980 3980 #endif 3981 3981 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -
LMDZ6/branches/Amaury_dev/libf/phylmdiso/limit_read_mod.F90
r5158 r5231 518 518 IF ((iso_HTO.gt.0).AND.(ok_prod_nucl_tritium)) THEN 519 519 ierr = nf90_inq_varid(nid, 'TUOCE', nvarid) 520 IF (ierr /= nf90_noerr) CALL abort_ gcm(modname,'Le champ <TUOCE> est absent',1)520 IF (ierr /= nf90_noerr) CALL abort_physic(modname,'Le champ <TUOCE> est absent',1) 521 521 522 522 ierr = nf90_get_var(nid,nvarid,tuoce_glo,start,epais) 523 IF (ierr /= nf90_noerr) CALL abort_ gcm(modname,'Lecture echouee pour <TUOCE>',1)523 IF (ierr /= nf90_noerr) CALL abort_physic(modname,'Lecture echouee pour <TUOCE>',1) 524 524 END IF 525 525 #ifdef ISOVERIF -
LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90
r5226 r5231 1745 1745 #ifdef ISO 1746 1746 WRITE(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso 1747 IF(niso <= 0) CALL abort_ gcm('physiq 1756','options iso incompatibles',1)1747 IF(niso <= 0) CALL abort_physic('physiq 1756','options iso incompatibles',1) 1748 1748 #ifdef ISOTRAC 1749 IF(nzone <= 0) CALL abort_ gcm('physiq 1758','options isotrac incompatibles',1)1749 IF(nzone <= 0) CALL abort_physic('physiq 1758','options isotrac incompatibles',1) 1750 1750 #else 1751 IF(nzone > 0) CALL abort_ gcm('physiq 1762','options isotrac incompatibles',1)1751 IF(nzone > 0) CALL abort_physic('physiq 1762','options isotrac incompatibles',1) 1752 1752 #endif 1753 1753 #else 1754 IF(niso > 0) CALL abort_ gcm('physiq 1772','options iso incompatibles',1)1754 IF(niso > 0) CALL abort_physic('physiq 1772','options iso incompatibles',1) 1755 1755 #endif 1756 1756 … … 3631 3631 ELSE IF (iflag_con==2) THEN 3632 3632 #ifdef ISO 3633 CALL abort_ gcm('physiq 2770','isos pas prevus ici',1)3633 CALL abort_physic('physiq 2770','isos pas prevus ici',1) 3634 3634 #endif 3635 3635 CALL conflx(phys_tstep, paprs, pplay, t_seri, q_seri, & … … 6951 6951 IF (mass_fixer) THEN 6952 6952 #ifdef ISO 6953 CALL abort_ gcm('physiq 6936','isos pas prevus dans le mass fixer',1)6953 CALL abort_physic('physiq 6936','isos pas prevus dans le mass fixer',1) 6954 6954 ! Camille Risi mai 2024: on attend d'avoir la 4e dimension qui rendra tout plus simple. 6955 6955 #endif
Note: See TracChangeset
for help on using the changeset viewer.