Context Navigation

← Previous Change
Next Change →

tools

Timestamp:

Jul 19, 2024, 10:05:57 AM (5 months ago)

Author:

abarral

Message:

[continued & end] replace netcdf by lmdz_netcdf.F90 wrapper
"use netcdf" is now only used in lmdz_netcdf.F90 (except ecrad and obsolete/)
<include "netcdf.inc"> is now likewise only used in lmdz_netcdf.F90.

systematically specify explicitely <USE lmdz_netcdf, ONLY:> (probably left some missing, to correct later on)

Further replacement of nf_put_* by nf90_put_* (same for _get_)

[minor] replace deprecated boolean operators along the way

Location:

LMDZ6/trunk/tools

Files:

: 28 edited

make_sso/make_sso_SpherePack.f90 (modified) (1 diff)
netcdf95/Attributes/nf95_copy_att.f90 (modified) (1 diff)
netcdf95/Attributes/nf95_get_att.f90 (modified) (1 diff)
netcdf95/Attributes/nf95_get_missing.F90 (modified) (6 diffs)
netcdf95/Attributes/nf95_inquire_attribute.f90 (modified) (1 diff)
netcdf95/Attributes/nf95_put_att.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_close.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_create.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_create_single.f90 (modified) (2 diffs)
netcdf95/Datasets/nf95_enddef.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_find_coord.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_inquire.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_open.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_redef.f90 (modified) (1 diff)
netcdf95/Datasets/nf95_sync.f90 (modified) (1 diff)
netcdf95/Groups/nf95_inq_file_ncid.f90 (modified) (1 diff)
netcdf95/Groups/nf95_inq_grp_parent.f90 (modified) (1 diff)
netcdf95/Groups/nf95_inq_grps.f90 (modified) (1 diff)
netcdf95/Variables/check_start_count.f90 (modified) (1 diff)
netcdf95/Variables/nf95_def_var.f90 (modified) (1 diff)
netcdf95/Variables/nf95_get_var.f90 (modified) (1 diff)
netcdf95/Variables/nf95_inq_varid.f90 (modified) (1 diff)
netcdf95/Variables/nf95_inquire_variable.f90 (modified) (1 diff)
netcdf95/Variables/nf95_put_var.f90 (modified) (1 diff)
netcdf95/nf95_abort.f90 (modified) (1 diff)
netcdf95/nf95_def_dim.f90 (modified) (1 diff)
netcdf95/nf95_inq_dimid.f90 (modified) (1 diff)
netcdf95/nf95_inquire_dimension.f90 (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

LMDZ6/trunk/tools/make_sso/make_sso_SpherePack.f90

-                      r4168
+                      r5075
 ! Purpose: Project ETOPO file (GMT4 axes conventions) on spherical harmonics.
 !-------------------------------------------------------------------------------
+  USE netcdf
+  USE lmdz_netcdf, ONLY: nf90_noerr,nf90_strerror,nf90_close,nf90_put_var,nf90_enddef,&
+          nf90_put_att,nf90_global,nf90_real,nf90_def_var,nf90_def_dim,nf90_inq_varid,&
+          nf90_nowrite,nf90_inquire_dimension,nf90_inquire_variable,nf90_open
 !  USE sphpack
   IMPLICIT NONE

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_copy_att.f90

r4918	r5075
8	8	subroutine nf95_copy_att(ncid_in, varid_in, name, ncid_out, varid_out, ncerr)
9	9
10		use netcdf, only: nf90_copy_att
	10	use lmdz_netcdf, only: nf90_copy_att
11	11
12	12	use nf95_abort_m, only: nf95_abort

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_get_att.f90

r4918	r5075
2	2
3	3	use nf95_abort_m, only: nf95_abort
4		use netcdf, only: nf90_get_att, nf90_noerr
	4	use lmdz_netcdf, only: nf90_get_att, nf90_noerr
5	5	use nf95_inquire_attribute_m, only: nf95_inquire_attribute
6	6	use nf95_constants, only: nf95_noerr

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_get_missing.F90

-                      r4918
+                      r5075
 module nf95_get_missing_m
   use netcdf, only: nf90_noerr
+  use lmdz_netcdf, only: nf90_noerr
   use nf95_get_att_m, only: nf95_get_att
 …
   subroutine nf95_get_missing_real(ncid, varid, missing)
     use netcdf, only: NF90_FILL_REAL
+    use lmdz_netcdf, only: NF90_FILL_REAL
     use typesizes, only: FourByteReal
 …
   subroutine nf95_get_missing_dble(ncid, varid, missing)
     use netcdf, only: NF90_FILL_double
+    use lmdz_netcdf, only: NF90_FILL_double
     use typesizes, only: EightByteReal
 …
   subroutine nf95_get_missing_short_int(ncid, varid, missing)
     use netcdf, only: NF90_FILL_short
+    use lmdz_netcdf, only: NF90_FILL_short
     use typesizes, only: TwoByteInt
 …
   subroutine nf95_get_missing_int(ncid, varid, missing)
     use netcdf, only: NF90_FILL_INT
+    use lmdz_netcdf, only: NF90_FILL_INT
     integer, intent(in)::  ncid, varid
 …
   subroutine nf95_get_missing_char(ncid, varid, missing)
     use netcdf, only: NF90_FILL_char
+    use lmdz_netcdf, only: NF90_FILL_char
     integer, intent(in)::  ncid, varid

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_inquire_attribute.f90

r4918	r5075
10	10
11	11	use nf95_abort_m, only: nf95_abort
12		use netcdf, only: nf90_inquire_attribute
	12	use lmdz_netcdf, only: nf90_inquire_attribute
13	13	use nf95_constants, only: nf95_noerr
14	14

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_put_att.f90

r4918	r5075
1	1	module nf95_put_att_m
2	2
3		use netcdf, only: nf90_put_att
	3	use lmdz_netcdf, only: nf90_put_att
4	4	use nf95_abort_m, only: nf95_abort
5	5	use nf95_constants, only: nf95_noerr

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_close.f90

r4918	r5075
10	10	! call it.
11	11
12		use netcdf, only: nf90_close, nf90_strerror
	12	use lmdz_netcdf, only: nf90_close, nf90_strerror
13	13
14	14	use nf95_constants, only: nf95_noerr

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_create.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_create
	10	use lmdz_netcdf, only: nf90_create
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_create_single.f90

-                      r4918
+                      r5075
 module nf95_create_single_m
   use netcdf, only: NF90_MAX_NAME
+  use lmdz_netcdf, only: NF90_MAX_NAME
   implicit none
 …
     ! Shortcut to create a file containing a single primary variable.
     use netcdf, only: NF90_CLOBBER, NF90_FLOAT
+    use lmdz_netcdf, only: NF90_CLOBBER, NF90_FLOAT
     use nf95_create_m, only: nf95_create

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_enddef.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_enddef
	10	use lmdz_netcdf, only: nf90_enddef
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_find_coord.f90

r4918	r5075
15	15	! attribute "std_name".
16	16
17		use netcdf, only: NF90_MAX_NAME, NF90_NOERR
	17	use lmdz_netcdf, only: NF90_MAX_NAME, NF90_NOERR
18	18	use nf95_get_att_m, only: nf95_get_att
19	19	use nf95_inq_varid_m, only: nf95_inq_varid

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_inquire.f90

r4918	r5075
10	10
11	11	use nf95_abort_m, only: nf95_abort
12		use netcdf, only: nf90_inquire
	12	use lmdz_netcdf, only: nf90_inquire
13	13	use nf95_constants, only: nf95_noerr
14	14

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_open.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_open
	10	use lmdz_netcdf, only: nf90_open
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_redef.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_redef
	10	use lmdz_netcdf, only: nf90_redef
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_sync.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_sync
	10	use lmdz_netcdf, only: nf90_sync
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/Groups/nf95_inq_file_ncid.f90

r4918	r5075
11	11	! by nf95_abort, so it cannot call it.
12	12
13		use netcdf, only: nf90_strerror
	13	use lmdz_netcdf, only: nf90_strerror
14	14
15	15	use nf95_constants, only: Nf95_ENOGRP, nf95_noerr

LMDZ6/trunk/tools/netcdf95/Groups/nf95_inq_grp_parent.f90

r4918	r5075
12	12	use, intrinsic:: ISO_C_BINDING
13	13
14		use netcdf, only: nf90_strerror
	14	use lmdz_netcdf, only: nf90_strerror
15	15
16	16	use nc_constants, only: NC_NOERR

LMDZ6/trunk/tools/netcdf95/Groups/nf95_inq_grps.f90

r4918	r5075
26	26	use, intrinsic:: ISO_C_BINDING
27	27
28		use netcdf, only: nf90_noerr
	28	use lmdz_netcdf, only: nf90_noerr
29	29
30	30	use nc_constants, only: nc_noerr

LMDZ6/trunk/tools/netcdf95/Variables/check_start_count.f90

r4918	r5075
19	19	use nf95_close_m, only: nf95_close
20	20	use nf95_inquire_variable_m, only: nf95_inquire_variable
21		use netcdf, only: nf90_noerr
	21	use lmdz_netcdf, only: nf90_noerr
22	22
23	23	character(len=*), intent(in):: name_calling ! name of calling procedure

LMDZ6/trunk/tools/netcdf95/Variables/nf95_def_var.f90

r4918	r5075
7	7	! "nf95_def_var_scalar" cannot be distinguished from "nf95_def_var_oneDim".
8	8
9		use netcdf, only: nf90_def_var
	9	use lmdz_netcdf, only: nf90_def_var
10	10	use nf95_abort_m, only: nf95_abort
11	11	use nf95_constants, only: nf95_noerr

LMDZ6/trunk/tools/netcdf95/Variables/nf95_get_var.f90

r4918	r5075
1	1	module nf95_get_var_m
2	2
3		use netcdf, only: nf90_get_var, NF90_NOERR
	3	use lmdz_netcdf, only: nf90_get_var, NF90_NOERR
4	4
5	5	use nf95_abort_m, only: nf95_abort

LMDZ6/trunk/tools/netcdf95/Variables/nf95_inq_varid.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_inq_varid
	10	use lmdz_netcdf, only: nf90_inq_varid
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/Variables/nf95_inquire_variable.f90

r4918	r5075
16	16
17	17	use nf95_abort_m, only: nf95_abort
18		use netcdf, only: nf90_inquire_variable, nf90_max_var_dims
	18	use lmdz_netcdf, only: nf90_inquire_variable, nf90_max_var_dims
19	19	use nf95_constants, only: nf95_noerr
20	20

LMDZ6/trunk/tools/netcdf95/Variables/nf95_put_var.f90

r4918	r5075
1	1	module nf95_put_var_m
2	2
3		use netcdf, only: nf90_put_var
	3	use lmdz_netcdf, only: nf90_put_var
4	4	use nf95_abort_m, only: nf95_abort
5	5	use check_start_count_m, only: check_start_count

LMDZ6/trunk/tools/netcdf95/nf95_abort.f90

r4918	r5075
10	10
11	11	! Libraries:
12		use netcdf, only: nf90_strerror
	12	use lmdz_netcdf, only: nf90_strerror
13	13
14	14	use nf95_close_m, only: nf95_close

LMDZ6/trunk/tools/netcdf95/nf95_def_dim.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_def_dim
	10	use lmdz_netcdf, only: nf90_def_dim
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/nf95_inq_dimid.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_inq_dimid
	10	use lmdz_netcdf, only: nf90_inq_dimid
11	11	use nf95_constants, only: nf95_noerr
12	12

LMDZ6/trunk/tools/netcdf95/nf95_inquire_dimension.f90

r4918	r5075
8	8
9	9	use nf95_abort_m, only: nf95_abort
10		use netcdf, only: nf90_inquire_dimension
	10	use lmdz_netcdf, only: nf90_inquire_dimension
11	11	use nf95_constants, only: nf95_noerr
12	12

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 5075 for LMDZ6/trunk/tools

Legend:

Download in other formats: